[MOAB-dev] r3678 - in MOAB/trunk: . tools

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-19 13:17:53 -0500 (Fri, 19 Mar 2010)
New Revision: 3678

Removed:
   MOAB/trunk/tools/mbchaco/
Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/tools/Makefile.am
Log:
remove mbchaco

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2010-03-19 18:16:27 UTC (rev 3677)
+++ MOAB/trunk/configure.ac	2010-03-19 18:17:53 UTC (rev 3678)
@@ -465,7 +465,6 @@
   # Individual tools
 MB_OPTIONAL_TOOL([mbconvert],    [yes])
 MB_OPTIONAL_TOOL([hexmodops],    [yes])
-MB_OPTIONAL_TOOL([mbchaco],      [no] )
 MB_OPTIONAL_TOOL([mbperf],       [yes])
 MB_OPTIONAL_TOOL([qvdual],       [no] )
 MB_OPTIONAL_TOOL([mbsize],       [yes])
@@ -544,41 +543,6 @@
 AC_SUBST(ZOLTAN_INC_FLAGS)
 
 ################################################################################
-#                           Chaco
-################################################################################
-if test $ENABLE_mbchaco = yes; then
-  AC_ARG_WITH(chaco, 
-  [AC_HELP_STRING([--with-chaco=DIR], [Specify directory containing chaco source and library])],
-  [CHACO_DIR=$withval
-   DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-chaco=\"${withval}\""
-   ], [CHACO_DIR=])
-  case "x$CHACO_DIR" in
-    xno|x)
-      CHACO_MISSING=yes
-      ;;
-    xyes)
-      AC_MSG_ERROR([--with-chaco requires and argument])
-      ;;
-  esac
-  if ! test -d "$CHACO_DIR"; then
-    AC_MSG_WARN([$CHACO_DIR : not a directory.])
-  fi
-  AC_CHECK_FILES([${CHACO_DIR}/code/main/defs.h ${CHACO_DIR}/code/main/params.h],
-                [], [AC_MSG_WARN([$CHACO_DIR : not a valid chaco source]); CHACO_MISSING=yes])
-  old_LIBS="$LIBS"
-  LIBS="-L${CHACO_DIR}/code"
-  AC_CHECK_LIB([chaco],[read_params],[],
-               [AC_MSG_WARN([Could not find libchaco in ${CHACO_DIR}/code]); CHACO_MISSING=yes],
-               [-lm])
-  CHACO_INCLUDES="-I${CHACO_DIR}/code/main"
-  LIBS="$old_LIBS"
-  CHACO_LIBS="-L${CHACO_DIR}/code -lchaco -lm"
-  AC_SUBST(CHACO_LIBS)
-  AC_SUBST(CHACO_INCLUDES)
-fi
-
-
-################################################################################
 #                               qvdual
 ################################################################################
 
@@ -1049,7 +1013,6 @@
                  itaps/igeom/iGeom-Defs.inc
                  tools/Makefile
                  tools/mbperf/Makefile
-                 tools/mbchaco/Makefile
                  tools/mbcoupler/Makefile
                  tools/mbzoltan/Config.moab
                  tools/mbzoltan/Makefile

Modified: MOAB/trunk/tools/Makefile.am
===================================================================
--- MOAB/trunk/tools/Makefile.am	2010-03-19 18:16:27 UTC (rev 3677)
+++ MOAB/trunk/tools/Makefile.am	2010-03-19 18:17:53 UTC (rev 3678)
@@ -73,12 +73,6 @@
   mbperf_DIR =
 endif
 
-if ENABLE_mbchaco
-  mbchaco_DIR = mbchaco
-else
-  mbchaco_DIR=
-endif
-
 if ENABLE_mbcoupler
   mbcoupler_DIR = mbcoupler
 else
@@ -109,8 +103,7 @@
   dagmc_DIR = 
 endif 
 
-SUBDIRS = $(mbchaco_DIR) \
-          $(mbcoupler_DIR) \
+SUBDIRS = $(mbcoupler_DIR) \
           $(mbzoltan_DIR) \
           $(mbperf_DIR) \
 	  $(mcnpmit_DIR) \