svn commit: r190009 - /httpd/httpd/branches/fips-dev/srclib/apr/buildconf

[wr...@apache.org]

Author: wrowe
Date: Fri Jun 10 12:28:52 2005
New Revision: 190009

URL: http://svn.apache.org/viewcvs?rev=190009&view=rev
Log:

  Examine the selected libtoolize in order to determine it's configured
  libtool.m4 path, rather than gross assumptions.  Leaving the gross
  assumptions as a fail-over if the structure of libtoolize script is
  somehow borked.

  Prefer, of course, any libtool that isn't libtool 1.3 or before, so
  push 'libtoolize' to the end of the desireables list.

  In the sandbox for some testing across platforms - will propose to
  dev@apr once some measure of portability is confirmed

Modified:
    httpd/httpd/branches/fips-dev/srclib/apr/buildconf

Modified: httpd/httpd/branches/fips-dev/srclib/apr/buildconf
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fips-dev/srclib/apr/buildconf?rev=190009&r1=190008&r2=190009&view=diff
==============================================================================
--- httpd/httpd/branches/fips-dev/srclib/apr/buildconf (original)
+++ httpd/httpd/branches/fips-dev/srclib/apr/buildconf Fri Jun 10 12:28:52 2005
@@ -45,8 +45,14 @@
 if [ -f libtool.m4 ]; then 
    ltfile=`pwd`/libtool.m4
 else
-   ltpath=`dirname $libtoolize`
-   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+   ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
+                   < $libtoolize`"
+   ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
+   # Expecting the code above to be very portable, but just in case...
+   if [ -e "$ltfile" -o ! -f "$ltfile" ]; then
+     ltpath=`dirname $libtoolize`
+     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+   fi
 fi
   
 if [ ! -f $ltfile ]; then