blob: 4b27f5a90212bed8150423b2daa242599bece708 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
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
|
