1 --- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300
2 +++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300
4 echo "*** KDE requires automake $required_automake_version"
7 - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
8 + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13*)
9 echo "*** $AUTOMAKE_STRING found."
12 --- kdelibs-3.5.10/admin/configure.in.min~ 2013-04-04 21:57:22.468489671 +0200
13 +++ kdelibs-3.5.10/admin/configure.in.min 2013-04-04 22:02:56.099614223 +0200
17 dnl generate the config header
18 -AM_CONFIG_HEADER(config.h) dnl at the distribution this done
19 +AC_CONFIG_HEADERS(config.h) dnl at the distribution this done
21 dnl Checks for programs.
23 --- kdelibs-3.5.10/admin/cvs.sh~ 2013-04-04 21:57:22.465156305 +0200
24 +++ kdelibs-3.5.10/admin/cvs.sh 2013-04-04 22:03:44.983443327 +0200
26 echo "*** Creating configure"
29 -if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
30 +if egrep "^AC_CONFIG_HEADERS" configure.in >/dev/null 2>&1; then
31 echo "*** Creating config.h template"
37 $ACLOCAL $ACLOCALFLAGS
38 -if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
39 +if egrep "^AC_CONFIG_HEADERS" configure.in >/dev/null 2>&1; then
40 echo "*** Creating config.h template"
43 --- kdelibs-3.5.10/kio/kssl/configure.in.in~ 2005-09-10 10:26:49.000000000 +0200
44 +++ kdelibs-3.5.10/kio/kssl/configure.in.in 2013-04-04 22:04:18.503783179 +0200
46 AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
49 -AM_CONFIG_HEADER([kio/kssl/ksslconfig.h])
50 +AC_CONFIG_HEADERS([kio/kssl/ksslconfig.h])
51 --- kdelibs-3.5.10/configure.in~ 2008-08-20 18:05:03.000000000 +0200
52 +++ kdelibs-3.5.10/configure.in 2013-04-04 22:04:57.840848814 +0200
56 dnl generate the config header
57 -AM_CONFIG_HEADER(config.h) dnl at the distribution this done
58 +AC_CONFIG_HEADERS(config.h) dnl at the distribution this done
60 dnl Checks for programs.
65 AC_DEFINE_UNQUOTED(DCOP_PATH, ["${dcop_prefix}/bin"], [Define where your dcop binary is])
66 -AM_CONFIG_HEADER([dcop/dcop-path.h])
67 +AC_CONFIG_HEADERS([dcop/dcop-path.h])
69 AC_PATH_PROGS(MD5SUM, [md5sum gmd5sum], [md5sum])
70 dnl =======================================================
73 dnl AC_OUTPUT(kdecore/kde-config.cpp)
75 -AM_CONFIG_HEADER(kdecore/kdemacros.h)
76 +AC_CONFIG_HEADERS(kdecore/kdemacros.h)
81 AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
84 -AM_CONFIG_HEADER([kio/kssl/ksslconfig.h])
85 +AC_CONFIG_HEADERS([kio/kssl/ksslconfig.h])
86 dnl =======================================================
87 dnl FILE: ./kio/misc/kpac/configure.in.in
88 dnl =======================================================
93 -AM_CONFIG_HEADER([kjs/global.h])
94 +AC_CONFIG_HEADERS([kjs/global.h])
95 dnl =======================================================
96 dnl FILE: ./kspell2/plugins/configure.in.in
97 dnl =======================================================
98 --- kdelibs-3.5.10/configure.in.in~ 2013-04-04 21:57:22.468489671 +0200
99 +++ kdelibs-3.5.10/configure.in.in 2013-04-04 22:05:57.668122592 +0200
103 dnl generate the config header
104 -AM_CONFIG_HEADER(config.h) dnl at the distribution this done
105 +AC_CONFIG_HEADERS(config.h) dnl at the distribution this done
107 dnl Checks for programs.
109 --- kdelibs-3.5.10/kjs/configure.in.in~ 2007-10-08 11:52:09.000000000 +0200
110 +++ kdelibs-3.5.10/kjs/configure.in.in 2013-04-04 22:06:19.065006325 +0200
115 -AM_CONFIG_HEADER([kjs/global.h])
116 +AC_CONFIG_HEADERS([kjs/global.h])
117 --- kdelibs-3.5.10/dcop/configure.in.in~ 2005-09-10 10:27:23.000000000 +0200
118 +++ kdelibs-3.5.10/dcop/configure.in.in 2013-04-04 22:06:33.691821354 +0200
122 AC_DEFINE_UNQUOTED(DCOP_PATH, ["${dcop_prefix}/bin"], [Define where your dcop binary is])
123 -AM_CONFIG_HEADER([dcop/dcop-path.h])
124 +AC_CONFIG_HEADERS([dcop/dcop-path.h])
126 AC_PATH_PROGS(MD5SUM, [md5sum gmd5sum], [md5sum])
127 --- kdelibs-3.5.10/kdecore/configure.in.in~ 2007-05-14 09:52:39.000000000 +0200
128 +++ kdelibs-3.5.10/kdecore/configure.in.in 2013-04-04 22:07:00.152089704 +0200
131 dnl AC_OUTPUT(kdecore/kde-config.cpp)
133 -AM_CONFIG_HEADER(kdecore/kdemacros.h)
134 +AC_CONFIG_HEADERS(kdecore/kdemacros.h)