Making Makefile.cvs run on gentoo-1.4rc1

Rik Hemsley rik at kde.org
Mon Nov 18 21:54:06 GMT 2002


Please review.

Rik

Index: cvs.sh
===================================================================
RCS file: /home/kde/kde-common/admin/cvs.sh,v
retrieving revision 1.63
diff -u -3 -p -r1.63 cvs.sh
--- cvs.sh      2002/11/11 12:24:04     1.63
+++ cvs.sh      2002/11/18 21:51:47
@@ -29,7 +29,7 @@ check_autotool_versions()
 {
 AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  autoconf*2.5* | Autoconf*2.5* | autoconf*2.5* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
@@ -44,7 +44,7 @@ esac

 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  autoconf*2.5* | Autoconf*2.5* | autoheader*2.5* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
Index: detect-autoconf.sh
===================================================================
RCS file: /home/kde/kde-common/admin/detect-autoconf.sh,v
retrieving revision 1.3
diff -u -3 -p -r1.3 detect-autoconf.sh
--- detect-autoconf.sh  2002/10/25 15:02:20     1.3
+++ detect-autoconf.sh  2002/11/18 21:51:47
@@ -17,6 +17,8 @@ checkAutoconf()
     AUTOCONF="`$WHICH autoconf-2.5x`"
   elif test -x "`$WHICH autoconf-2.53`" ; then
     AUTOCONF="`$WHICH autoconf-2.53`"
+  elif test -x "`$WHICH autoconf-2.53a`" ; then
+    AUTOCONF="`$WHICH autoconf-2.53a`"
   elif test -x "`$WHICH autoconf-2.52`" ; then
     AUTOCONF="`$WHICH autoconf-2.52`"
   elif test -x "`$WHICH autoconf2.50`" ; then
@@ -32,6 +34,9 @@ checkAutoheader()
   elif test -x "`$WHICH autoheader-2.53`" ; then
     AUTOHEADER="`$WHICH autoheader-2.53`"
     AUTOM4TE="`$WHICH autom4te-2.53`"
+  elif test -x "`$WHICH autoheader-2.53a`" ; then
+    AUTOHEADER="`$WHICH autoheader-2.53a`"
+    AUTOM4TE="`$WHICH autom4te-2.53a`"
   elif test -x "`$WHICH autoheader-2.52`" ; then
     AUTOHEADER="`$WHICH autoheader-2.52`"
   elif test -x "`$WHICH autoheader2.50`" ; then

-- 
http://rikkus.info




More information about the kde-core-devel mailing list