From: Adam Dickmeiss Date: Fri, 11 Jul 2014 14:12:37 +0000 (+0000) Subject: Fix buildconf.sh, automake too old on centos5 YAZ-778 X-Git-Tag: v5.4.0~8 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=51f282c74b96dcde90341c2e895f77b0d7b5a7bf Fix buildconf.sh, automake too old on centos5 YAZ-778 Achieved by adding AM_PROG_CC_C_O and requiring AM 1.9 instead. The AM_PROG_CC_C_O is obsolete for newer AM, but 1.14 (Debian jessie) accepts it without a warning. --- diff --git a/configure.ac b/configure.ac index 5374f34..7ceddfe 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) -AM_INIT_AUTOMAKE([1.11.1 subdir-objects]) +AM_INIT_AUTOMAKE([1.9 subdir-objects]) dnl AC_SUBST([READLINE_LIBS]) AC_SUBST([YAZ_CONF_CFLAGS]) @@ -20,6 +20,7 @@ test -z "$YACC" && AC_MSG_WARN([GNU bison not found]) AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh]) AC_PROG_INSTALL AM_PROG_LIBTOOL +AM_PROG_CC_C_O AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE]) dnl YAZ_DOC