Commit ca32bfa9 authored by Ralf Mueller's avatar Ralf Mueller 🎣

fixes for 2.70

parent 6d75d1c3
......@@ -4,15 +4,14 @@
# autoconf 2.68
# libtool 2.4.2
AC_PREREQ([2.68])
AC_INIT([cdo], [1.9.10], [https://mpimet.mpg.de/cdo])
AC_PREREQ([2.70])
AC_INIT([cdo],[1.9.10],[https://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([libcdi/m4])
AC_CONFIG_MACRO_DIRS([m4 libcdi/m4])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
......@@ -34,7 +33,7 @@ AC_PATH_TOOL([BASH],[bash],[:])
# Check building environment
AC_CHECK_TOOL([CC],[gcc],[:])
AC_CHECK_TOOL([CXX],[g++],[:])
AC_PROG_CC_C99
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_F77
......
Subproject commit 6b38c8af43a1ab9b6e6b196d1350c1cc794a783c
Subproject commit 1efac5a40ec991559d0aca21373cc70d94c8d7e8
......@@ -4,7 +4,7 @@ AC_DEFUN([ACX_CDO_OPTIONS],
# Checks for multithreaded compiling + linking
ENABLE_THREADS=no
AC_ARG_WITH([threads],
[AC_HELP_STRING([--with-threads=<yes/no/directory>],
[AS_HELP_STRING([--with-threads=<yes/no/directory>],
[Compile + link for multithreading [default=yes]])],
[],
[with_threads=yes])
......@@ -350,7 +350,7 @@ AC_SUBST([ENABLE_GRIB],[$enable_grib])
# Compile interface with internal CGRIBEX library
AC_MSG_CHECKING([for CGRIBEX support])
AC_ARG_ENABLE([cgribex],
[AC_HELP_STRING([--enable-cgribex],[Use the CGRIBEX library [default=yes]])],
[AS_HELP_STRING([--enable-cgribex],[Use the CGRIBEX library [default=yes]])],
[AS_IF([test "x$enable_cgribex" != 'xno'],
[AC_DEFINE(HAVE_LIBCGRIBEX,[1],[Define to 1 for GRIB1 decoding/encoding with cgribex])
enable_cgribex=yes])],
......@@ -362,7 +362,7 @@ AC_SUBST([ENABLE_CGRIBEX],[$enable_cgribex])
# Compile interface with internal SERVICE library
AC_MSG_CHECKING([for SERVICE support])
AC_ARG_ENABLE([service],
[AC_HELP_STRING([--enable-service],[Use the service library [default=yes]])],
[AS_HELP_STRING([--enable-service],[Use the service library [default=yes]])],
[AS_IF([test "x$enable_service" != 'xno'],
[AC_DEFINE(HAVE_LIBSERVICE,[1],[Define to 1 for SERVICE interface])
enable_service=yes])],
......@@ -374,7 +374,7 @@ AC_SUBST([ENABLE_SERVICE],[$enable_service])
# Compile interface with internal EXTRA library
AC_MSG_CHECKING([for EXTRA support])
AC_ARG_ENABLE([extra],
[AC_HELP_STRING([--enable-extra],[Use the extra library [default=yes]])],
[AS_HELP_STRING([--enable-extra],[Use the extra library [default=yes]])],
[AS_IF([test "x$enable_extra" != 'xno'],
[AC_DEFINE(HAVE_LIBEXTRA,[1],[Define to 1 for EXTRA interface])
enable_extra=yes])],
......@@ -386,7 +386,7 @@ AC_SUBST([ENABLE_EXTRA],[$enable_extra])
# Compile interface with internal IEG library
AC_MSG_CHECKING([for IEG support])
AC_ARG_ENABLE([ieg],
[AC_HELP_STRING([--enable-ieg],[Use the ieg library [default=yes]])],
[AS_HELP_STRING([--enable-ieg],[Use the ieg library [default=yes]])],
[AS_IF([test "x$enable_ieg" != 'xno'],
[AC_DEFINE(HAVE_LIBIEG,[1],[Define to 1 for IEG interface])
enable_ieg=yes])],
......
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