Commit f7c11ece authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

configure update

parent 59c308bb
......@@ -86,7 +86,7 @@ case "${HOSTNAME}" in
--with-hdf5=/sw/etch-ia32/hdf5-1.8.0 \
--with-szlib=$HOME/local/etch-ia32 \
--with-proj=/sw/etch-ia32/proj-4.6.0 \
CC=gcc CFLAGS="-g -D_REENTRANT -O2 -Wall -W -Wfloat-equal" LIBS="-lz"
CC=gcc CFLAGS="-g -D_REENTRANT -O2 -Wall -W -Wfloat-equal"
else
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-ia32 \
--program-suffix=_${SGE_SUFFIX} \
......@@ -200,8 +200,9 @@ case "${HOSTNAME}" in
hpc*)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=/usr/local/lib/netcdf/3.6.2/LP64_underscore \
--with-hdf5=/usr/local/lib/hdf5/1.6.5/LP64_underscore \
--with-szlib=$HOME/local \
--with-hdf5=/usr/local/lib/hdf5/1.6.5/LP64_underscore LIBS="-lz" \
--with-proj=$HOME/local \
CC=xlc_r CFLAGS="-g -O3 -q64 -qstrict -qarch=auto -qtune=auto -DHAVE_MMAP -D_LARGE_FILES=1"
;;
# powerpc-ibm-aix6.0.0.0
......
This diff is collapsed.
......@@ -69,7 +69,12 @@ if test -z "$HOST" ; then HOST="unknown"; fi;
AC_DEFINE_UNQUOTED(HOST_NAME, ["$HOST"], [Host name])
# ----------------------------------------------------------------------
# Checks pthread library
# Check for math library
#
AC_CHECK_LIB(m, floor)
# ----------------------------------------------------------------------
# Checks for pthread library
#
AC_ARG_WITH([threads],
[AC_HELP_STRING([--with-threads],
......@@ -83,6 +88,93 @@ else
AC_CHECK_LIB(pthread, pthread_create)
fi
# ----------------------------------------------------------------------
# Checks for PROJ.4 library
#
AC_MSG_CHECKING([whether a location for the PROJ library was specified])
AC_ARG_WITH([proj],
[AS_HELP_STRING([--with-proj=<directory>],
[Specify location of PROJ library. Configure will expect to find subdirs include and lib.])],
[PROJDIR=$with_proj])
if test -z "$PROJDIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$PROJDIR])
LDFLAGS="$LDFLAGS -L$PROJDIR/lib"
CPPFLAGS="$CPPFLAGS -I$PROJDIR/include"
AC_CHECK_LIB(proj, pj_init,, LDFLAGS="$LDFLAGS")
# AC_SUBST([PROJDIR], [$PROJDIR])
fi
# ----------------------------------------------------------------------
# Compile application with ZLIB library
#
AC_MSG_CHECKING([whether a location for the ZLIB library was specified])
AC_ARG_WITH([zlib],
[AS_HELP_STRING([--with-zlib=<directory>],
[Specify location of ZLIB library. ZLIB is required for HDF5. Configure will expect to find subdirs include and lib.])],
[ZLIBDIR=$with_zlib])
if test -z "$ZLIBDIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$ZLIBDIR])
LDFLAGS="$LDFLAGS -L$ZLIBDIR/lib"
CPPFLAGS="$CPPFLAGS -I$ZLIBDIR/include"
# AC_CHECK_LIB(z, xxx, , LDFLAGS="$LDFLAGS")
# AC_SUBST([ZLIBDIR], [$ZLIBDIR])
fi
# ----------------------------------------------------------------------
# Compile application with SZLIB library
#
AC_MSG_CHECKING([whether a location for the SZLIB library was specified])
AC_ARG_WITH([szlib],
[AS_HELP_STRING([--with-szlib=<directory>],
[Specify location of SZLIB library. You must specify its location if HDF5 was built with SZLIB. Configure will expect to find subdirs include and lib.])],
[SZLIBDIR=$with_szlib])
if test -z "$SZLIBDIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$SZLIBDIR])
LDFLAGS="$LDFLAGS -L$SZLIBDIR/lib"
CPPFLAGS="$CPPFLAGS -I$SZLIBDIR/include"
AC_CHECK_LIB(sz, SZ_BufftoBuffCompress, , LDFLAGS="$LDFLAGS")
# AC_SUBST([SZLIBDIR], [$SZLIBDIR])
fi
# ----------------------------------------------------------------------
# Compile application with HDF5 library
#
AC_MSG_CHECKING([whether a location for the HDF5 library was specified])
AC_ARG_WITH([hdf5],
[AS_HELP_STRING([--with-hdf5=<directory>],
[Specify location of HDF5 library. Configure will expect to find subdirs include and lib.])],
[HDF5DIR=$with_hdf5])
if test -z "$HDF5DIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$HDF5DIR])
LDFLAGS="$LDFLAGS -L$HDF5DIR/lib"
CPPFLAGS="$CPPFLAGS -I$HDF5DIR/include"
AC_CHECK_LIB([hdf5], [H5Fopen], [], [nc_hdf5_lib_missing=yes], [-lz])
# AC_SUBST([HDF5DIR], [$HDF5DIR])
if test "x$nc_hdf5_lib_missing" = xyes; then
AC_MSG_ERROR([Can't find the hdf5 header and/or library, or can't link a program \
to it. HDF5 must be built with zlib; the location of zlib must be specified for HDF5 with the \
--with-zlib option. If HDF5 was also built with szlib, then the location of szlib must also be \
specified with the --with-szlib option.])
else
LIBS="${LIBS} -lz"
# Check for the HDF5 High Level library.
AC_CHECK_LIB([hdf5_hl], [H5DSis_scale], [], [nc_hdf5_hl_lib_missing=yes])
# if test "x$nc_hdf5_hl_lib_missing" = xyes; then
# AC_MSG_ERROR([Can't find the hdf5 high-level library. The high-level library is required for netCDF-4.])
# fi
fi
fi
# ----------------------------------------------------------------------
# Compile interface with internal GRIB library
#
......@@ -177,7 +269,7 @@ case $withval in
AC_CHECK_LIB(netcdf, nc_open,, unset HAVE_NETCDF)
if test -z "$HAVE_NETCDF" -a -n "$CONFIG_ABORT"; then
AC_MSG_ERROR([couldn't find netcdf library])
AC_MSG_ERROR([Can't find netcdf library, or can't link a program to it.])
fi
;;
no)
......@@ -243,65 +335,11 @@ fi
fi
if test -z "$HAVE_NETCDF" -a -n "$CONFIG_ABORT"; then
AC_MSG_ERROR(couldn't find netcdf library)
AC_MSG_ERROR([Can't find netcdf library, or can't link a program to it.])
fi
;;
esac
# ----------------------------------------------------------------------
# Compile application with SZLIB library
#
AC_MSG_CHECKING([whether a location for the SZLIB library was specified])
AC_ARG_WITH([szlib],
[AS_HELP_STRING([--with-szlib=<directory>],
[Specify location of SZLIB library. Configure will expect to find subdirs include and lib.])],
[SZLIBDIR=$with_szlib])
if test -z "$SZLIBDIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$SZLIBDIR])
LDFLAGS="$LDFLAGS -L$SZLIBDIR/lib"
CPPFLAGS="$CPPFLAGS -I$SZLIBDIR/include"
AC_CHECK_LIB(sz, SZ_BufftoBuffCompress, , LDFLAGS="$LDFLAGS")
# AC_SUBST([SZLIBDIR], [$SZLIBDIR])
fi
# ----------------------------------------------------------------------
# Compile application with HDF5 library
#
AC_MSG_CHECKING([whether a location for the HDF5 library was specified])
AC_ARG_WITH([hdf5],
[AS_HELP_STRING([--with-hdf5=<directory>],
[Specify location of HDF5 library. Configure will expect to find subdirs include and lib.])],
[HDF5DIR=$with_hdf5])
if test -z "$HDF5DIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$HDF5DIR])
LDFLAGS="$LDFLAGS -L$HDF5DIR/lib"
CPPFLAGS="$CPPFLAGS -I$HDF5DIR/include"
AC_CHECK_LIB(hdf5, H5Fopen,, LDFLAGS="$LDFLAGS", -lm -lz)
# AC_SUBST([HDF5DIR], [$HDF5DIR])
fi
# ----------------------------------------------------------------------
# Compile application with PROJ library
#
AC_MSG_CHECKING([whether a location for the PROJ library was specified])
AC_ARG_WITH([proj],
[AS_HELP_STRING([--with-proj=<directory>],
[Specify location of PROJ library. Configure will expect to find subdirs include and lib.])],
[PROJDIR=$with_proj])
if test -z "$PROJDIR" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([$PROJDIR])
LDFLAGS="$LDFLAGS -L$PROJDIR/lib"
CPPFLAGS="$CPPFLAGS -I$PROJDIR/include"
AC_CHECK_LIB(proj, pj_init,, LDFLAGS="$LDFLAGS", -lm)
# AC_SUBST([PROJDIR], [$PROJDIR])
fi
# ----------------------------------------------------------------------
AC_SUBST([CPPFLAGS])
......
......@@ -227,9 +227,9 @@ cdo_SOURCES = Arith.c \
statistic.h \
cdi.h
#
cdo_LDADD = $(LDFLAGS) -lm
#cdo_LDADD = $(LDFLAGS) -lm
#
cdotest_LDADD = $(LDFLAGS) -lm
#cdotest_LDADD = $(LDFLAGS) -lm
#
cdotest_SOURCES = cdi.h \
cdilib.c \
......
......@@ -112,11 +112,10 @@ am_cdo_OBJECTS = Arith.$(OBJEXT) Arithc.$(OBJEXT) Arithdays.$(OBJEXT) \
EcaIndices.$(OBJEXT) Hi.$(OBJEXT) Wct.$(OBJEXT) \
statistic.$(OBJEXT)
cdo_OBJECTS = $(am_cdo_OBJECTS)
am__DEPENDENCIES_1 =
cdo_DEPENDENCIES = $(am__DEPENDENCIES_1)
cdo_LDADD = $(LDADD)
am_cdotest_OBJECTS = cdilib.$(OBJEXT) cdotest.$(OBJEXT)
cdotest_OBJECTS = $(am_cdotest_OBJECTS)
cdotest_DEPENDENCIES = $(am__DEPENDENCIES_1)
cdotest_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
......@@ -453,9 +452,9 @@ cdo_SOURCES = Arith.c \
cdi.h
#
cdo_LDADD = $(LDFLAGS) -lm
#cdo_LDADD = $(LDFLAGS) -lm
#
cdotest_LDADD = $(LDFLAGS) -lm
#cdotest_LDADD = $(LDFLAGS) -lm
#
cdotest_SOURCES = cdi.h \
cdilib.c \
......
......@@ -30,9 +30,15 @@
/* Define to 1 if you have the `hdf5' library (-lhdf5). */
#undef HAVE_LIBHDF5
/* Define to 1 if you have the `hdf5_hl' library (-lhdf5_hl). */
#undef HAVE_LIBHDF5_HL
/* Define to 1 for IEG interface */
#undef HAVE_LIBIEG
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
/* Define to 1 if you have the `malloc' library (-lmalloc). */
#undef HAVE_LIBMALLOC
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment