From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 10 Jun 2005 19:28:52 +0000 (+0000)
Subject:   Examine the selected libtoolize in order to determine it's configured
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=609ba0dff33c2f3b755f3bbd925a1f7bfe424574;p=thirdparty%2Fapache%2Fhttpd.git

  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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@190009 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/srclib/apr/buildconf b/srclib/apr/buildconf
index b16441f4ab3..294ec02c139 100755
--- a/srclib/apr/buildconf
+++ b/srclib/apr/buildconf
@@ -45,8 +45,14 @@ $libtoolize --copy --automake
 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