added GUILE_INSTALL_DIR var to change Guile installation directory

darcs-hash:20100709151455-c8de0-7f3529d9594bc00f7e7c7fa08a5eeb6314c39aba.gz

diff --git a/configure.ac b/configure.ac
index 038a7f1373ca2dea192f187a14a1dcde108562d2..3effe1a292c9282ff796dd0472938500f50e7f81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,7 @@ if test "x$with_guile" = xno; then
 else
 
 dnl Guile:
+AC_ARG_VAR(GUILE_INSTALL_DIR, [where to install Guile plug-ins])
 AC_CHECK_PROG(GUILE_CONFIG, guile-config, guile-config, unknown)
 if test "x$GUILE_CONFIG" = "xunknown"; then
    AC_MSG_WARN([can't find guile-config, disabling Guile wrapper])
@@ -138,10 +139,10 @@ AC_CHECK_PROG(GUILE, guile, guile, unknown)
 if test "x$GUILE" = xunknown; then
    AC_MSG_WARN([can't find guile, disabling Guile wrapper])
    GUILE_CONFIG=unknown
-else
-   AC_MSG_CHECKING([for Guile site installation directory])
-   GUILE_SITEDIR=`guile -c '(display (%site-dir))'`
-   AC_MSG_RESULT([$GUILE_SITEDIR])
+elif test x"$GUILE_INSTALL_DIR" = "x"; then
+   AC_MSG_CHECKING([for Guile installation directory])
+   GUILE_INSTALL_DIR=`guile -c '(display (%site-dir))'`
+   AC_MSG_RESULT([$GUILE_INSTALL_DIR])
 fi
 
 fi # with_guile
@@ -178,7 +179,7 @@ fi # with_python
 
 fi # if enable_shared
 
-AC_SUBST(GUILE_SITEDIR)
+AC_SUBST(GUILE_INSTALL_DIR)
 AC_SUBST(GUILE_CPPFLAGS)
 AC_SUBST(GUILE_LIBS)
 AC_SUBST(PYTHON_INCLUDES)

diff --git a/swig/Makefile.am b/swig/Makefile.am
index e22bb628ca7e19ce9b369f69d0726c3cca7a6348..e29bb7612bca27db51b64ba8d7a14e38222e07bd 100644 (file)
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -13,7 +13,7 @@ libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
 libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
 libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_builddir)/api
 
-guiledir = $(GUILE_SITEDIR)
+guiledir = $(GUILE_INSTALL_DIR)
 if WITH_GUILE
 guile_DATA = nlopt.scm
 guilelib = libnlopt@NLOPT_SUFFIX@_guile.la