support cases where we do not have g++ or we don't want minisat.

Makefile.in

@@ -473,7 +473,7 @@ all: startup.yss
 	@INSTALL_DLLS@ (cd library/matrix; $(MAKE))
 	@INSTALL_DLLS@ (cd packages/sgml; $(MAKE))
 	@INSTALL_DLLS@ (cd packages/plunit; $(MAKE))
-	@INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE))
+	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE))
 	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE))
 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
 	@ENABLE_CPLINT@ (cd cplint; $(MAKE))
@@ -510,7 +510,7 @@ install_unix: startup.yss libYap.a
 	@INSTALL_DLLS@ (cd packages/PLStream; $(MAKE) install)
 	@INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install)
 	@INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install)
-	@INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE) install)
+	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	@INSTALL_DLLS@ (cd library/random; $(MAKE) install)
 	@INSTALL_DLLS@ (cd library/regex; $(MAKE) install)
 	@INSTALL_DLLS@ (cd library/rltree; $(MAKE) install)
@@ -549,7 +549,7 @@ install_win32: startup.yss
 	(cd packages/PLStream; $(MAKE) install)
 	(cd packages/plunit; $(MAKE) install)
 	(cd packages/sgml; $(MAKE) install)
-	(cd packages/swi-minisat2/C; $(MAKE) install)
+	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	(cd library/random; $(MAKE) install)
 	(cd library/matrix; $(MAKE) install)
 	(cd library/regex; $(MAKE) install)
@@ -606,6 +606,7 @@ clean: clean_docs
 	@INSTALL_DLLS@ (cd library/rltree; $(MAKE) clean)
 	@INSTALL_DLLS@ (cd library/tries; $(MAKE) clean)
 	@INSTALL_DLLS@ (cd library/lammpi; $(MAKE) clean)
+	@USE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean)
 	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) clean)
 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean)

configure

@@ -644,6 +644,7 @@ PROLOG_SYSTEM
 M4GENABSMI
 MATLAB_INCLUDE
 INSTALL_MATLAB
+USE_MINISAT
 CUDD_CPPFLAGS
 CUDD_LDFLAGS
 USE_CUDD
@@ -800,6 +801,7 @@ enable_april
 enable_dlcompat
 enable_cplint
 with_gmp
+with_minisat
 with_cudd
 enable_myddas
 enable_myddas_stats
@@ -1484,6 +1486,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-gmp=DIR           use GNU Multiple Precision in DIR
+ --enable-minisat           use minisat interface
  --with-cudd=DIR           use CUDD package in DIR
  --with-jpl=JAVA_HOME       use Java instalation in JAVA_HOME
  --with-readline=DIR      use GNU Readline Library in DIR
@@ -3488,6 +3491,21 @@ fi
 
 
 
+# Check whether --with-minisat was given.
+if test "${with_minisat+set}" = set; then
+  withval=$with_minisat; if test "$withval" = yes; then
+		yap_cv_minisat=yes
+	elif test "$withval" = no; then
+		yap_cv_minisat=no
+	else
+		yap_cv_minisat=$GXX
+	fi
+else
+  yap_cv_minisat=yes
+fi
+
+
+
 # Check whether --with-cudd was given.
 if test "${with_cudd+set}" = set; then
   withval=$with_cudd; if test "$withval" = yes; then
@@ -4001,6 +4019,16 @@ else
   USE_CUDD=""
 fi
 
+if test "$yap_cv_minisat" = no
+then
+  USE_MINISAT="@# "
+elif test "$INSTALL_DLLS" = "#"
+then
+  USE_MINISAT="@# "
+else
+  USE_MINISAT=""
+fi
+
 if test "$use_condor" = yes
 then
   use_malloc="yes"
@@ -14460,6 +14488,7 @@ EXEC_SUFFIX=""
 
 
 
+
 
 
 { $as_echo "$as_me:$LINENO: checking for gcc threaded code" >&5
@@ -17718,10 +17747,6 @@ ac_config_files="$ac_config_files packages/plunit/Makefile"
 
 ac_config_files="$ac_config_files packages/ProbLog/Makefile"
 
-ac_config_files="$ac_config_files packages/swi-minisat2/Makefile"
-
-ac_config_files="$ac_config_files packages/swi-minisat2/C/Makefile"
-
 ac_config_files="$ac_config_files packages/sgml/Makefile"
 
 
@@ -17745,6 +17770,13 @@ ac_config_files="$ac_config_files packages/ProbLog/simplecudd/Makefile"
 
 fi
 
+if test "$USE_MINISAT" = ""; then
+ac_config_files="$ac_config_files packages/swi-minisat2/Makefile"
+
+ac_config_files="$ac_config_files packages/swi-minisat2/C/Makefile"
+
+fi
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -18362,8 +18394,6 @@ do
     "packages/PLStream/Makefile") CONFIG_FILES="$CONFIG_FILES packages/PLStream/Makefile" ;;
     "packages/plunit/Makefile") CONFIG_FILES="$CONFIG_FILES packages/plunit/Makefile" ;;
     "packages/ProbLog/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/Makefile" ;;
-    "packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;;
-    "packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;;
     "packages/sgml/Makefile") CONFIG_FILES="$CONFIG_FILES packages/sgml/Makefile" ;;
     "packages/chr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/chr/Makefile" ;;
     "packages/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clpqr/Makefile" ;;
@@ -18371,6 +18401,8 @@ do
     "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" ;;
+    "packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;;
+    "packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

configure.in

@@ -77,7 +77,7 @@ AC_ARG_ENABLE(chr,
 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],
 	use_april="$enableval", use_april=no)
@@ -103,6 +103,18 @@ AC_ARG_WITH(gmp,
 	fi,
 	[yap_cv_gmp=yes])
 
+dnl best test we could do.
+AC_ARG_WITH(minisat,
+	[ --enable-minisat           use minisat interface],
+	if test "$withval" = yes; then
+		yap_cv_minisat=yes
+	elif test "$withval" = no; then
+		yap_cv_minisat=no
+	else
+		yap_cv_minisat="$GXX"
+	fi,
+	[yap_cv_minisat=yes])
+
 AC_ARG_WITH(cudd,
 	[ --with-cudd[=DIR]           use CUDD package in DIR],
 	if test "$withval" = yes; then
@@ -359,6 +371,16 @@ else
   USE_CUDD=""
 fi
 
+if test "$yap_cv_minisat" = no 
+then
+  USE_MINISAT="@# "
+elif test "$INSTALL_DLLS" = "#" 
+then
+  USE_MINISAT="@# "
+else
+  USE_MINISAT=""
+fi
+
 dnl condor does not like dynamic linking on Linux, DEC, and HP-UX platforms.
 if test "$use_condor" = yes 
 then
@@ -1330,6 +1352,7 @@ AC_SUBST(ENABLE_WINCONSOLE)
 AC_SUBST(USE_CUDD)
 AC_SUBST(CUDD_LDFLAGS)
 AC_SUBST(CUDD_CPPFLAGS)
+AC_SUBST(USE_MINISAT)
 AC_SUBST(INSTALL_MATLAB)
 AC_SUBST(MATLAB_INCLUDE)
 
@@ -1667,8 +1690,6 @@ AC_CONFIG_FILES([packages/cplint/Makefile])
 AC_CONFIG_FILES([packages/PLStream/Makefile])
 AC_CONFIG_FILES([packages/plunit/Makefile])
 AC_CONFIG_FILES([packages/ProbLog/Makefile ])
-AC_CONFIG_FILES([packages/swi-minisat2/Makefile])
-AC_CONFIG_FILES([packages/swi-minisat2/C/Makefile])
 AC_CONFIG_FILES([packages/sgml/Makefile])
 
 if test "$ENABLE_CHR" = ""; then
@@ -1687,5 +1708,10 @@ if test "$USE_CUDD" = ""; then
 AC_CONFIG_FILES([packages/ProbLog/simplecudd/Makefile])
 fi
 
+if test "$USE_MINISAT" = ""; then
+AC_CONFIG_FILES([packages/swi-minisat2/Makefile])
+AC_CONFIG_FILES([packages/swi-minisat2/C/Makefile])
+fi
+
 AC_OUTPUT()