Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

configure.in

@@ -58,6 +58,25 @@ AC_SUBST(C_INTERF_FLAGS)
 AC_SUBST(C_PARSER_FLAGS)
 AC_LANG(C)
 
+AC_CANONICAL_SYSTEM
+
+AC_DEFINE_UNQUOTED(HOST_ALIAS,"${target}")
+
+case "$target_cpu" in
+    i*86*)
+     YAP_TARGET=i386
+    ;;
+    x86*)
+      YAP_TARGET=amd64
+    ;;
+    sparc*)
+      YAP_TARGET=sparc
+    ;;
+    *)
+      YAP_TARGET=unknown
+    ;;
+ esac
+
 dnl Gecode support
 AC_CHECK_HEADER(gecode/support/config.hpp,
 	have_gecode=yes, have_gecode=no)
@@ -190,7 +209,6 @@ AC_ARG_WITH(gmp,
 AC_ARG_WITH(yapr,
 	[ --with-yapr[=DIR]           interface to R language, R installed in DIR],
 	if test "$withval" = yes; then
-		YAPR_INCLUDES="-I/usr/share/R/include"
 		yap_cv_yapr=yes
 	elif test "$withval" = no; then
 		yap_cv_yapr=no
@@ -420,10 +438,6 @@ AC_SUBST(DefHeapSpace)
 AC_SUBST(DefStackSpace)
 AC_SUBST(DefTrailSpace)
 
-AC_CANONICAL_SYSTEM
-
-AC_DEFINE_UNQUOTED(HOST_ALIAS,"${target}")
-
 if test "$or-parallelism" = no
 then
   AC_DEFINE(MAX_WORKERS,1)
@@ -694,11 +708,29 @@ then
        case "$target_os" in
 	*darwin*)
 	  YAPR_INCLUDES="-I/Library/Frameworks/R.framework/Headers"
-	EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -framework R -L /Library/Frameworks/R.framework/Libraries"
+	  EXTRA_LIBS_FOR_R="-framework R -L /Library/Frameworks/R.framework/Libraries -lR"
 	;;
 	**)		
-dnl one of the two may work (Fedora vs Ubuntu)
+          dnl R is spread all over the place
-	YAPR_INCLUDES="-I/usr/include/R -I/usr/share/R/include"
+	  dnl one of the two may work (Fedora/Ubuntu)
+          if test -n "$R_HOME" ; then
+	    YAPR_INCLUDES="-I$R_HOME/include"
+          elif test "$YAP_TARGET" = amd64 -a -d /usr/lib64/R/include ; then
+	    YAPR_INCLUDES="-I/usr/lib64/R/include"
+          elif test -d /usr/include/R; then
+	    YAPR_INCLUDES="-I/usr/include/R"
+          elif test -d /usr/share/R/include; then
+	    YAPR_INCLUDES="-I/usr/share/R/include"
+	  fi	
+	  echo $YAP_TARGET
+          if test -n "$R_HOME" ; then
+	    EXTRA_LIBS_FOR_R="-I$R_HOME/lib -lR"
+          elif test "$YAP_TARGET" = amd64 -a -d /usr/lib64/R/lib; then
+	    EXTRA_LIBS_FOR_R="-L /usr/lib64/R/lib -lR"
+          elif test -d /usr/lib/R; then
+	    EXTRA_LIBS_FOR_R="-L /usr/lib/R/lib -lR"
+	  fi
+        ;;
 	esac
    fi
    AC_CHECK_LIB(R,main)
@@ -905,18 +937,7 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
 	        JAVAINCPATH="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/solaris"
                 ;;
               esac
-              case "$target_cpu" in
+	       JAVALIBPATH="-L$JAVA_HOME/jre/lib/$YAP_TARGET -L$JAVA_HOME/jre/lib/$YAP_TARGET/client  -L$JAVA_HOME/jre/lib/$YAP_TARGET/server   -Wl,-R,$JAVA_HOME/jre/lib/$YAP_TARGET -ljava -lverify -ljvm "
-	        i*86*)
-                JAVA_TARGET=i386
-                ;;
-                x86*)
-                JAVA_TARGET=amd64
-               ;;
-               sparc*)
-               JAVA_TARGET=sparc
-                ;;
-               esac
-	       JAVALIBPATH="-L$JAVA_HOME/jre/lib/$JAVA_TARGET -L$JAVA_HOME/jre/lib/$JAVA_TARGET/client  -L$JAVA_HOME/jre/lib/$JAVA_TARGET/server   -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -ljava -lverify -ljvm "
 	       	  ;;
 	esac
 	if test "$yap_cv_java" = ""; then
@@ -1672,6 +1693,7 @@ AC_SUBST(CUDD_CPPFLAGS)
 AC_SUBST(ENABLE_MINISAT)
 AC_SUBST(ENABLE_YAPR)
 AC_SUBST(YAPR_INCLUDES)
+AC_SUBST(EXTRA_LIBS_FOR_R)
 AC_SUBST(INSTALL_MATLAB)
 AC_SUBST(MATLAB_INCLUDE)
 

packages/YapR

@@ -1 +1 @@
-Subproject commit a6646d0be1d1d63782e0c1395dd449183fdd8988
+Subproject commit d3e30e57bba654350b88c49a82c1c386a40aa63d