acinclude.m4: merged from cmor3 branch.

acinclude.m4

@@ -34,63 +34,7 @@ dnl PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 dnl LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 dnl NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 dnl SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl Commentary:
-dnl
-dnl
-dnl
-dnl Code:
-dnl
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl license-project-url: "https://www.dkrz.de/redmine/projects/show/scales-ppm"
-dnl license-default: "bsd"
-dnl End:
-dnl acinclude.m4 --- m4 files that are unconditionally included by autoconf
-dnl
-dnl Copyright  (C)  2010  Thomas Jahns <jahns@dkrz.de>
-dnl
-dnl Version: 1.0
-dnl Keywords: configure configure.ac autotools
-dnl Author: Thomas Jahns <jahns@dkrz.de>
-dnl Maintainer: Thomas Jahns <jahns@dkrz.de>
-dnl URL: https://www.dkrz.de/redmine/projects/show/scales-ppm
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are  permitted provided that the following conditions are
-dnl met:
-dnl
-dnl Redistributions of source code must retain the above copyright notice,
-dnl this list of conditions and the following disclaimer.
-dnl
-dnl Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl Neither the name of the DKRZ GmbH nor the names of its contributors
-dnl may be used to endorse or promote products derived from this software
-dnl without specific prior written permission.
-dnl
-dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-dnl IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-dnl TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-dnl PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-dnl OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-dnl PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-dnl LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-dnl NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-dnl SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl Commentary:
-dnl
-dnl
-dnl
-dnl Code:
-dnl
-dnl
+m4_include([libcdi/m4/acx_lang_c_check_include.m4])
 dnl Local Variables:
 dnl mode: autoconf
 dnl license-project-url: "https://www.dkrz.de/redmine/projects/show/scales-ppm"

configure.ac

@@ -11,6 +11,7 @@ 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_CANONICAL_HOST
 AC_CANONICAL_BUILD