]> granicus.if.org Git - apache/commitdiff
steal some code from APR intended to allow you to properly switch
authorJeff Trawick <trawick@apache.org>
Thu, 5 Jun 2003 18:41:49 +0000 (18:41 +0000)
committerJeff Trawick <trawick@apache.org>
Thu, 5 Jun 2003 18:41:49 +0000 (18:41 +0000)
between libtool 1.3 and 1.4+...  newer libtool doesn't have ltconfig,
so having a stray ltconfig around will confuse some of our config
logic

This also fixes cp failure on FreeBSD since ltconfig and ltmain.sh
are installed with 0400 perms, and when buildconf is run a second time
the cp of those files would fail.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100178 13f79535-47bb-0310-9956-ffa450edef68

buildconf

index 3bfb09b274d9ecf944a7fed0bde6e843813e80f0..376ebf5596d878612b75748f0e08b7a86eb6af00 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -162,6 +162,10 @@ cp $apr_src_dir/build/config.guess $apr_src_dir/build/config.sub \
    $apr_src_dir/build/PrintPath $apr_src_dir/build/apr_common.m4 \
    $apr_src_dir/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
 
+# Remove any libtool files so one can switch between libtool 1.3
+# and libtool 1.4 by simply rerunning the buildconf script.
+(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
+
 # Optionally copy libtool-1.3.x files
 if [ -f $apr_src_dir/build/ltconfig ]; then
     cp $apr_src_dir/build/ltconfig build