[MOAB-dev] r4498 - in MOAB/trunk: . tools/mbzoltan

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-02-16 09:52:48 -0600 (Wed, 16 Feb 2011)
New Revision: 4498

Added:
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Removed:
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
   MOAB/trunk/tools/mbzoltan/mbzoltan.cpp
Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/tools/mbzoltan/Makefile.am
Log:
merge changes from Version4.0 branch

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-02-16 15:49:13 UTC (rev 4497)
+++ MOAB/trunk/configure.ac	2011-02-16 15:52:48 UTC (rev 4498)
@@ -609,6 +609,10 @@
 # build variables.
 if test "xyes" = "x$WITH_ZOLTAN"; then
 
+  if test "xyes" != "x$WITH_MPI"; then
+    AC_MSG_ERROR([Cannot include Zoltan support without MPI.  See --with-mpi])
+  fi
+
     # Test for zoltan headers
   AC_LANG_PUSH([C++])
   old_CPPFLAGS="$CPPFLAGS"
@@ -647,7 +651,7 @@
     [unset ac_cv_lib_zoltan_Zoltan_LB_Partition
      AC_CHECK_LIB([zoltan],[Zoltan_LB_Partition],
                   [ZOLTAN_LIBS="-lzoltan -lparmetis -lmetis"],
-                  [AC_MSG_ERROR("libzoltan not found in $ZOLTAN_LIB_FLAGS")],
+                  [AC_MSG_ERROR([zoltan library not found or not usable.  Perhaps you need to specify --with-parmetis=@<:@DIR@:>@?])],
                   [-lparmetis -lmetis])])
   LDFLAGS="$old_LDFLAGS"
   

Modified: MOAB/trunk/tools/mbzoltan/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbzoltan/Makefile.am	2011-02-16 15:49:13 UTC (rev 4497)
+++ MOAB/trunk/tools/mbzoltan/Makefile.am	2011-02-16 15:52:48 UTC (rev 4498)
@@ -12,9 +12,8 @@
 libmbzoltan_la_SOURCES = MBZoltan.cpp
 libmbzoltan_la_include_HEADERS = MBZoltan.hpp
 
-bin_PROGRAMS = mbzoltan mbpart
+bin_PROGRAMS = mbzoltan
 LDADD = libmbzoltan.la
-mbzoltan_SOURCES = mbzoltan.cpp
-mbpart_SOURCES = mbpart.cpp
+mbzoltan_SOURCES = mbpart.cpp
 
 

Deleted: MOAB/trunk/tools/mbzoltan/mbpart.cpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/mbpart.cpp	2011-02-16 15:49:13 UTC (rev 4497)
+++ MOAB/trunk/tools/mbzoltan/mbpart.cpp	2011-02-16 15:52:48 UTC (rev 4498)
@@ -1,11 +0,0 @@
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <list>