]> git.pld-linux.org Git - packages/kdelibs.git/blame - kde-am.patch
projects / packages / kdelibs.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
note unpackaged files
[packages/kdelibs.git] / kde-am.patch
CommitLineData
54495614
ER		 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
40d7e143
AM		 3@@ -68,7 +68,7 @@
4 echo "*** KDE requires automake $required_automake_version"
5 exit 1
6 ;;
54495614 7- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
2dd1126f 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* | automake*1.14* )
40d7e143
AM		 9 echo "*** $AUTOMAKE_STRING found."
10 UNSERMAKE=no
11 ;;
2dd1126f
ER		 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
14@@ -41,7 +41,7 @@
15 KDE_SET_PREFIX
16
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
20
21 dnl Checks for programs.
22 AC_PROG_CC
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
25@@ -128,7 +128,7 @@
26 echo "*** Creating configure"
27 call_and_fix_autoconf
28
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"
32 $AUTOHEADER || exit 1
33 touch config.h.in
34@@ -184,7 +184,7 @@
35 fi
36 fi
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"
41 $AUTOHEADER || exit 1
42 touch config.h.in
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
45@@ -4,4 +4,4 @@
46 AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
47 fi
48
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
53@@ -26,7 +26,7 @@
54 AC_PROG_INSTALL
55
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
59
60 dnl Checks for programs.
61 AC_CHECK_COMPILERS
62@@ -500,7 +500,7 @@
63 fi
64
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])
68
69 AC_PATH_PROGS(MD5SUM, [md5sum gmd5sum], [md5sum])
70 dnl =======================================================
71@@ -813,7 +813,7 @@
72
73 dnl AC_OUTPUT(kdecore/kde-config.cpp)
74
75-AM_CONFIG_HEADER(kdecore/kdemacros.h)
76+AC_CONFIG_HEADERS(kdecore/kdemacros.h)
77
78 SVGICONS=
79
80@@ -1735,7 +1735,7 @@
81 AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
82 fi
83
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 =======================================================
89@@ -2000,7 +2000,7 @@
90 AC_SUBST(LIBPCRE)
91 AC_SUBST(PCRECFLAGS)
92
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
100@@ -22,7 +22,7 @@
101 AC_PROG_INSTALL
102
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
106
107 dnl Checks for programs.
108 AC_PROG_CC
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
111@@ -90,4 +90,4 @@
112 AC_SUBST(LIBPCRE)
113 AC_SUBST(PCRECFLAGS)
114
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
119@@ -4,6 +4,6 @@
120 fi
121
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])
125
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
129@@ -169,7 +169,7 @@
130
131 dnl AC_OUTPUT(kdecore/kde-config.cpp)
132
133-AM_CONFIG_HEADER(kdecore/kdemacros.h)
134+AC_CONFIG_HEADERS(kdecore/kdemacros.h)
135
136 SVGICONS=
137
K Desktop Environment 3 libraries
This page took 0.039705 seconds and 4 git commands to generate.