trying to install lua binding in prefered directory

diff --git a/configure.ac b/configure.ac
index 659c0f49643c1d7d5623f0369029a18994d7e804..b75f7174e38faab89a2ec9dda4c6c4ce900e4583 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -621,6 +621,7 @@ if test "x$enable_lua" = "xyes" ; then
 
     LUA_INCLUDES=""
     LUA_LIBS=""
+    LUA_INSTALL_DIR=""
 
     if test -n "$lua_inc"; then
        CFLAGS="$CFLAGS -I$lua_inc"
@@ -642,6 +643,7 @@ if test "x$enable_lua" = "xyes" ; then
                    LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                     LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                     LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
+                   LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.1"
 
                    pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
                    if test  "x$?" = "x0"; then
@@ -663,6 +665,7 @@ if test "x$enable_lua" = "xyes" ; then
             LUA_INCLUDES=`$LUACONFIG --include`
             LUA_LIBS=`$LUACONFIG --libs`
            LUA_VERSION="5.0.x"
+           LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
         fi
     fi
 
@@ -728,6 +731,7 @@ if test "x$enable_lua" = "xyes" ; then
     : # needed because if AC_SUBST is expanded to nothing, syntax error
     AC_SUBST(LUA_INCLUDES)
     AC_SUBST(LUA_LIBS)
+    AC_SUBST(LUA_INSTALL_DIR)
     # Not needed for Graphviz: AC_DEFINE(PLUGIN_LUA)
 fi
 
@@ -828,8 +832,8 @@ PHP_INSTALL_DATADIR="/usr/share/php"
 PHP_LIBS=
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-AC_CHECK_HEADER(zend.h,,[
-  AC_MSG_WARN([Unable to find header zend.h. The PHP packages will not be built])
+AC_CHECK_HEADER(php.h,,[
+  AC_MSG_WARN([Unable to find header php.h. The PHP packages will not be built])
   PHP=
   ])
 CPPFLAGS=$save_CPPFLAGS

diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index 62538776bf21adcba0e640e602f8812c299635c4..240b8cc91fb7a4f1003747265214e4ff801da168 100644 (file)
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -34,6 +34,16 @@ pkgIndex.tcl: @TCL_PKGINDEX@ @TCL_PKGINDEX_GD@ @TCL_PKGINDEX_SWIG@ @TK_PKGINDEX@
 #    ./configure --prefix=$HOME/graphviz; make; make install
 # without root priviledges.
 install-data-hook:
+if WITH_LUA
+       -mkdir -p $(DESTDIR)@LUA_INSTALL_DIR@;
+       if test -w $(DESTDIR)@LUA_INSTALL_DIR@; then \
+               (cd $(DESTDIR)@LUA_INSTALL_DIR@; \
+                       $(LN_S) -f $(pkgluadir)/libgv_lua.so gv.so;) \
+       else \
+               echo "Warning: @LUA_INSTALL_DIR@ is not writable."; \
+               echo "Skipping system installation of lua binding."; \
+       fi
+endif
 if WITH_PERL
        -mkdir -p $(DESTDIR)@PERL_INSTALL_DIR@;
        if test -w $(DESTDIR)@PERL_INSTALL_DIR@; then \
@@ -133,7 +143,7 @@ uninstall-hook:
        rm -rf $(DESTDIR)$(pkgguiledir);
        rm -rf $(DESTDIR)$(pkgiodir);
        rm -rf $(DESTDIR)$(pkgjavadir);
-       rm -rf $(DESTDIR)$(pkgluadir);
+       rm -rf $(DESTDIR)$(pkgluadir) $(DESTDIR)@LUA_INSTALL_DIR@/gv.so;
        rm -rf $(DESTDIR)$(pkgocamldir);
        rm -rf $(DESTDIR)$(pkgperldir) $(DESTDIR)@PERL_INSTALL_DIR@/gv.so $(DESTDIR)@PERL_INSTALL_DIR@/gv.pm;
        rm -rf $(DESTDIR)$(pkgphpdir) $(DESTDIR)@PHP_INSTALL_DIR@/gv.so $(DESTDIR)@PHP_INSTALL_DATADIR@/gv.php;