[cig-commits] r9219 - in cs/benchmark/cigma/trunk: . build

[luis at geodynamics.org]

Author: luis
Date: 2008-02-04 14:19:38 -0800 (Mon, 04 Feb 2008)
New Revision: 9219

Removed:
   cs/benchmark/cigma/trunk/build/old-configure.ac
Modified:
   cs/benchmark/cigma/trunk/TODO
Log:
Removed old-configure.ac and updated TODO file


Modified: cs/benchmark/cigma/trunk/TODO
===================================================================
--- cs/benchmark/cigma/trunk/TODO	2008-02-04 22:19:37 UTC (rev 9218)
+++ cs/benchmark/cigma/trunk/TODO	2008-02-04 22:19:38 UTC (rev 9219)
@@ -1,5 +1,6 @@
 ---high-----------------------------------------------------------------------
 Migrate to automake from custom makefiles
+Figure out how to define HAVE_VTK in config.h
 Run strike-slip & reverse-slip benchmarks on the 250m resolution datasets
 
 ---normal---------------------------------------------------------------------

Deleted: cs/benchmark/cigma/trunk/build/old-configure.ac
===================================================================
--- cs/benchmark/cigma/trunk/build/old-configure.ac	2008-02-04 22:19:37 UTC (rev 9218)
+++ cs/benchmark/cigma/trunk/build/old-configure.ac	2008-02-04 22:19:38 UTC (rev 9219)
@@ -1,112 +0,0 @@
-dnl Check that this is the cigma source tree
-AC_INIT([../src/h5io/h5io.h], [0.9.1], [cig-cs at geodynamics.org], [Cigma])
-AC_CONFIG_MACRO_DIR([m4])
-
-dnl Parse '--with' command-line options
-AC_ARG_WITH(hdf5-prefix,
-            AC_HELP_STRING([--with-hdf5-prefix=PFX],
-                           [prefix where the HDF5 library and include files are installed]),
-            [HDF5_PREFIX=$withval])
-AC_ARG_WITH(zlib-prefix,
-            AC_HELP_STRING([--with-zlib-prefix=PFX],
-                           [prefix where the ZLIB library and include files are installed]),
-            ZLIB_PREFIX=$withval)
-
-dnl Get the operating system name
-UNAME=`uname`
-
-dnl Check for default compilers
-AC_PROG_CC
-AC_PROG_CXX
-if test "x${CC}" = "x" -o "x${CXX}" = "x"; then
-    AC_MSG_ERROR([Could not find required compilers, aborting.])
-fi
-LINKER="${CXX}"
-
-dnl Use C++ for all compilation tests
-AC_LANG(C++)
-
-dnl Set default flags
-FLAGS="-Wall"
-OPTIM="-g -O2"
-
-dnl Check for various programs
-AC_PROG_CPP
-
-dnl How to build static libraries?
-case "$UNAME" in
-  Darwin*)
-    AR="libtool -o"
-    RANLIB=true
-    ;;
-  *)
-    AC_PROG_RANLIB
-    AC_PATH_PROG(AR, ar)
-    if test "x${AR}" = "x"; then
-        AC_MSG_ERROR([Could not find the library archiver, aborting.])
-    fi
-    AR="${AR} ruvs"
-    ;;
-esac
-
-dnl See if we need a .exe extension on executables
-AC_EXEEXT
-
-dnl Check for standard math library
-AC_CHECK_LIB(m,main)
-
-CIGMA_LIBS=""
-CIGMA_DIRS="h5io ann"
-
-dnl Check for zlib
-ZLIB=""
-if test "x${ZLIB_PREFIX}" != "x"; then
-  LDFLAGS="-L${ZLIB_PREFIX} -L${ZLIB_PREFIX}/lib ${LDFLAGS}"
-fi
-AC_CHECK_LIB(z,main,ZLIB="yes",ZLIB="no")
-
-dnl Check for HDF5 (needs ZLIB)
-if test "x${ZLIB}" = "xyes"; then
-  if test "x${HDF5_PREFIX}" != "x"; then
-    LDFLAGS="-L${HDF5_PREFIX}/lib ${LDFLAGS}"
-  fi
-  AC_CHECK_LIB(hdf5,main,HDF5="yes",HDF5="no")
-  if test "x${HDF5}" = "xyes"; then
-    if test "x${HDF5_PREFIX}" = "x"; then
-      CIGMA_LIBS="${CIGMA_LIBS} -lhdf5"
-    else
-      CIGMA_LIBS="${CIGMA_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
-      FLAGS="${FLAGS} -I${HDF5_PREFIX}/include"
-    fi
-  fi
-fi
-
-dnl Complete zlib link line (zlib must be linked after HDF5)
-if test "x${ZLIB}" = "xyes"; then
-  if test "x${ZLIB_PREFIX}" = "x"; then
-    CIGMA_LIBS="${CIGMA_LIBS} -lz"
-  else
-    CIGMA_LIBS="${CIGMA_LIBS} -L${ZLIB_PREFIX} -L${ZLIB_PREFIX}/lib -lz"
-    FLAGS="${FLAGS} -I${ZLIB_PREFIX} -I${ZLIB_PREFIX}/include"
-  fi
-fi
-
-dnl Write output
-AC_SUBST(UNAME)
-AC_SUBST(FLAGS)
-AC_SUBST(OPTIM)
-AC_SUBST(LINKER)
-AC_SUBST(CIGMA_DIRS)
-AC_SUBST(CIGMA_LIBS)
-AC_SUBST(AR)
-AC_OUTPUT(variables)
-
-dnl Print some information
-echo "********************************************************************"
-echo "Cigma is configured for"
-echo "- OS           : $UNAME"
-echo "- C compiler   : $CC"
-echo "- C++ compiler : $CXX"
-echo "- Linker       : $LINKER"
-echo "- Optimization : $OPTIM"
-echo "- Options      : $FLAGS"