diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-05 11:01:01 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-05 11:01:01 +0000 |
| commit | 491d441e659853ca52c67730c2f7d8449cdd9fa6 (patch) | |
| tree | 7a376ecfb25ee125ccfe17d3f978bf268bded1cb | |
| parent | 9fe13851e59dd584617cf79822fe4ba2bcb058e3 (diff) | |
| download | lasso-491d441e659853ca52c67730c2f7d8449cdd9fa6.tar.gz lasso-491d441e659853ca52c67730c2f7d8449cdd9fa6.tar.xz lasso-491d441e659853ca52c67730c2f7d8449cdd9fa6.zip | |
Unified configure output. (#229)
Corrected some errors with AM_CONDITIONAL bad placed calls.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 77b2ab2d..822733b0 100644 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,6 @@ AC_DEFINE_UNQUOTED(LASSO_WINDOWS_VERSION, $windows_version, [Windows version of current=`expr $VERSION_MAJOR + $VERSION_MINOR` LASSO_VERSION_INFO="$current:$VERSION_RELEASE:$VERSION_MINOR" AC_SUBST(LASSO_VERSION_INFO) -AC_MSG_RESULT([Setup version.]) # OSX Fink if test -d /sw/bin ; then @@ -237,8 +236,10 @@ fi changequote([, ])dnl if test "X$JAVA_VERSION" != X; then languages_available="$languages_available java($JAVA_VERSION)" - AM_CONDITIONAL([JAVA_ENABLED],[test "x$with_java" = "xyes"]) +else + with_java=no fi +AM_CONDITIONAL([JAVA_ENABLED],[test "x$with_java" = "xyes"]) AC_MSG_RESULT($with_java) if test "X$JAVA" = "Xgij"; then JAVAC_FLAGS="-C" @@ -293,12 +294,12 @@ if test "X$PYTHON_VERSION" != X; then AC_SUBST(PY_LIB_A) AC_SUBST(PY_SITE_PACKAGES) languages_available="$languages_available python($PYTHON_VERSION)" - AM_CONDITIONAL([PYTHON_ENABLED],[test "x$with_python" = "xyes"]) else with_python=false fi fi fi +AM_CONDITIONAL([PYTHON_ENABLED],[test "x$with_python" = "xyes"]) AC_MSG_RESULT($with_python) AC_SUBST(PYTHON_VERSION) |