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

* Remove no longer needed ACLOCAL_AMFLAGS (used by autoconf 2.58 and older

  which is no longer supported by cdo).
* Make minimum autoconf version explicit.
* Prevent duplicat AC_SUBST on CMOR_LIBS.
* Also remove leading white-space.
parent 8a9b966e
......@@ -6,6 +6,5 @@ endif
#
EXTRA_DIST=config/default OPERATORS doc/cdo.pdf doc/cdo_cmor.pdf doc/cdo_eca.pdf doc/cdo_magics.pdf doc/cdo_refcard.pdf cdo.spec README
#
ACLOCAL_AMFLAGS = -I m4 -I libcdi/m4
#
CLEANFILES = `ls *~ 2> /dev/null`
......@@ -4,6 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_PREREQ([2.68])
AC_INIT([cdo], [1.9.4rc2], [http://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
......@@ -186,7 +187,6 @@ AS_IF([test x$enable_data = 'xno'],[AC_SUBST([ENABLE_DATA],[false])],[AC_SUBST([
CFLAGS="$CFLAGS ${OPENMP_CFLAGS}"
CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}"
# ----------------------------------------------------------------------
# Add configure options
ACX_OPTIONS
......
......@@ -247,10 +247,10 @@ AC_ARG_WITH([cmor],
[no],[AC_MSG_CHECKING([for cmor library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([cmor.h])
LIBS="${LIBS+${LIBS} }$UUID_C_LIB"
LIBS="${LIBS+${LIBS} }$UUID_C_LIB"
AC_SEARCH_LIBS([cmor_load_table],[cmor],[AC_DEFINE([HAVE_LIBCMOR],[1],[Define to 1 for CMOR support])],
[AC_MSG_ERROR([Could not link to cmor library!])])
AC_SUBST([CMOR_LIBS],[" -lcmor"])],
CMOR_LIBS="-lcmor $UUID_C_LIB"],
[*],[CMOR_ROOT=$with_cmor
AS_IF([test -d "$CMOR_ROOT"],
[LDFLAGS="$LDFLAGS -L$CMOR_ROOT/lib"
......@@ -260,7 +260,7 @@ AC_ARG_WITH([cmor],
[cmor],
[AC_DEFINE([HAVE_LIBCMOR],[1],[Define to 1 for CMOR support])],
[AC_MSG_ERROR([Could not link to cmor library!])])
CMOR_LIBS=" -L$CMOR_ROOT/lib -lcmor $UUID_C_LIB"],
CMOR_LIBS="-L$CMOR_ROOT/lib -lcmor $UUID_C_LIB"],
[AC_MSG_ERROR([$CMOR_ROOT is not a directory! CMOR suppressed])])])],
[AC_MSG_CHECKING([for the CMOR library])
AC_MSG_RESULT([suppressed])])
......
Markdown is supported
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