diff --git a/configure b/configure index b00f2a729..2681974b4 100755 --- a/configure +++ b/configure @@ -3393,7 +3393,7 @@ fi if test "$yap_cv_matlab" = no then - INSTALL_MATLAB="# " + INSTALL_MATLAB="@# " elif test "$yap_cv_matlab" = yes then INSTALL_MATLAB="" @@ -3414,7 +3414,7 @@ fi if test "$yap_cv_cudd" = no then - USE_CUDD="# " + USE_CUDD="@# " else USE_CUDD="" fi @@ -6843,7 +6843,7 @@ fi INSTALL_DLLS="#" EXTRA_OBJS="" -SHLIB_LD="@#" +SHLIB_LD="#" DO_SECOND_LD="#" M4="m4" MERGE_DLL_OBJS="#" @@ -7357,7 +7357,7 @@ if test "$rationaltrees" = "yes" -a "$coroutining" = "yes" then INSTALLCLP="" else - INSTALLCLP="#" + INSTALLCLP="@#" fi if test "$debugyap" = "yes" @@ -7709,7 +7709,7 @@ fi else - ENABLE_CPLINT="#" + ENABLE_CPLINT="@#" fi @@ -20358,7 +20358,7 @@ fi fi if test "$ENABLE_JPL" = ""; then -ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/src/java/Makefile" +ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20939,6 +20939,7 @@ do "packages/chr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/chr/Makefile" ;; "packages/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clpqr/Makefile" ;; "packages/jpl/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/Makefile" ;; + "packages/jpl/jpl_paths.yap") CONFIG_FILES="$CONFIG_FILES packages/jpl/jpl_paths.yap" ;; "packages/jpl/src/java/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/src/java/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -22183,6 +22184,7 @@ do "packages/chr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/chr/Makefile" ;; "packages/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clpqr/Makefile" ;; "packages/jpl/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/Makefile" ;; + "packages/jpl/jpl_paths.yap") CONFIG_FILES="$CONFIG_FILES packages/jpl/jpl_paths.yap" ;; "packages/jpl/src/java/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/src/java/Makefile" ;; "packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;; diff --git a/configure.in b/configure.in index 5c8db2187..a0a77b7b7 100644 --- a/configure.in +++ b/configure.in @@ -327,7 +327,7 @@ fi dnl condor does not like dynamic linking on Linux, DEC, and HP-UX platforms. if test "$yap_cv_matlab" = no then - INSTALL_MATLAB="# " + INSTALL_MATLAB="@# " elif test "$yap_cv_matlab" = yes then INSTALL_MATLAB="" @@ -348,7 +348,7 @@ fi if test "$yap_cv_cudd" = no then - USE_CUDD="# " + USE_CUDD="@# " else USE_CUDD="" fi @@ -736,7 +736,7 @@ fi dnl defaults INSTALL_DLLS="#" EXTRA_OBJS="" -SHLIB_LD="@#" +SHLIB_LD="#" DO_SECOND_LD="#" M4="m4" MERGE_DLL_OBJS="#" @@ -984,7 +984,7 @@ if test "$rationaltrees" = "yes" -a "$coroutining" = "yes" then INSTALLCLP="" else - INSTALLCLP="#" + INSTALLCLP="@#" fi if test "$debugyap" = "yes" @@ -1078,7 +1078,7 @@ if test ! "$yap_cv_cplint" = "no" AC_SUBST(CPLINT_LDFLAGS) AC_SUBST(CPLINT_SHLIB_LD) else - ENABLE_CPLINT="#" + ENABLE_CPLINT="@#" fi AC_SUBST(ENABLE_CPLINT) AC_SUBST(PRE_DYNLOADER_PATH) @@ -1559,7 +1559,7 @@ AC_OUTPUT(packages/clpqr/Makefile) fi if test "$ENABLE_JPL" = ""; then -AC_OUTPUT(packages/jpl/Makefile packages/jpl/src/java/Makefile) +AC_OUTPUT(packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile) fi if test "$USE_CUDD" = ""; then