Commit 2040e548 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Missing AC_CONFIG_SRCDIR [Bug #9853].

parent a995635a
Pipeline #3812 passed with stages
in 14 minutes and 41 seconds
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
* Using CDI library version 1.9.9 * Using CDI library version 1.9.9
* Version 1.9.9 release * Version 1.9.9 release
2020-08-16 Matthew Krupcale
* Fix yy_scan_string ODR violation [Bug #9854]
* Missing AC_CONFIG_SRCDIR [Bug #9853]
2020-08-15 Uwe Schulzweida 2020-08-15 Uwe Schulzweida
* New operator remapmean: arithmetic mean value (status: experimental) * New operator remapmean: arithmetic mean value (status: experimental)
......
...@@ -10,7 +10,7 @@ AC_INIT([cdo], [1.9.9rc6], [https://mpimet.mpg.de/cdo]) ...@@ -10,7 +10,7 @@ AC_INIT([cdo], [1.9.9rc6], [https://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version]) AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
CONFIG_ABORT=yes CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([libcdi/m4]) AC_CONFIG_MACRO_DIR([libcdi/m4])
AC_CANONICAL_HOST AC_CANONICAL_HOST
...@@ -18,6 +18,7 @@ AC_CANONICAL_BUILD ...@@ -18,6 +18,7 @@ AC_CANONICAL_BUILD
# AM_INIT_AUTOMAKE([foreign -Wall -Werror]) # AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AM_INIT_AUTOMAKE([subdir-objects foreign -Wall]) AM_INIT_AUTOMAKE([subdir-objects foreign -Wall])
AC_CONFIG_SRCDIR([src/cdo.cc])
AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_HEADERS([src/config.h])
AM_MAINTAINER_MODE([disable]) AM_MAINTAINER_MODE([disable])
...@@ -167,7 +168,7 @@ AS_IF([test x$acx_cv_cfortran_works = 'xno'],[AC_SUBST([FORTRAN_WORKS],[no])],[A ...@@ -167,7 +168,7 @@ AS_IF([test x$acx_cv_cfortran_works = 'xno'],[AC_SUBST([FORTRAN_WORKS],[no])],[A
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
CFLAGS="$CFLAGS ${OPENMP_CFLAGS}" CFLAGS="$CFLAGS ${OPENMP_CFLAGS}"
CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}" CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}"
# ---------------------------------------------------------------------- ----------------------------------------------------------------------
# Add configure options # Add configure options
ACX_CDO_OPTIONS ACX_CDO_OPTIONS
ACX_CDI_OPTIONS ACX_CDI_OPTIONS
......
Subproject commit afbdc216556fe05b315244ccbc60921f503a5101 Subproject commit 5ec8b92123f42e74d63da3024ca87eb695e0329a
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