You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.6 KiB
45 lines
1.6 KiB
12 years ago
|
Index: b/admin/cvs.sh
|
||
|
|
===================================================================
|
||
|
|
--- a/admin/cvs.sh 2013-05-22 17:34:41.870203477 +0200
|
||
|
|
+++ b/admin/cvs.sh 2013-05-22 17:35:08.553206290 +0200
|
||
|
|
@@ -68,7 +68,7 @@
|
||
|
|
echo "*** KDE requires automake $required_automake_version"
|
||
|
|
exit 1
|
||
|
|
;;
|
||
|
|
- 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
|
||
|
|
;;
|
||
|
|
@@ -128,7 +128,7 @@
|
||
|
|
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
|
||
|
|
@@ -184,7 +184,7 @@
|
||
|
|
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
|
||
|
|
Index: b/admin/configure.in.min
|
||
|
|
===================================================================
|
||
|
|
--- a/admin/configure.in.min 2013-05-22 17:34:41.878202494 +0200
|
||
|
|
+++ b/admin/configure.in.min 2013-05-22 17:34:43.385704000 +0200
|
||
|
|
@@ -41,7 +41,7 @@
|
||
|
|
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
|