From 5a24444bfda71d81f99eee9de2e88a60af46460a Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 2 Sep 2010 22:57:12 -0600 Subject: [PATCH] Bug 2972: pt 2: More correct LTDL include paths. After the last few rounds I'm suspicious about calling this closed quite yet but this patch is required and works for building with libtool 1.5. --- bootstrap.sh | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index a123ac56da..933ff33314 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,9 +7,9 @@ # Autotool versions preferred. To override either edit the script # to match the versions you want to use, or set the variables on # the command line like "env acver=.. amver=... ./bootstrap.sh" -acversions="${acver:-2.63 2.62 2.61}" +acversions="${acver:-2.64 2.63 2.62 2.61}" amversions="${amver:-1.11 1.10 1.9}" -ltversions="${ltver:-2.2 1.5 1.4}" +ltversions="${ltver:-2.2}" check_version() { @@ -113,19 +113,6 @@ bootstrap_libtoolize() { chmod u+w $makefile mv $makefile.new $makefile chmod u-w $makefile - - # Libtool 2.2.6b we bundle is slightly broken with non-portable dependencies - # HACK: Make it backward-compatible by linking the bundled headers. - for f in ltdl.h libltdl/lt_error.h libltdl/lt_system.h libltdl/lt_dlloader.h libltdl/slist.h; do - echo "Fixing $f ..." - sed 's//\"libltdl\/lt_system.h\"/g' $src/$f | - sed 's//\"libltdl\/lt__glibc.h\"/g' | - sed 's//\"libltdl\/lt_error.h\"/g' | - sed 's//\"libltdl\/lt_dlloader.h\"/g' > $src/$f.new; - chmod u+w $src/$f - mv $src/$f.new $src/$f - chmod u-w $src/$f - done fi } -- 2.47.3