Skip to content

Commit

Permalink
guile - resstructure some configure tests
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
gjanssens committed Apr 20, 2018
1 parent 7e798c1 commit f8adc3e
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions configure.ac
Expand Up @@ -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])
Expand All @@ -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'`"
Expand All @@ -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
Expand Down

0 comments on commit f8adc3e

Please sign in to comment.