From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 8 May 2009 06:47:33 +0000 (+0000)
Subject: Add . 'default' test first before searching paths, to determine if the
X-Git-Tag: 2.3.3~636
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ea0ab9e0af61eb500c3b34b49559aa999147c3c;p=thirdparty%2Fapache%2Fhttpd.git

Add . 'default' test first before searching paths, to determine if the
lua.h, liblua5.1, liblua-5.1 or liblua can be resolved.  This avoids
adding strange paths on fedora/redhat, and choosing the wrong /lib[64]
flavor.

Also ensure -lm is always added to the actual linked libraries, avoiding
a LoadModule failure on fedora/redhat.  Still should first try to search
for pkg-config lua settings, but note this would break fedora until that
build hackery is corrected, c.f. the bug
https://bugzilla.redhat.com/show_bug.cgi?id=499238



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772864 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index 71ecb2031d2..78f17ea3aa6 100644
--- a/modules/lua/config.m4
+++ b/modules/lua/config.m4
@@ -17,13 +17,37 @@ AC_ARG_WITH(
 
 dnl # Determine lua lib directory
 if test -z $lua_path; then
-    test_paths="/usr/local /usr"
+    test_paths=". /usr/local /usr"
 else
     test_paths="${lua_path}"
 fi
 
-AC_CHECK_LIB([m], [pow], lib_m=" -lm")
+AC_CHECK_LIB(m, pow, lib_m="-lm")
+AC_CHECK_LIB(m, sqrt, lib_m="-lm")
 for x in $test_paths ; do
+  if test "x$x" == "x."; then
+    AC_CHECK_HEADER(lua.h,[
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="$LDFLAGS $lib_m"
+        AC_CHECK_LIB(lua5.1, luaL_newstate, [
+            LUA_LIBS="-llua5.1 $lib_m"
+        ],[
+            AC_CHECK_LIB(lua-5.1, luaL_newstate, [
+                LUA_LIBS="-llua-5.1 $lib_m"
+            ],[
+                AC_CHECK_LIB(lua, luaL_newstate, [
+                    LUA_LIBS="-llua $lib_m"
+                ])
+            ])
+        ])
+        LUA_CFLAGS=
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    ])
+  else
     AC_MSG_CHECKING([for lua.h in ${x}/include/lua5.1])
     if test -f ${x}/include/lua5.1/lua.h; then
         AC_MSG_RESULT([yes])
@@ -31,9 +55,8 @@ for x in $test_paths ; do
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
         LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
-        AC_CHECK_LIB(lua5.1, luaL_newstate,
-            [
-            LUA_LIBS="-L$x/lib -llua5.1"
+        AC_CHECK_LIB(lua5.1, luaL_newstate, [
+            LUA_LIBS="-L$x/lib -llua5.1 $lib_m"
             LUA_CFLAGS="-I$x/include/lua5.1"
             ])
         CFLAGS=$save_CFLAGS
@@ -49,9 +72,8 @@ for x in $test_paths ; do
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
         LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m"
-        AC_CHECK_LIB(lua, luaL_newstate,
-            [
-            LUA_LIBS="-L$x/lib/lua51 -llua"
+        AC_CHECK_LIB(lua, luaL_newstate, [
+            LUA_LIBS="-L$x/lib/lua51 -llua $lib_m"
             LUA_CFLAGS="-I$x/include/lua51"
             ])
         CFLAGS=$save_CFLAGS
@@ -67,9 +89,8 @@ for x in $test_paths ; do
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
         LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
-        AC_CHECK_LIB(lua, luaL_newstate,
-            [
-            LUA_LIBS="-L$x/lib -llua"
+        AC_CHECK_LIB(lua, luaL_newstate, [
+            LUA_LIBS="-L$x/lib -llua $lib_m"
             LUA_CFLAGS="-I$x/include"
             ])
         CFLAGS=$save_CFLAGS
@@ -78,6 +99,7 @@ for x in $test_paths ; do
     else
         AC_MSG_RESULT([no])
     fi
+  fi
 done
 
 AC_SUBST(LUA_LIBS)
@@ -97,11 +119,10 @@ fi
 
 lua_objects="lua_apr.lo lua_config.lo mod_lua.lo lua_request.lo lua_vmprep.lo"
 
-APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no,
-[
-CHECK_LUA()
-APR_ADDTO(INCLUDES, ["$LUA_CFLAGS"])
-MOD_LUA_LDADD="$LUA_LIBS"
+APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no, [
+  CHECK_LUA()
+  APR_ADDTO(INCLUDES, ["$LUA_CFLAGS"])
+  MOD_LUA_LDADD="$LUA_LIBS"
 ])
 
 APACHE_MODPATH_FINISH