[cig-commits] r5190 - in mc/3D/CitcomS/trunk: . lib visual
leif at geodynamics.org
leif at geodynamics.org
Mon Nov 6 18:30:04 PST 2006
Author: leif
Date: 2006-11-06 18:30:04 -0800 (Mon, 06 Nov 2006)
New Revision: 5190
Modified:
mc/3D/CitcomS/trunk/Makefile.am
mc/3D/CitcomS/trunk/configure.ac
mc/3D/CitcomS/trunk/lib/Makefile.am
mc/3D/CitcomS/trunk/visual/Makefile.am
Log:
Moved CitcomS HDF5 macros to cs/autoconf.
Modified: mc/3D/CitcomS/trunk/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/Makefile.am 2006-11-07 02:29:23 UTC (rev 5189)
+++ mc/3D/CitcomS/trunk/Makefile.am 2006-11-07 02:30:04 UTC (rev 5190)
@@ -60,9 +60,9 @@
CitcomSFull_SOURCES = Citcom.c CitcomSFull.c
-CitcomSFull_LDADD = $(top_builddir)/lib/libCitcomS.a $(LIBHDF5)
+CitcomSFull_LDADD = $(top_builddir)/lib/libCitcomS.a
CitcomSRegional_SOURCES = Citcom.c CitcomSRegional.c
-CitcomSRegional_LDADD = $(top_builddir)/lib/libCitcomS.a $(LIBHDF5)
+CitcomSRegional_LDADD = $(top_builddir)/lib/libCitcomS.a
@@ -121,9 +121,7 @@
pycitcoms_SOURCES = pycitcoms.c
pycitcoms_LDADD = \
$(top_builddir)/module/libCitcomSLibmodule.a \
- $(libCitcomS) \
- $(LIBHDF5) \
- $(LIBM)
+ $(libCitcomS)
pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES)
@rm -f pycitcoms$(EXEEXT)
$(LINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac 2006-11-07 02:29:23 UTC (rev 5189)
+++ mc/3D/CitcomS/trunk/configure.ac 2006-11-07 02:30:04 UTC (rev 5190)
@@ -35,24 +35,19 @@
# 'configure' options
AC_ARG_VAR(PYTHON, [Python interpreter])
AC_ARG_VAR(PYTHONPATH, [Python module search path])
-AC_ARG_VAR(PHDF5_HOME, [home path to parallel HDF5 library])
AC_ARG_WITH([pyre],
[AC_HELP_STRING([--with-pyre],
[build Pyre modules @<:@default=yes@:>@])],
[want_pyre="$withval"],
[want_pyre=yes])
AM_CONDITIONAL([COND_PYRE], [test "$want_pyre" = yes])
-AC_ARG_WITH([hdf5],
- [AC_HELP_STRING([--with-hdf5],
- [enable HDF5 output @<:@default=auto@:>@])],
- [want_hdf5="$withval"],
- [want_hdf5=auto])
AC_ARG_ENABLE([embedding],
[AC_HELP_STRING([--enable-embedding],
[embed Python with CitcomS in a single executable @<:@default=yes@:>@])],
[want_embedding="$enableval"],
[want_embedding=yes])
AM_CONDITIONAL([COND_EMBEDDING], [test "$want_embedding" = yes])
+CIT_ARG_HDF5([auto])
if test "$want_pyre" = yes; then
# Check for Python.
@@ -77,74 +72,19 @@
# Checks for libraries.
AC_SEARCH_LIBS([MPI_Init], [mpi mpich], [], [AC_MSG_ERROR([MPI library not found])])
AC_SEARCH_LIBS([sqrt], [m])
+CIT_CHECK_LIB_HDF5
+CIT_CHECK_LIB_HDF5_PARALLEL
# Checks for header files.
AC_CHECK_HEADER([mpi.h], [], [AC_MSG_ERROR([header 'mpi.h' not found])])
-if test "$want_hdf5" != no; then
- if test "$PHDF5_HOME"; then
- CPPFLAGS="-I$PHDF5_HOME/include $CPPFLAGS"
- fi
- AC_CHECK_HEADERS([hdf5.h], [AC_DEFINE([HAVE_HDF5_H])], [HDF5NOTFOUND=1])
- if test "$HDF5NOTFOUND"; then
- if test "$want_hdf5" = auto; then
- want_hdf5=no
- AC_MSG_WARN([Cannot find hdf5.h, disabling HDF5 support])
- else
- AC_MSG_ERROR([HDF5 header file "hdf5.h" not found!])
- fi
- fi
-fi
AC_CHECK_HEADERS([malloc.h])
+CIT_CHECK_HEADER_HDF5
# Checks for typedefs, structures, and compiler characteristics.
# Checks for library functions.
-AC_ARG_VAR(LIBM, [math library])
-if test -z "$LIBM"; then
- AC_CHECK_FUNC(sqrt, , [
- AC_CHECK_LIB(m, sqrt, [
- LIBM="-lm"
- ], [
- AC_MSG_ERROR([math library not found; try setting LIBM])
- ])
- ])
-fi
-AC_SUBST(LIBM)
-if test "$want_hdf5" != no; then
- if test "$PHDF5_HOME"; then
- LDFLAGS="-L$PHDF5_HOME/lib $LDFLAGS"
- fi
- # Checks for basic HDF5 function
- AC_CHECK_FUNC(H5Fopen, , [
- AC_CHECK_LIB(hdf5, H5Fopen, [LIBHDF5="-lhdf5"], [HDF5NOTFOUND=1])
- ])
- if test "$HDF5NOTFOUND"; then
- if test "$want_hdf5" = auto; then
- want_hdf5=no
- AC_MSG_WARN([Cannot find HDF5 library, disabling HDF5 support])
- else
- AC_MSG_ERROR([HDF5 library not found; try setting PHDF5_HOME])
- fi
- fi
-fi
-if test "$want_hdf5" != no; then
- # Checks for HDF5 parallel-IO function
- AC_CHECK_LIB(hdf5, H5Pset_dxpl_mpio, [have_phdf5="yes"], [HDF5NOTFOUND=1])
- if test "$HDF5NOTFOUND"; then
- if test "$want_hdf5" = auto; then
- want_hdf5=no
- AC_MSG_WARN([Cannot find parallel HDF5 library, disabling HDF5 support])
- else
- AC_MSG_ERROR([Need Parallel HDF5; try compiling HDF5 with --enable-parallel])
- fi
- fi
- if test "$want_hdf5" = auto; then
- want_hdf5=yes
- fi
-fi
-AM_CONDITIONAL([COND_HDF5], [test "$want_hdf5" = yes])
-AC_SUBST(LIBHDF5)
+AM_CONDITIONAL([COND_HDF5], [test "$want_hdf5" != no])
AC_CONFIG_FILES([Makefile
CitcomS/Makefile
Modified: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am 2006-11-07 02:29:23 UTC (rev 5189)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am 2006-11-07 02:30:04 UTC (rev 5190)
@@ -52,7 +52,6 @@
libCitcomS_a_SOURCES = $(sources)
# shared library (libtool)
-libCitcomS_la_LIBADD = $(LIBM) $(LIBHDF5)
libCitcomS_la_LDFLAGS = -release $(VERSION)
libCitcomS_la_SOURCES = $(sources)
Modified: mc/3D/CitcomS/trunk/visual/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/visual/Makefile.am 2006-11-07 02:29:23 UTC (rev 5189)
+++ mc/3D/CitcomS/trunk/visual/Makefile.am 2006-11-07 02:30:04 UTC (rev 5190)
@@ -109,13 +109,11 @@
chmod 644 "$(DESTDIR)$(visualdir)/$$f"; \
done
-# if COND_HDF5
-# bin_PROGRAMS = h5tocap h5steps
-# h5tocap_SOURCES = h5tocap.c
-# h5tocap_LDADD = $(LIBHDF5)
-# h5steps_SOURCES = h5steps.c
-# h5steps_LDADD = $(LIBHDF5)
-# endif
+if COND_HDF5
+ bin_PROGRAMS = h5tocap h5steps
+ h5tocap_SOURCES = h5tocap.c
+ h5steps_SOURCES = h5steps.c
+endif
CLEANFILES = $(nodist_visual_DATA)
EXTRA_DIST = $(visual_templates)
More information about the cig-commits
mailing list