Fix autoconf handling for luajit and pthreads.

diff --git a/configure.ac b/configure.ac
index 17be7174d76fa85d33ec8c6ca7eff8a0aa42aa7f..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,17 @@ if test "x$have_daq_address_space_id" = "xyes"; then
         [DAQ version supports address space ID in header.])
 fi
 
+
+#--------------------------------------------------------------------------
+# Check for pthreads availability
+#--------------------------------------------------------------------------
+
+AX_PTHREAD
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
+
+
 #--------------------------------------------------------------------------
 # outputs
 #--------------------------------------------------------------------------
@@ -867,4 +895,18 @@ tools/snort2lua/helpers/Makefile \
 ])
 
 AC_OUTPUT
-
+AC_MSG_RESULT([
+    $PACKAGE $VERSION
+    ========
+
+    prefix:         ${prefix}
+    sysconfdir:     ${sysconfdir}
+    libdir:         ${libdir}
+    includedir:     ${includedir}
+
+    compiler:       ${CC}
+    cflags:         ${CFLAGS}
+    cppflags:       ${CPPFLAGS}
+    ldflags:        ${LDFLAGS}
+    libs:           ${LIBS}
+])