From: Victor Julien <victor@inliniac.net>
Date: Thu, 20 Mar 2014 09:33:57 +0000 (+0100)
Subject: lua: deal with FreeBSD and OpenBSD
X-Git-Tag: suricata-2.0.2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7396237c2afd69acdad9705cf291a624fc190d09;p=thirdparty%2Fsuricata.git

lua: deal with FreeBSD and OpenBSD

FreeBSD pkg-config lua-5.1.pc, lib liblua-5.1.so
OpenBSD pkg-config lua51.pc, lib liblua5.1.so

Default (linux) pkg-config: lua5.1.pc, lib liblua5.1.so
---

diff --git a/configure.ac b/configure.ac
index c986c85061..1e014489be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,10 @@
     #check for os
     AC_MSG_CHECKING([host os])
 
+    # lua pkg-config name differs per OS
+    LUA_PC_NAME="lua5.1"
+    LUA_LIB_NAME="lua5.1"
+
     # If no host os was detected, try with uname
     if test -z "$host" ; then
 	    host="`uname`"
@@ -179,12 +183,15 @@
     e_magic_file="/usr/share/file/magic"
     case "$host" in
         *-*-*freebsd*)
+            LUA_PC_NAME="lua-5.1"
+            LUA_LIB_NAME="lua-5.1"
             CFLAGS="${CFLAGS} -DOS_FREEBSD"
             CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/local/include/libnet11"
             LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib/libnet11"
             e_magic_file="/usr/share/misc/magic"
             ;;
         *-*-openbsd*)
+            LUA_PC_NAME="lua51"
             CFLAGS="${CFLAGS} -D__OpenBSD__"
             CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/local/include/libnet-1.1"
             LDFLAGS="${LDFLAGS} -L/usr/local/lib -I/usr/local/lib/libnet-1.1"
@@ -1484,7 +1491,7 @@
         if test "$with_liblua_includes" != "no"; then
             CPPFLAGS="${CPPFLAGS} -I${with_liblua_includes}"
         else
-            PKG_CHECK_MODULES([LUA], [lua5.1], LUA="no")
+            PKG_CHECK_MODULES([LUA], [${LUA_PC_NAME}], LUA="no")
             CPPFLAGS="${CPPFLAGS} ${LUA_CFLAGS}"
         fi
 
@@ -1493,11 +1500,11 @@
             if test "$with_liblua_libraries" != "no"; then
                 LDFLAGS="${LDFLAGS}  -L${with_liblua_libraries}"
             else
-                PKG_CHECK_MODULES([LUA], [lua5.1])
+                PKG_CHECK_MODULES([LUA], [${LUA_PC_NAME}])
                 LDFLAGS="${LDFLAGS} ${LUA_LIBS}"
             fi
 
-            AC_CHECK_LIB(lua5.1, luaL_openlibs,, LUA="no")
+            AC_CHECK_LIB(${LUA_LIB_NAME}, luaL_openlibs,, LUA="no")
 
             if test "$LUA" = "no"; then
                 echo