From 73b1a8d6f82391eac845503c59d11ba30e9461a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Mon, 6 Feb 2012 11:01:10 +0000
Subject: [PATCH] change R configuration.

---
 configure     | 30 +++++++++++++++---------------
 configure.in  | 26 +++++++++++++-------------
 packages/real |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/configure b/configure
index d4a26d4f7..f18c5248d 100755
--- a/configure
+++ b/configure
@@ -1411,7 +1411,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
- --with-real=DIR           interface to R language
+ --with-R=DIR              interface to R language
  --enable-minisat           use minisat interface
  --with-cudd=DIR           use CUDD package in DIR
  --with-java=JAVA_HOME       use Java instalation in JAVA_HOME
@@ -4574,17 +4574,17 @@ fi
 
 
 
-# Check whether --with-real was given.
-if test "${with_real+set}" = set; then
-  withval=$with_real; if test "$withval" = yes; then
-	    yap_cv_real=yes
+# Check whether --with-R was given.
+if test "${with_R+set}" = set; then
+  withval=$with_R; if test "$withval" = yes; then
+	    yap_cv_R=yes
 	elif test "$withval" = no; then
-	    yap_cv_real=no
+	    yap_cv_R=no
 	else
-	    yap_cv_real=$with_real
+	    yap_cv_R=$with_R
 	fi
 else
-  yap_cv_real=yes
+  yap_cv_R=yes
 fi
 
 
@@ -6687,7 +6687,7 @@ fi
 
 fi
 
-if test "$yap_cv_real" = "no"; then
+if test "$yap_cv_R" = "no"; then
     REAL_TARGET="dummy"
     ENABLE_REAL="@# "
 elif test -e "$srcdir"/packages/real/Makefile.in ; then
@@ -6736,7 +6736,7 @@ fi
 done
 test -n "$REXE" || REXE=""none""
 
-   if test "$yap_cv_yapr" != "yes"
+   if test "$yap_cv_R" = "yes"
    then
      case "$target_os" in
 	*darwin*)
@@ -6773,16 +6773,16 @@ test -n "$REXE" || REXE=""none""
    else
        case "$target_os" in
 	  *cygwin*|*mingw*)
-            REAL_INCLUDES="-I\"$yap_cv_real/include\""
+            REAL_INCLUDES="-I\"$yap_cv_R/include\""
 	    if test "$YAP_TARGET" = i386; then
-	      REAL_LIBS="\"$yap_cv_real/bin/i386/R.dll\""
+	      REAL_LIBS="\"$yap_cv_R/bin/i386/R.dll\""
 	    else
-	      REAL_LIBS="\"$yap_cv_real/bin/x64/R.dll\""
+	      REAL_LIBS="\"$yap_cv_R/bin/x64/R.dll\""
 	    fi
 	   ;;
 	  *)
-            REAL_INCLUDES="-I$yap_cv_real/include"
-	    REAL_LIBS="-L $yap_cv_real/lib -lR"
+            REAL_INCLUDES="-I$yap_cv_R/include"
+	    REAL_LIBS="-L $yap_cv_R/lib -lR"
 	   ;;
          esac
   fi
diff --git a/configure.in b/configure.in
index 066d798c6..eefef95e7 100755
--- a/configure.in
+++ b/configure.in
@@ -232,16 +232,16 @@ AC_ARG_WITH(gmp,
 	fi,
 	[yap_cv_gmp=yes])
 
-AC_ARG_WITH(real,
-	[ --with-real[=DIR]           interface to R language],
+AC_ARG_WITH(R,
+	[ --with-R[=DIR]              interface to R language],
 	if test "$withval" = yes; then
-	    yap_cv_real=yes
+	    yap_cv_R=yes
 	elif test "$withval" = no; then
-	    yap_cv_real=no
+	    yap_cv_R=no
 	else
-	    yap_cv_real=$with_real
+	    yap_cv_R=$with_R
 	fi,
-	[yap_cv_real=yes])
+	[yap_cv_R=yes])
 
 dnl best test we could do.
 AC_ARG_WITH(minisat,
@@ -736,14 +736,14 @@ then
   AC_CHECK_LIB(gmp,main)
 fi
 
-if test "$yap_cv_real" = "no"; then
+if test "$yap_cv_R" = "no"; then
     REAL_TARGET="dummy"
     ENABLE_REAL="@# "
 elif test -e "$srcdir"/packages/real/Makefile.in ; then
    REAL_TARGET="ritf"
    ENABLE_REAL=""
    AC_CHECK_PROGS(REXE, R, "none")
-   if test "$yap_cv_yapr" != "yes"
+   if test "$yap_cv_R" = "yes"
    then
      case "$target_os" in
 	*darwin*)
@@ -782,16 +782,16 @@ elif test -e "$srcdir"/packages/real/Makefile.in ; then
    else
        case "$target_os" in
 	  *cygwin*|*mingw*)
-            REAL_INCLUDES="-I\"$yap_cv_real/include\""
+            REAL_INCLUDES="-I\"$yap_cv_R/include\""
 	    if test "$YAP_TARGET" = i386; then
-	      REAL_LIBS="\"$yap_cv_real/bin/i386/R.dll\""
+	      REAL_LIBS="\"$yap_cv_R/bin/i386/R.dll\""
 	    else
-	      REAL_LIBS="\"$yap_cv_real/bin/x64/R.dll\""
+	      REAL_LIBS="\"$yap_cv_R/bin/x64/R.dll\""
 	    fi
 	   ;;
 	  *)
-            REAL_INCLUDES="-I$yap_cv_real/include"
-	    REAL_LIBS="-L $yap_cv_real/lib -lR"
+            REAL_INCLUDES="-I$yap_cv_R/include"
+	    REAL_LIBS="-L $yap_cv_R/lib -lR"
 	   ;;
          esac
   fi
diff --git a/packages/real b/packages/real
index 06baa8a96..f4c629b19 160000
--- a/packages/real
+++ b/packages/real
@@ -1 +1 @@
-Subproject commit 06baa8a9663d092266b174cb9a4628dbc937d253
+Subproject commit f4c629b195e560662d211ad11054dda458de4ddb