raptor support

.gitmodules

@@ -51,4 +51,4 @@
 	url = git://git.code.sf.net/p/yap/ltx2htm
 [submodule "packages/raptor"]
 	path = packages/raptor
-	url = https://github.com/davidvaz/yap-raptor.git
+	url = git://git.code.sf.net/p/yap/raptor

configure.in

@@ -751,12 +751,6 @@ else
   ENABLE_ZLIB="@# "
 fi
 
-if test -e "$srcdir"/packages/raptor/Makefile.in; then
-  ENABLE_RAPTOR=""
-else
-  ENABLE_RAPTOR="@# "
-fi
-
 if test "$cross_compiling" = "yes"
 then
   YAP_EXTRAS=
@@ -1899,9 +1893,8 @@ fi
 
 m4_include([packages/gecode/configure.in])
 
-if test "$ENABLE_RAPTOR" = ""
+if test -e "$srcdir"/packages/raptor/Makefile.in; then
-then
+   m4_include([packages/raptor/configure.in])
-m4_include([packages/raptor/configure.in])
 fi
 
 m4_include([library/lammpi/configure.in])
@@ -2097,10 +2090,6 @@ if test "$ENABLE_GECODE" = ""; then
 AC_CONFIG_FILES([packages/gecode/Makefile])
 fi
 
-if test "$ENABLE_RAPTOR" = ""; then
-AC_CONFIG_FILES([packages/raptor/Makefile])
-fi
-
 if test "$ENABLE_PRISM" = ""; then
 AC_CONFIG_FILES([packages/prism/src/c/Makefile])
 AC_CONFIG_FILES([packages/prism/src/prolog/Makefile])