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

guile - resstructure some configure tests

Browse source 
1. move the 'no executable found' message up to be with the executable tests
2. test for an (non-)empty GUILE variable for all other conditions after that

An empty GUILE variable means guile is disabled and consistently using the
same test makes the code more readable.
This commit is contained in:
Geert Janssens 2018-04-20 08:54:37 +02:00
commit f8adc3e613
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -1720,11 +1720,12 @@ else
GUILE=
AC_PATH_PROG(GUILE, guile)
fi
if test -z "$GUILE" ; then
AC_MSG_WARN([no suitable guile executable found. Disabling Guile])
fi
fi
if ! test -f "$GUILE" ; then
AC_MSG_WARN([no suitable guile executable found. Disabling Guile])
else
if test -n "$GUILE" ; then
AC_MSG_CHECKING([for guile version])
guile_version=`$GUILE -c '(display (effective-version))'`
AC_MSG_RESULT([$guile_version])
@ -1737,7 +1738,7 @@ else
fi
fi
if test -f "$GUILE" ; then
if test -n "$GUILE" ; then
# Test if guile-config and guile versions match. They should.
gc_version="`$GUILE_CONFIG --version 2>&1 | sed '1 s/.* //;q'`"
g_version="`$GUILE --version | sed '1 s/.* //;q'`"
@ -1747,7 +1748,7 @@ else
fi
fi
if test -f "$GUILE" ; then
if test -n "$GUILE" ; then
if test -z "$GUILE_CFLAGS" ; then
AC_MSG_CHECKING([for guile compile flags])
GUILE_CFLAGS="`$GUILE_CONFIG compile`" # Note that this can sometimes be empty