Merge lp:~florian-rathgeber/fluidity/with-zoltan-no-configure-fix into lp:fluidity

[Florian Rathgeber]

Fix the "with_zoltan=no" configure option, which was without effect.

[Jon Hill (jon-hill)]

When I added this I made the decision that --with-zoltan=no was not the same as --with-sam, however, that was a stupid decision as --with-zoltan=no effectively means --with-sam. Thanks for fixing.

review: Approve

=== modified file 'configure'
--- configure	2012-03-28 16:32:39 +0000
+++ configure	2012-05-14 16:59:20 +0000
@@ -11713,12 +11713,12 @@
 fi
 
 if test "$enable_sam" = "yes"; then
+  HAVE_ZOLTAN=no
+else
+  if test "$with_zoltan" = no; then
     HAVE_ZOLTAN=no
-else
-    if test "$with_zoltan" = no; then
-        HAVE_ZOLTAN=no
-        echo "Warning: zoltan disabled, using libsam instead"
-    fi
+    echo "Warning: zoltan disabled, using libsam instead"
+  else
     HAVE_ZOLTAN=yes
     zoltan=yes
 
@@ -11836,11 +11836,11 @@
 
 echo $LIBS
 
+  fi
 fi
 
 
 
-
 HAVE_ADJOINT=no
 CAN_USE_ADJOINT=yes
 WANTS_ADJOINT=yes

=== modified file 'configure.in'
--- configure.in	2012-02-14 17:28:17 +0000
+++ configure.in	2012-05-14 16:59:20 +0000
@@ -801,23 +801,23 @@
 ACX_ParMetis([AC_MSG_NOTICE(["ParMetis found"])], [AC_MSG_WARN(["ParMetis not found"])])
 
 AC_ARG_ENABLE(sam,
-    [AC_HELP_STRING([--enable-sam],
-	    [use sam rather than zoltan for adaptive load rebalancing])])
+              [AC_HELP_STRING([--enable-sam],
+                              [use sam rather than zoltan for adaptive load rebalancing])])
 if test "$enable_sam" = "yes"; then
+  HAVE_ZOLTAN=no
+else
+  if test "$with_zoltan" = no; then
     HAVE_ZOLTAN=no
-else
-    if test "$with_zoltan" = no; then
-        HAVE_ZOLTAN=no
-        echo "Warning: zoltan disabled, using libsam instead"
-    fi
+    echo "Warning: zoltan disabled, using libsam instead"
+  else
     HAVE_ZOLTAN=yes
     zoltan=yes
     ACX_zoltan([AC_MSG_NOTICE(["Zoltan found"])], [AC_MSG_WARN(["Zoltan not found"])])
+  fi
 fi
 AC_SUBST(HAVE_ZOLTAN)
 
 
-
 HAVE_ADJOINT=no
 CAN_USE_ADJOINT=yes
 WANTS_ADJOINT=yes