X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_with_lua.m4;h=322271f8ff7d9b4e1bce66d6c803725d6651a2ca;hb=d2e05058ca75cce6575dd2ee49e7743200581955;hp=6e4a96fefbba6377ae5f6993d1a6338669a2934a;hpb=1b18496b3d1399d90cfba1975f23aee9c747445a;p=m6w6%2Flibmemcached

diff --git a/m4/pandora_with_lua.m4 b/m4/pandora_with_lua.m4
index 6e4a96fe..322271f8 100644
--- a/m4/pandora_with_lua.m4
+++ b/m4/pandora_with_lua.m4
@@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
 dnl   
 dnl pandora-build: A pedantic build system
 dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; the Free Software Foundation
+dnl This file is free software; Sun Microsystems
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
@@ -27,18 +27,28 @@ AC_DEFUN([PANDORA_WITH_LUA],[
       AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
       with_lua=yes
     ],[
-      PKG_CHECK_MODULES([LUA], lua5.1 >= 5.1, [
+      LUAPC=lua5.1
+      PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
         AC_DEFINE([HAVE_LUA], [1], [liblua])
         AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-	with_lua=yes
+        with_lua=yes
       ],[
         AC_DEFINE([HAVE_LUA],["x"],["x"])
         with_lua=no
       ])
     ])
 
-   AC_SUBST(LUA_CFLAGS)
-   AC_SUBST(LUA_LIBS)
+    AC_CACHE_CHECK([for LUA installation location],[pandora_cv_lua_archdir],[
+      AS_IF([test "$prefix" = "NONE"],[
+        pandora_cv_lua_archdir=`${PKG_CONFIG} --define-variable=prefix=${ac_default_prefix} --variable=INSTALL_CMOD ${LUAPC}`
+      ],[
+        pandora_cv_lua_archdir=`${PKG_CONFIG} --define-variable=prefix=${prefix} --variable=INSTALL_CMOD ${LUAPC}`
+      ])
+    ])
+    LUA_ARCHDIR="${pandora_cv_lua_archdir}"
+    AC_SUBST(LUA_ARCHDIR)
+    AC_SUBST(LUA_CFLAGS)
+    AC_SUBST(LUA_LIBS)
   ])
   AM_CONDITIONAL(BUILD_LUA, test "$with_lua" = "yes")