From b4ae6e556705e8c628fb9dfaec6cd129651bcd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20K=C3=B6ppe?= <mkoeppe@mail.math.uni-magdeburg.de>
Date: Tue, 18 Nov 2003 15:55:45 +0000
Subject: [PATCH] Change meaning of configure option --with-guile to the name
 of the Guile executable.  The new option --with-guile-prefix can be used to
 specify the tree where Guile is installed.  (However, usually it suffices to
 use the single option --with-guile-config.)  When running the run tests
 test-suite, make sure to use the version of Guile that SWIG was configured
 for.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5331 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Examples/test-suite/guile/Makefile.in    |  3 +-
 SWIG/Examples/test-suite/guilescm/Makefile.in |  2 +-
 SWIG/configure.in                             | 42 +++++++++++++------
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/SWIG/Examples/test-suite/guile/Makefile.in b/SWIG/Examples/test-suite/guile/Makefile.in
index 321786f26..f5abedd78 100644
--- a/SWIG/Examples/test-suite/guile/Makefile.in
+++ b/SWIG/Examples/test-suite/guile/Makefile.in
@@ -9,6 +9,7 @@ SCRIPTSUFFIX = _runme.scm
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
+GUILE        = @GUILE@
 
 C_TEST_CASES = long_long list_vector pointer_in_out multivalue
 
@@ -37,7 +38,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH guile -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean
diff --git a/SWIG/Examples/test-suite/guilescm/Makefile.in b/SWIG/Examples/test-suite/guilescm/Makefile.in
index 7799c7640..0f66591e1 100644
--- a/SWIG/Examples/test-suite/guilescm/Makefile.in
+++ b/SWIG/Examples/test-suite/guilescm/Makefile.in
@@ -13,7 +13,7 @@ SCRIPTPREFIX = ../guile/
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH guile -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 setup = \
diff --git a/SWIG/configure.in b/SWIG/configure.in
index 5ce6dbd6e..71b6e433e 100644
--- a/SWIG/configure.in
+++ b/SWIG/configure.in
@@ -779,7 +779,9 @@ AC_SUBST(JAVACXXSHARED)
 # Look for Guile
 #----------------------------------------------------------------
 
+GUILEPACKAGE=
 GUILEINCLUDE=
+GUILE=
 GUILELIB=
 GUILELINK=
 
@@ -790,15 +792,21 @@ if test -z "$GUILE_CONFIG" ; then
 fi
 
 if test -n "$GUILE_CONFIG" ; then
+  GUILEPACKAGE="`$GUILE_CONFIG info prefix`"
+  GUILEINCLUDE="`$GUILE_CONFIG info includedir`"
+  GUILELIB="`$GUILE_CONFIG info libdir`"
+  GUILE="`$GUILE_CONFIG info bindir`/guile"
+  GUILELINK="`$GUILE_CONFIG link`"
+fi
 
-  GUILEPACKAGE=
+AC_ARG_WITH(guilepackage,[  --with-guile-prefix=path       Set location of Guile tree],[
+	GUILEPACKAGE="$withval"])
 
-  AC_ARG_WITH(guile,[  --with-guile=path       Set location of Guile],[
-	GUILEPACKAGE="$withval"], [GUILEPACKAGE=])
-  AC_ARG_WITH(guileincl,[  --with-guileincl=path   Set location of Guile include directory],[
-	GUILEINCLUDE="$withval"], [GUILEINCLUDE=])
-  AC_ARG_WITH(guilelib,[  --with-guilelib=path    Set location of Guile library directory],[
-	GUILELIB="$withval"], [GUILELIB=])
+  if test -z "$GUILE"; then
+     if test -n "$GUILEPACKAGE"; then
+  	GUILE="$GUILEPACKAGE/bin/guile"
+     fi
+  fi
 
   if test -z "$GUILEINCLUDE"; then
      if test -n "$GUILEPACKAGE"; then
@@ -812,9 +820,16 @@ if test -n "$GUILE_CONFIG" ; then
      fi
   fi
 
-  AC_MSG_CHECKING(for Guile header files)
+AC_ARG_WITH(guile,[  --with-guile=path       Set location of Guile executable],[
+	GUILE="$withval"])
+AC_ARG_WITH(guileincl,[  --with-guileincl=path   Set location of Guile include directory],[
+	GUILEINCLUDE="$withval"])
+AC_ARG_WITH(guilelib,[  --with-guilelib=path    Set location of Guile library directory],[
+	GUILELIB="$withval"])
 
-  dirs="$GUILEINCLUDE `$GUILE_CONFIG info includedir`"
+AC_MSG_CHECKING(for Guile header files)
+
+  dirs="$GUILEINCLUDE"
   for i in $dirs ; do
   	if test -r $i/guile/gh.h; then
   		AC_MSG_RESULT($i)
@@ -827,7 +842,7 @@ if test -n "$GUILE_CONFIG" ; then
   fi
 
   AC_MSG_CHECKING(for Guile library)
-  dirs="$GUILELIB `$GUILE_CONFIG info libdir`"
+  dirs="$GUILELIB"
   for i in $dirs ; do
   	if test -r $i/libguile.so; then
   	    AC_MSG_RESULT($i)
@@ -839,10 +854,11 @@ if test -n "$GUILE_CONFIG" ; then
   	AC_MSG_RESULT(not found)
   fi
 
-  GUILELINK="`$GUILE_CONFIG link`"
-
-fi # have GUILE_CONFIG
+if test -z "$GUILELINK"; then
+  GUILELINK="-L$GUILELIB -lguile"
+fi
 
+AC_SUBST(GUILE)
 AC_SUBST(GUILEINCLUDE)
 AC_SUBST(GUILELIB)
 AC_SUBST(GUILELINK)