summaryrefslogtreecommitdiffstats
path: root/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
blob: 0523b9e9d61fd4afc772947e26628185ac4ea80d (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
--- ia_ora-kde-1.0.8/admin/configure.in.min.ORI	2013-06-04 22:06:43.320769735 +0200
+++ ia_ora-kde-1.0.8/admin/configure.in.min	2013-06-04 22:06:49.748640759 +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_CHECK_COMPILERS
--- ia_ora-kde-1.0.8/admin/cvs.sh.automake11	2007-08-23 21:48:58.000000000 +0200
+++ ia_ora-kde-1.0.8/admin/cvs.sh	2013-06-04 22:06:38.413868181 +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.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
     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[CM]_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[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
   echo "*** Creating config.h template"
   $AUTOHEADER || exit 1
   touch config.h.in