apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jean-frederic clere <jfrederic.cl...@fujitsu-siemens.com>
Subject Re: Fwd: svn commit: r190009 - /httpd/httpd/branches/fips-dev/srclib/apr/buildconf
Date Mon, 13 Jun 2005 14:24:51 GMT
William A. Rowe, Jr. wrote:
> Please, take a quick look and consider this patch.
> 
> It fixes BSD in particular, where we pick up bin/libtoolize15 but
> grab (or entirely fail to grab) share/aclocal/libtool.m4, as it's
> installed as share/aclocal/libtool15.m4.
> 
> I missed the other side of this patch, which is to prefer the order
> of detecting libtool as glibtool glibtool15 glibtool14 libtool,
> such that if libtool is a 13 or earlier flavor, we avoid it.
> 
> 
>>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

Should be the -e a -f?

I have on Solaris8:
+++
jfclere@PGTR0327:~/apr> sh buildconf
buildconf: checking installation...
buildconf: python version 2.3.3 (ok)
buildconf: autoconf version 2.59 (ok)
buildconf: libtool version 1.5.2 (ok)
Copying libtool helper files ...
buildconf: test: unknown operator /opt/SMAWPlus/share/aclocal/libtool.m4
+++

>>+     ltpath=`dirname $libtoolize`
>>+     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
>>+   fi
>>fi
>>  
>>if [ ! -f $ltfile ]; then
> 
> 
> 

Mime
View raw message