[MOAB-dev] commit/MOAB: danwu: For consistency, add macro HAVE_ZOLTAN to top-level AM_CPPFLAGS in configure.ac (similar to NETCDF_FILE and HDF5_FILE). Also remove it from src/Makefile.am, src/io/Makefile.am, and test/parallel/Makefile.am.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/a26cddd7e512/
Changeset:   a26cddd7e512
Branch:      master
User:        danwu
Date:        2013-11-08 17:31:18
Summary:     For consistency, add macro HAVE_ZOLTAN to top-level AM_CPPFLAGS in configure.ac (similar to NETCDF_FILE and HDF5_FILE). Also remove it from src/Makefile.am, src/io/Makefile.am, and test/parallel/Makefile.am.

Affected #:  4 files

diff --git a/configure.ac b/configure.ac
index 937385d..bdc225b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,7 +698,7 @@ if test "xyes" = "x$WITH_ZOLTAN"; then
                   [#include <stdlib.h>])
   CPPFLAGS="$old_CPPFLAGS"
   AC_LANG_POP([C++])
-  
+
     # Build LDFLAGS for Zoltan
   found=no
   if test "x" != "x$ZOLTAN_DIR"; then
@@ -720,7 +720,7 @@ if test "xyes" = "x$WITH_ZOLTAN"; then
       ZOLTAN_LIB_FLAGS="$ZOLTAN_LIB_FLAGS -L$ZOLTAN_DIR"
     fi
   fi
-  
+
     # Test for Zoltan library, possibly requiring parmetis
   old_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $ZOLTAN_LIB_FLAGS"
@@ -731,7 +731,9 @@ if test "xyes" = "x$WITH_ZOLTAN"; then
                   [AC_MSG_ERROR([zoltan library not found or not usable.  Perhaps you need to specify --with-parmetis=@<:@DIR@:>@?])],
                   [-lparmetis -lmetis])])
   LDFLAGS="$old_LDFLAGS"
-  
+
+    # Define macro HAVE_ZOLTAN
+  AM_CPPFLAGS="$AM_CPPFLAGS -DHAVE_ZOLTAN"  
 fi
 
 AC_SUBST(ZOLTAN_LIBS)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a86984..64b8a0f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ AM_CPPFLAGS += -DIS_BUILDING_MB \
 # The directory in which to install headers
 libMOAB_la_includedir = $(includedir)
 
-
 # The list of source files, and any header files that do not need to be installed
 libMOAB_la_SOURCES = \
   AdaptiveKDTree.cpp \
@@ -205,23 +204,24 @@ nobase_libMOAB_la_include_HEADERS = \
   MOAB_FCDefs.h \
   MBCN_protos.h \
   MBTagConventions.hpp
+
 if ENABLE_mbzoltan
   libMOAB_la_SOURCES += $(srcdir)/../tools/mbzoltan/MBZoltan.cpp
   nobase_libMOAB_la_include_HEADERS += $(srcdir)/../tools/mbzoltan/MBZoltan.hpp
-  AM_CPPFLAGS +=  $(ZOLTAN_INC_FLAGS) -DHAVE_ZOLTAN
+  AM_CPPFLAGS += $(ZOLTAN_INC_FLAGS)
   # not sure yet if this is needed; will see when linking io reader (MPAS so far)
   # the tool mbpart needed it, and it just includes MBZoltan.hpp; so it needs ways to find 
   # the libraries zoltan depends on
   libMOAB_la_LIBADD += $(ZOLTAN_LIBS) $(ZOLTAN_LIB_FLAGS)
 endif
+
 if HAVE_CGM
   AM_CPPFLAGS += @CGM_CPPFLAGS@ -DCGM @MOAB_CGM_DEFINES@
 endif
-  
+
 MBCN_protos.h: MBCN.h $(top_srcdir)/itaps/mkprotos.sh
 	$(AM_V_GEN)$(top_srcdir)/itaps/mkprotos.sh MBCN MOAB $< $@ MOAB_FCDefs.h
 
-
 MOAB_FCDefs.h: FCDefs.h
 	$(AM_V_GEN)cd .. && ./config.status src/MOAB_FCDefs.h
 

diff --git a/src/io/Makefile.am b/src/io/Makefile.am
index 968f47f..60caa48 100644
--- a/src/io/Makefile.am
+++ b/src/io/Makefile.am
@@ -40,8 +40,9 @@ endif
 endif
 
 if ENABLE_mbzoltan
-  AM_CPPFLAGS += -DHAVE_ZOLTAN -I$(srcdir)/../../tools/mbzoltan $(ZOLTAN_INC_FLAGS) 
+  AM_CPPFLAGS += -I$(srcdir)/../../tools/mbzoltan $(ZOLTAN_INC_FLAGS) 
 endif
+
 if HDF5_FILE
   libmoabio_la_LIBADD += mhdf/libmhdf.la
   MOAB_HDF5_SRCS = HDF5Common.cpp \
@@ -58,6 +59,7 @@ if HDF5_FILE
 else
   MOAB_HDF5_SRCS = 
 endif
+
 if CCMIO_FILE
   MOAB_CCMIO_SRCS = WriteCCMIO.cpp WriteCCMIO.hpp ReadCCMIO.cpp ReadCCMIO.hpp
   libmoabio_la_LIBADD += $(CCMIO_LIBS)
@@ -142,7 +144,5 @@ libmoabio_la_SOURCES = \
   $(MOAB_DAMSEL_SRCS) \
   $(MOAB_CGM_SRCS)
 
-
 libmoabio_la_includedir = $(includedir)
 nobase_libmoabio_la_include_HEADERS = moab/ExoIIInterface.hpp
-

diff --git a/test/parallel/Makefile.am b/test/parallel/Makefile.am
index 648c829..6dd3207 100644
--- a/test/parallel/Makefile.am
+++ b/test/parallel/Makefile.am
@@ -24,10 +24,6 @@ if ENABLE_mbcslam
   AM_CPPFLAGS += -I$(top_srcdir)/tools/mbcslam
 endif
 
-if ENABLE_mbzoltan
-  AM_CPPFLAGS += -DHAVE_ZOLTAN
-endif
-
 # Run parallel tests in parallel
 if USE_MPIEXEC
   LOG_COMPILER = ${MPIEXEC}

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.