Revert "back out luajit foo causing segfault"

This reverts commit d195fea2479c90ff95aa6e4a0bc51b02b02bda40.

diff --git a/configure.ac b/configure.ac
index 1e136a26bdefebad5b04be7e56c4b6efb6514f4a..5945d483de1970a245a96c2ca4e83370e7c3e5ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -427,12 +427,19 @@ 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
-    CPPFLAGS="${CPPFLAGS} -I${with_luajit_includes}"
+    LUAJIT_CFLAGS="-I${with_luajit_includes}"
 fi
 
 AC_ARG_WITH(luajit_libraries,
@@ -440,13 +447,23 @@ AC_ARG_WITH(luajit_libraries,
     [with_luajit_libraries="$withval"],[with_luajit_libraries="no"])
 
 if test "x$with_luajit_libraries" != "xno"; then
-    LDFLAGS="${LDFLAGS} -L${with_luajit_libraries} -lluajit-5.1"
+    LUAJIT_LDFLAGS="-L${with_luajit_libraries}"
+fi
 
-    if test "x$macos" != "xno"; then
-        LDFLAGS="${LDFLAGS} -pagezero_size 10000 -image_base 100000000"
-    fi
+if test "x$macos" != "xno"; then
+    LUAJIT_LIBS="${LUAJIT_LDFLAGS} -pagezero_size 10000 -image_base 100000000"
 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"])
@@ -773,6 +790,7 @@ if test "x$have_daq_address_space_id" = "xyes"; then
         [DAQ version supports address space ID in header.])
 fi
 
+
 #--------------------------------------------------------------------------
 # Check for pthreads availability
 #--------------------------------------------------------------------------
@@ -782,6 +800,7 @@ LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
 
+
 #--------------------------------------------------------------------------
 # outputs
 #--------------------------------------------------------------------------
@@ -891,4 +910,3 @@ AC_MSG_RESULT([
     ldflags:        ${LDFLAGS}
     libs:           ${LIBS}
 ])
-