support new version of jpl

make system more robust to missing packages
This commit is contained in:
Vitor Santos Costa 2009-03-23 12:23:00 +00:00
parent 4188091d01
commit 981dc3d5d7
3 changed files with 181 additions and 48 deletions

View File

@ -610,7 +610,7 @@ all: startup
@INSTALL_DLLS@ (cd packages/PLStream; $(MAKE))
@INSTALL_DLLS@ (cd packages/sgml; $(MAKE))
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ENABLE_CPLINT@ (cd cplint; $(MAKE))
@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
@ -652,7 +652,7 @@ install_unix: startup libYap.a
@INSTALL_DLLS@ (cd library/lammpi; $(MAKE) install)
@INSTALL_DLLS@ (cd library/matrix; $(MAKE) install)
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
mkdir -p $(DESTDIR)$(INCLUDEDIR)
for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
@ENABLE_CPLINT@ (cd cplint; $(MAKE) install)
@ -696,17 +696,17 @@ install_data:
(cd library ; $(MAKE) install)
(cd LGPL ; $(MAKE) install)
(cd GPL ; $(MAKE) install)
@ENABLE_JPL@ (cd LGPL/JPL ; $(MAKE) install)
@ENABLE_JPL@ (cd LGPL/JPL/java; $(MAKE) install)
@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
@ENABLE_JPL@ (cd packages/jpl; $(MAKE) install)
$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/
$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/
# (cd CLPQR ; $(MAKE) install)
@INSTALLCLP@(cd LGPL/clp ; $(MAKE) install)
# (cd CHR ; $(MAKE) install)
@INSTALLCLP@(cd packages/chr ; $(MAKE) install)
@INSTALLCLP@(cd packages/clpqr ; $(MAKE) install)
@INSTALLCLP@(cd packages/CLPBN ; $(MAKE) install)
@ENABLE_CLPQR@(cd packages/clpqr ; $(MAKE) install)
(cd packages/CLPBN ; $(MAKE) install)
(cd packages/ProbLog ; $(MAKE) install)
@ENABLE_CHR@ (cd packages/chr ; $(MAKE) install)
##########
@ -732,7 +732,7 @@ clean: clean_docs
@INSTALL_DLLS@ (cd library/tries; $(MAKE) clean)
@INSTALL_DLLS@ (cd library/lammpi; $(MAKE) clean)
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) clean)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; $(MAKE) clean)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean)
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean)
@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean)

123
configure vendored
View File

@ -705,9 +705,14 @@ YAPLIB
DYNYAPLIB
YAP_EXTRAS
NO_BUILTIN_REGEXP
ENABLE_CHR
ENABLE_CLPQR
ENABLE_JPL
JAVA_HOME
JUNIT
JAVAC
JAVADOC
JAVALIBS
JAR
IN_UNIX
YAPMPILIB
@ -1336,6 +1341,7 @@ Optional Features:
--enable-use-malloc use malloc to allocate memory
--enable-condor allow Yap to be used from condor
--enable-chr install chr library
--enable-clpqr install clpqr library
--enable-april compile Yap to support April ILP system
--enable-dlcompat use dlcompat library for dynamic loading on Mac OS X
--enable-cplint=DIR enable the cplint library using the glu library in DIR/lib
@ -1359,6 +1365,7 @@ Optional Packages:
--with-trail-space=space default trail size in Kbytes
--with-max-workers=integer maximum number of or-parallel processes
--with-max-threads=integer maximum number of or-parallel processes
--with-junit=PATH Specify location of the junit JAR file
Some influential environment variables:
CC C compiler command
@ -2853,6 +2860,13 @@ else
use_chr=yes
fi
# Check whether --enable-clpqr was given.
if test "${enable_clpqr+set}" = set; then
enableval=$enable_clpqr; use_clpqr="$enableval"
else
use_clpqr=yes
fi
# Check whether --enable-april was given.
if test "${enable_april+set}" = set; then
@ -3131,6 +3145,20 @@ else
fi
# Check whether --with-junit was given.
if test "${with_junit+set}" = set; then
withval=$with_junit; case "$withval" in
yes) JUNIT=/usr/share/java/junit.jar
;;
no) JUNIT=""
;;
*) JUNIT="$withval"
;;
esac
fi
if test "$tabling" = yes -o "$orparallelism" = yes -o "$threads" = yes
then
cat >>confdefs.h <<\_ACEOF
@ -6096,14 +6124,55 @@ _ACEOF
use_malloc=yes
fi
if test "$yap_cv_jpl" = no
then
ENABLE_JPL="@#"
if test ! -z "$GCC"; then
COFLAGS="${COFLAGS--O2 -cc-options,-fno-strict-aliasing}"
CWFLAGS="${CWFLAGS--Wall}"
else
COFLAGS="${COFLAGS--O}"
CWFLAGS="${CWFLAGS-}"
fi
CMFLAGS=-fpic
CIFLAGS=-I.
if test "$use_chr" = no; then
ENABLE_CHR="@# "
elif test -d "$srcdir"/packages/chr; then
ENABLE_CHR=""
else
ENABLE_CHR="@# "
fi
if test "$use_clpqr" = no; then
ENABLE_CLPQR="@# "
elif test -d "$srcdir"/packages/clpqr; then
ENABLE_CLPQR=""
else
ENABLE_CLPQR="@# "
fi
if test "$yap_cv_jpl" = no; then
ENABLE_JPL="@#"
elif test -d "$srcdir"/packages/clpqr; then
ENABLE_JPL=""
JAVA_HOME="$yap_cv_jpl"
JAVAC="$yap_cv_jpl"/bin/javac
if test "x$JAVALIBS" = "x"; then
case "$PLARCH" in
*darwin*)
JAVALIBS="-Wl,-framework,JavaVM"
;;
*powerpc-linux*)
JAVALIBS="-ljava -ljvm"
;;
*)
JAVALIBS="-ljava -lverify -ljvm"
;;
esac
fi
JAR="$yap_cv_jpl"/bin/jar
JAVAC="$yap_cv_jpl"/bin/javac
JAVADOC="$yap_cv_jpl"/bin/javadoc
else
ENABLE_JPL="@#"
fi
LAM_MPI_CC=${MPI_CC}
@ -13805,6 +13874,11 @@ EXEC_SUFFIX=""
@ -16542,28 +16616,27 @@ mkdir -p library/tries
mkdir -p library/rltree
mkdir -p library/lammpi
mkdir -p library/yap2swi
mkdir -p LGPL
mkdir -p LGPL/JPL
mkdir -p LGPL/JPL/java
mkdir -p LGPL/JPL/java/jpl
mkdir -p LGPL/JPL/java/jpl/fli
mkdir -p LGPL/JPL/java/jpl/test
mkdir -p LGPL/JPL/src
mkdir -p LGPL/clp
mkdir -p LGPL/swi_console
mkdir -p packages/PLStream
mkdir -p GPL
mkdir -p GPL/http
mkdir -p packages/chr
mkdir -p packages/CLPBN
mkdir -p packages/clpqr
mkdir -p packages/cplint
mkdir -p packages/jpl
mkdir -p packages/jpl/src/java
mkdir -p packages/jpl/src/java/jpl
mkdir -p packages/jpl/src/java/jpl/fli
mkdir -p packages/jpl/src/java/jpl/test
mkdir -p packages/jpl/examples
mkdir -p packages/jpl/examples/java
mkdir -p packages/PLStream
mkdir -p packages/ProbLog
mkdir -p packages/ProbLog/simplecudd
mkdir -p packages/clpqr
mkdir -p packages/sgml
ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile packages/chr/Makefile packages/CLPBN/Makefile LGPL/clp/Makefile packages/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile packages/cplint/Makefile packages/sgml/Makefile packages/PLStream/Makefile packages/ProbLog/Makefile packages/ProbLog/simplecudd/Makefile"
ac_config_files="$ac_config_files Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile packages/chr/Makefile packages/CLPBN/Makefile LGPL/clp/Makefile packages/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile packages/jpl/Makefile packages/jpl/src/java/Makefile GPL/Makefile packages/cplint/Makefile packages/sgml/Makefile packages/PLStream/Makefile packages/ProbLog/Makefile packages/ProbLog/simplecudd/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -17138,11 +17211,8 @@ do
"library/tries/Makefile") CONFIG_FILES="$CONFIG_FILES library/tries/Makefile" ;;
"library/rltree/Makefile") CONFIG_FILES="$CONFIG_FILES library/rltree/Makefile" ;;
"LGPL/swi_console/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/swi_console/Makefile" ;;
"LGPL/JPL/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/JPL/Makefile" ;;
"LGPL/JPL/src/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/JPL/src/Makefile" ;;
"LGPL/JPL/java/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/JPL/java/Makefile" ;;
"LGPL/JPL/jpl_paths.yap") CONFIG_FILES="$CONFIG_FILES LGPL/JPL/jpl_paths.yap" ;;
"GPL/http/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/http/Makefile" ;;
"packages/jpl/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/Makefile" ;;
"packages/jpl/src/java/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/src/java/Makefile" ;;
"GPL/Makefile") CONFIG_FILES="$CONFIG_FILES GPL/Makefile" ;;
"packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;;
"packages/sgml/Makefile") CONFIG_FILES="$CONFIG_FILES packages/sgml/Makefile" ;;
@ -17302,11 +17372,11 @@ YAPLIB!$YAPLIB$ac_delim
DYNYAPLIB!$DYNYAPLIB$ac_delim
YAP_EXTRAS!$YAP_EXTRAS$ac_delim
NO_BUILTIN_REGEXP!$NO_BUILTIN_REGEXP$ac_delim
ENABLE_CHR!$ENABLE_CHR$ac_delim
ENABLE_CLPQR!$ENABLE_CLPQR$ac_delim
ENABLE_JPL!$ENABLE_JPL$ac_delim
JAVA_HOME!$JAVA_HOME$ac_delim
JAVAC!$JAVAC$ac_delim
JAR!$JAR$ac_delim
IN_UNIX!$IN_UNIX$ac_delim
JUNIT!$JUNIT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -17348,6 +17418,11 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
JAVAC!$JAVAC$ac_delim
JAVADOC!$JAVADOC$ac_delim
JAVALIBS!$JAVALIBS$ac_delim
JAR!$JAR$ac_delim
IN_UNIX!$IN_UNIX$ac_delim
YAPMPILIB!$YAPMPILIB$ac_delim
LAM_MPI_CC!$LAM_MPI_CC$ac_delim
MPI_OBJS!$MPI_OBJS$ac_delim
@ -17374,7 +17449,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

View File

@ -2,7 +2,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
dnl
AC_PREREQ(2.13)
AC_PREREQ([2.50])
AC_INIT(console/yap.c)
AC_CONFIG_HEADER(config.h)
@ -72,6 +72,9 @@ AC_ARG_ENABLE(condor,
AC_ARG_ENABLE(chr,
[ --enable-chr install chr library ],
use_chr="$enableval", use_chr=yes)
AC_ARG_ENABLE(clpqr,
[ --enable-clpqr install clpqr library ],
use_clpqr="$enableval", use_clpqr=yes)
AC_ARG_ENABLE(april,
[ --enable-april compile Yap to support April ILP system],
@ -277,6 +280,16 @@ AC_ARG_WITH(max-threads,
fi,
[yap_cv_max_threads="1024"])
AC_ARG_WITH(junit, [ --with-junit=PATH Specify location of the junit JAR file],
[case "$withval" in
yes) JUNIT=/usr/share/java/junit.jar
;;
no) JUNIT=""
;;
*) JUNIT="$withval"
;;
esac])
if test "$tabling" = yes -o "$orparallelism" = yes -o "$threads" = yes
then
AC_DEFINE(MinHeapSpace, (1000*SIZEOF_INT_P))
@ -610,14 +623,55 @@ then
use_malloc=yes
fi
if test "$yap_cv_jpl" = no
then
ENABLE_JPL="@#"
if test ! -z "$GCC"; then
COFLAGS="${COFLAGS--O2 -cc-options,-fno-strict-aliasing}"
CWFLAGS="${CWFLAGS--Wall}"
else
COFLAGS="${COFLAGS--O}"
CWFLAGS="${CWFLAGS-}"
fi
CMFLAGS=-fpic
CIFLAGS=-I.
if test "$use_chr" = no; then
ENABLE_CHR="@# "
elif test -d "$srcdir"/packages/chr; then
ENABLE_CHR=""
else
ENABLE_CHR="@# "
fi
if test "$use_clpqr" = no; then
ENABLE_CLPQR="@# "
elif test -d "$srcdir"/packages/clpqr; then
ENABLE_CLPQR=""
else
ENABLE_CLPQR="@# "
fi
if test "$yap_cv_jpl" = no; then
ENABLE_JPL="@#"
elif test -d "$srcdir"/packages/clpqr; then
ENABLE_JPL=""
JAVA_HOME="$yap_cv_jpl"
JAVAC="$yap_cv_jpl"/bin/javac
if test "x$JAVALIBS" = "x"; then
case "$PLARCH" in
*darwin*)
JAVALIBS="-Wl,-framework,JavaVM"
;;
*powerpc-linux*)
JAVALIBS="-ljava -ljvm"
;;
*)
JAVALIBS="-ljava -lverify -ljvm"
;;
esac
fi
JAR="$yap_cv_jpl"/bin/jar
JAVAC="$yap_cv_jpl"/bin/javac
JAVADOC="$yap_cv_jpl"/bin/javadoc
else
ENABLE_JPL="@#"
fi
LAM_MPI_CC=${MPI_CC}
@ -1152,9 +1206,14 @@ AC_SUBST(INSTALL_INFO)
dnl let YAP_EXTRAS fall through configure, from the env into Makefile
AC_SUBST(YAP_EXTRAS)
AC_SUBST(NO_BUILTIN_REGEXP)
AC_SUBST(ENABLE_CHR)
AC_SUBST(ENABLE_CLPQR)
AC_SUBST(ENABLE_JPL)
AC_SUBST(JAVA_HOME)
AC_SUBST(JUNIT)
AC_SUBST(JAVAC)
AC_SUBST(JAVADOC)
AC_SUBST(JAVALIBS)
AC_SUBST(JAR)
AC_SUBST(IN_UNIX)
AC_SUBST(YAPMPILIB)
@ -1469,28 +1528,27 @@ mkdir -p library/tries
mkdir -p library/rltree
mkdir -p library/lammpi
mkdir -p library/yap2swi
mkdir -p LGPL
mkdir -p LGPL/JPL
mkdir -p LGPL/JPL/java
mkdir -p LGPL/JPL/java/jpl
mkdir -p LGPL/JPL/java/jpl/fli
mkdir -p LGPL/JPL/java/jpl/test
mkdir -p LGPL/JPL/src
mkdir -p LGPL/clp
mkdir -p LGPL/swi_console
mkdir -p packages/PLStream
mkdir -p GPL
mkdir -p GPL/http
mkdir -p packages/chr
mkdir -p packages/CLPBN
mkdir -p packages/clpqr
mkdir -p packages/cplint
mkdir -p packages/jpl
mkdir -p packages/jpl/src/java
mkdir -p packages/jpl/src/java/jpl
mkdir -p packages/jpl/src/java/jpl/fli
mkdir -p packages/jpl/src/java/jpl/test
mkdir -p packages/jpl/examples
mkdir -p packages/jpl/examples/java
mkdir -p packages/PLStream
mkdir -p packages/ProbLog
mkdir -p packages/ProbLog/simplecudd
mkdir -p packages/clpqr
mkdir -p packages/sgml
AC_OUTPUT(Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile packages/chr/Makefile packages/CLPBN/Makefile LGPL/clp/Makefile packages/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap GPL/http/Makefile GPL/Makefile packages/cplint/Makefile packages/sgml/Makefile packages/PLStream/Makefile packages/ProbLog/Makefile packages/ProbLog/simplecudd/Makefile)
AC_OUTPUT(Makefile library/matrix/Makefile library/matlab/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/Makefile packages/chr/Makefile packages/CLPBN/Makefile LGPL/clp/Makefile packages/clpqr/Makefile library/lammpi/Makefile library/tries/Makefile library/rltree/Makefile LGPL/swi_console/Makefile packages/jpl/Makefile packages/jpl/src/java/Makefile GPL/Makefile packages/cplint/Makefile packages/sgml/Makefile packages/PLStream/Makefile packages/ProbLog/Makefile packages/ProbLog/simplecudd/Makefile)
make depend
(cd packages/PLStream; make depend; cd ../..)