CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-03 22:29:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass CC to the liblua build. Also simplify the code handling Lua CFLAGS a bit.

Browse source
This commit is contained in:
david 2008-05-20 05:52:06 +00:00
parent fac8d52c1c
commit cac1f8cf09
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -106,7 +106,7 @@ nsock_build: $(NSOCKDIR)/src/Makefile
cd $(NSOCKDIR)/src && $(MAKE)
lua_build: $(LIBLUADIR)/Makefile
@echo Compiling liblua; cd $(LIBLUADIR) && $(MAKE) liblua.a @LUAFLAGS@
@echo Compiling liblua; cd $(LIBLUADIR) && $(MAKE) liblua.a CC="$(CC)" MYCFLAGS="$(CFLAGS) @LUA_CFLAGS@"
#$(LIBPCAPDIR)/Makefile:
# @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure

9
configure vendored
View file

@ -673,7 +673,7 @@ ac_ct_CXX
COMPAT_OBJS
COMPAT_SRCS
STRIP
LUAFLAGS
LUA_CFLAGS
CPP
GREP
EGREP
@ -4208,7 +4208,6 @@ fi
needs_cpp_precomp=no
LUAFLAGS="MYCFLAGS=\"$CFLAGS -DLUA_USE_POSIX -DLUA_USE_DLOPEN\""
case "$host" in
*alpha-dec-osf*)
@ -4493,11 +4492,11 @@ _ACEOF
fi
LUAFLAGS="MYCFLAGS=\"$CFLAGS -DLUA_USE_MACOSX\""
LUA_CFLAGS="-DLUA_USE_MACOSX"
needs_cpp_precomp=yes
;;
*)
LUAFLAGS="MYCFLAGS=\"$CFLAGS -DLUA_USE_POSIX -DLUA_USE_DLOPEN\""
LUA_CFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN"
esac
@ -9122,7 +9121,7 @@ ac_ct_CXX!$ac_ct_CXX$ac_delim
COMPAT_OBJS!$COMPAT_OBJS$ac_delim
COMPAT_SRCS!$COMPAT_SRCS$ac_delim
STRIP!$STRIP$ac_delim
LUAFLAGS!$LUAFLAGS$ac_delim
LUA_CFLAGS!$LUA_CFLAGS$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim

7
configure.ac
View file

@ -103,7 +103,6 @@ AC_SUBST(COMPAT_SRCS)
AC_PATH_TOOL([STRIP], [strip], [/bin/true])
needs_cpp_precomp=no
LUAFLAGS="MYCFLAGS=\"$CFLAGS -DLUA_USE_POSIX -DLUA_USE_DLOPEN\""
case "$host" in
*alpha-dec-osf*)
@ -177,14 +176,14 @@ case "$host" in
AC_DEFINE(MACOSX)
dnl on Mac OSX the math library seems to contain unwanted getopt cruft
AC_CHECK_LIB(m, main)
LUAFLAGS="MYCFLAGS=\"$CFLAGS -DLUA_USE_MACOSX\""
LUA_CFLAGS="-DLUA_USE_MACOSX"
needs_cpp_precomp=yes
;;
*)
LUAFLAGS="MYCFLAGS=\"$CFLAGS -DLUA_USE_POSIX -DLUA_USE_DLOPEN\""
LUA_CFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN"
esac
AC_SUBST(LUAFLAGS)
AC_SUBST(LUA_CFLAGS)
dnl Checks for header files.
AC_CHECK_HEADERS(pwd.h termios.h sys/sockio.h)