From: Russ Combs <rucombs@cisco.com>
Date: Thu, 20 Nov 2014 11:31:02 +0000 (-0500)
Subject: back out luajit foo causing segfault
X-Git-Tag: 3.0.0-233~1182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d195fea2479c90ff95aa6e4a0bc51b02b02bda40;p=thirdparty%2Fsnort3.git

back out luajit foo causing segfault
---

diff --git a/configure.ac b/configure.ac
index 5945d483d..1e136a26b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -427,19 +427,12 @@ if test "x$with_libpcap_libraries" != "xno"; then
    LDFLAGS="${LDFLAGS} -L${with_libpcap_libraries}"
 fi
 
-PKG_PROG_PKG_CONFIG
-PKG_CHECK_EXISTS([luajit], [ have_luajit_pkgconfig="yes" ], [ have_luajit_pkgconfig="no" ])
-if test "${have_luajit_pkgconfig}" = "yes" ; then
-    LUAJIT_CFLAGS=`${PKG_CONFIG} --cflags luajit`
-    LUAJIT_LDFLAGS=`${PKG_CONFIG} --libs-only-L luajit`
-fi
-
 AC_ARG_WITH(luajit_includes,
     [  --with-luajit-includes=DIR      luajit include directory],
     [with_luajit_includes="$withval"],[with_luajit_includes="no"])
 
 if test "x$with_luajit_includes" != "xno"; then
-    LUAJIT_CFLAGS="-I${with_luajit_includes}"
+    CPPFLAGS="${CPPFLAGS} -I${with_luajit_includes}"
 fi
 
 AC_ARG_WITH(luajit_libraries,
@@ -447,23 +440,13 @@ AC_ARG_WITH(luajit_libraries,
     [with_luajit_libraries="$withval"],[with_luajit_libraries="no"])
 
 if test "x$with_luajit_libraries" != "xno"; then
-    LUAJIT_LDFLAGS="-L${with_luajit_libraries}"
-fi
+    LDFLAGS="${LDFLAGS} -L${with_luajit_libraries} -lluajit-5.1"
 
-if test "x$macos" != "xno"; then
-    LUAJIT_LIBS="${LUAJIT_LDFLAGS} -pagezero_size 10000 -image_base 100000000"
+    if test "x$macos" != "xno"; then
+        LDFLAGS="${LDFLAGS} -pagezero_size 10000 -image_base 100000000"
+    fi
 fi
 
-CPPFLAGS="${CPPFLAGS} ${LUAJIT_CFLAGS}"
-LDFLAGS="${LDFLAGS} ${LUAJIT_LDFLAGS}"
-
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADERS([lua.hpp], , [AC_MSG_ERROR("LuaJIT header not found.")])
-AC_CHECK_LIB(luajit, main, , [AC_CHECK_LIB(luajit-5.1, main, , [
-                                AC_MSG_ERROR("Linking against LuaJIT library failed.")])
-        ])
-AC_LANG_POP([C++])
-
 AC_ARG_WITH(pcre_includes,
     [  --with-pcre-includes=DIR        libpcre include directory],
     [with_libpcre_includes="$withval"],[with_libpcre_includes="no"])
@@ -790,7 +773,6 @@ if test "x$have_daq_address_space_id" = "xyes"; then
         [DAQ version supports address space ID in header.])
 fi
 
-
 #--------------------------------------------------------------------------
 # Check for pthreads availability
 #--------------------------------------------------------------------------
@@ -800,7 +782,6 @@ LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
 
-
 #--------------------------------------------------------------------------
 # outputs
 #--------------------------------------------------------------------------
@@ -910,3 +891,4 @@ AC_MSG_RESULT([
     ldflags:        ${LDFLAGS}
     libs:           ${LIBS}
 ])
+