jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change meaning of configure option --with-guile to the name of the

Browse source 
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
This commit is contained in:
Matthias Köppe 2003-11-18 15:55:45 +00:00
commit b4ae6e5567
3 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SWIG/Examples/test-suite/guile/Makefile.in
View file

@ -9,6 +9,7 @@ SCRIPTSUFFIX = _runme.scm
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
GUILE = @GUILE@
C_TEST_CASES = long_long list_vector pointer_in_out multivalue 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. # a file is found which has _runme.scm appended after the testcase name.
run_testcase = \ run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ 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; fi;
# Clean # Clean

2
SWIG/Examples/test-suite/guilescm/Makefile.in
View file

@ -13,7 +13,7 @@ SCRIPTPREFIX = ../guile/
# a file is found which has _runme.scm appended after the testcase name. # a file is found which has _runme.scm appended after the testcase name.
run_testcase = \ run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ 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; fi;
setup = \ setup = \

42
SWIG/configure.in
View file

@ -779,7 +779,9 @@ AC_SUBST(JAVACXXSHARED)
# Look for Guile # Look for Guile
#---------------------------------------------------------------- #----------------------------------------------------------------
GUILEPACKAGE=
GUILEINCLUDE= GUILEINCLUDE=
GUILE=
GUILELIB= GUILELIB=
GUILELINK= GUILELINK=
@ -790,15 +792,21 @@ if test -z "$GUILE_CONFIG" ; then
fi fi
if test -n "$GUILE_CONFIG" ; then 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],[ if test -z "$GUILE"; then
GUILEPACKAGE="$withval"], [GUILEPACKAGE=]) if test -n "$GUILEPACKAGE"; then
AC_ARG_WITH(guileincl,[ --with-guileincl=path Set location of Guile include directory],[ GUILE="$GUILEPACKAGE/bin/guile"
GUILEINCLUDE="$withval"], [GUILEINCLUDE=]) fi
AC_ARG_WITH(guilelib,[ --with-guilelib=path Set location of Guile library directory],[ fi
GUILELIB="$withval"], [GUILELIB=])
if test -z "$GUILEINCLUDE"; then if test -z "$GUILEINCLUDE"; then
if test -n "$GUILEPACKAGE"; then if test -n "$GUILEPACKAGE"; then
@ -812,9 +820,16 @@ if test -n "$GUILE_CONFIG" ; then
fi fi
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 for i in $dirs ; do
if test -r $i/guile/gh.h; then if test -r $i/guile/gh.h; then
AC_MSG_RESULT($i) AC_MSG_RESULT($i)
@ -827,7 +842,7 @@ if test -n "$GUILE_CONFIG" ; then
fi fi
AC_MSG_CHECKING(for Guile library) AC_MSG_CHECKING(for Guile library)
dirs="$GUILELIB `$GUILE_CONFIG info libdir`" dirs="$GUILELIB"
for i in $dirs ; do for i in $dirs ; do
if test -r $i/libguile.so; then if test -r $i/libguile.so; then
AC_MSG_RESULT($i) AC_MSG_RESULT($i)
@ -839,10 +854,11 @@ if test -n "$GUILE_CONFIG" ; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
fi fi
GUILELINK="`$GUILE_CONFIG link`" if test -z "$GUILELINK"; then
GUILELINK="-L$GUILELIB -lguile"
fi # have GUILE_CONFIG fi
AC_SUBST(GUILE)
AC_SUBST(GUILEINCLUDE) AC_SUBST(GUILEINCLUDE)
AC_SUBST(GUILELIB) AC_SUBST(GUILELIB)
AC_SUBST(GUILELINK) AC_SUBST(GUILELINK)