summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-05-24 01:25:19 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-05-24 01:29:31 +0200
commit6613b274c8ca9832e5a73e0e01f155ee3bac2070 (patch)
tree8c61d369dfc916e95cafe9554e1075b5f7205539
parent81b32be6f391c7ff31502426a8642049e898389e (diff)
downloadadmin-6613b274c8ca9832e5a73e0e01f155ee3bac2070.tar.gz
admin-6613b274c8ca9832e5a73e0e01f155ee3bac2070.zip
Fix build with automake 1.13v3.5.13.2
(cherry picked from commit 65ecce459d54e772303052de50d08557ba9cc7ed)
-rw-r--r--configure.in.min2
-rw-r--r--cvs.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.in.min b/configure.in.min
index a8a4292..9e52090 100644
--- a/configure.in.min
+++ b/configure.in.min
@@ -41,7 +41,7 @@ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
KDE_SET_PREFIX
dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_PROG_CC
diff --git a/cvs.sh b/cvs.sh
index 3f33919..373ad97 100644
--- a/cvs.sh
+++ b/cvs.sh
@@ -63,7 +63,7 @@ esac
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
required_automake_version="1.6.1 or newer"
case $AUTOMAKE_STRING in
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* )
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
@@ -123,7 +123,7 @@ $ACLOCAL $ACLOCALFLAGS || exit 1
echo "*** Creating configure"
call_and_fix_autoconf
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
@@ -179,7 +179,7 @@ if test -r configure.in.in; then
fi
fi
$ACLOCAL $ACLOCALFLAGS
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in