diff --git a/Makefile.in b/Makefile.in index a833b0071..847be7a2d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/configure b/configure index d1d8625d3..541501d0f 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index af2d39fa8..3d033bff3 100644 --- a/configure.ac +++ b/configure.ac @@ -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)