apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Max Bowsher" <m...@ukf.net>
Subject [Patch] Revised fallback libtool.m4 location in buildconf
Date Tue, 10 Jun 2003 18:09:48 GMT
Below are the patches, one to apr and one to apr-util, revised to use
PrintPath.

About people's automake worries:
I really don't think there is any danger of this being the "tip of the
iceberg".
As long as there is no Makefile.am, it is quite clear that apr isn't using
automake.



Max.



Index: buildconf
===================================================================
RCS file: /home/max/cvsmirror/misc-cvs/apr/buildconf,v
retrieving revision 1.25
diff -u -p -r1.25 buildconf
--- buildconf 1 Jan 2003 00:01:41 -0000 1.25
+++ buildconf 10 Jun 2003 17:58:42 -0000
@@ -83,9 +83,20 @@ $libtoolize --copy --automake
 ltpath=`dirname $libtoolize`
 ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4

-if [ ! -f $ltfile ]; then
-    echo "$ltfile not found"
-    exit 1
+if [ ! -f "$ltfile" ]; then
+    ltfile2="$ltfile"
+    aclocal=`build/PrintPath aclocal`
+    if [ "x$aclocal" = "x" ]; then
+ ltfile="aclocal not available"
+    else
+ ltfile="`$aclocal --print-ac-dir`"/libtool.m4
+    fi
+    if [ "x$aclocal" = "x" -o ! -f "$ltfile" ]; then
+ echo "Unable to find libtool.m4 - tried these locations:"
+ echo "  Based on path of libtoolize: $ltfile2"
+ echo "  Via aclocal --print-ac-dir:  $ltfile"
+ exit 1
+    fi
 fi

 cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' >
build/libtool.m4

-------------------------------------------------------------------

Index: buildconf.sh
===================================================================
RCS file: /home/max/cvsmirror/misc-cvs/apr-util/xml/expat/buildconf.sh,v
retrieving revision 1.10
diff -u -p -r1.10 buildconf.sh
--- xml/expat/buildconf.sh 15 May 2002 16:51:52 -0000 1.10
+++ xml/expat/buildconf.sh 10 Jun 2003 18:05:24 -0000
@@ -10,6 +10,21 @@ if [ "x$libtoolize" = "x" ]; then
 fi
 ltpath=`dirname $libtoolize`
 ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+if [ ! -f "$ltfile" ]; then
+    ltfile2="$ltfile"
+    aclocal=`build/PrintPath aclocal`
+    if [ "x$aclocal" = "x" ]; then
+ ltfile="aclocal not available"
+    else
+ ltfile="`$aclocal --print-ac-dir`"/libtool.m4
+    fi
+    if [ "x$aclocal" = "x" -o ! -f "$ltfile" ]; then
+ echo "Unable to find libtool.m4 - tried these locations:"
+ echo "  Based on path of libtoolize: $ltfile2"
+ echo "  Via aclocal --print-ac-dir:  $ltfile"
+ exit 1
+    fi
+fi
 echo "Incorporating $ltfile into aclocal.m4 ..."
 echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" >
aclocal.m4
 echo "dnl edits here will be lost" >> aclocal.m4


Mime
View raw message