Blame apr-1.3.3-libtool22.patch
|
jorton |
9fc74c |
|
|
jorton |
9fc74c |
http://svn.apache.org/viewvc?rev=733052&view=rev
|
|
jorton |
9fc74c |
|
|
jorton |
9fc74c |
--- apr-1.3.3/buildconf.libtool22
|
|
jorton |
9fc74c |
+++ apr-1.3.3/buildconf
|
|
jorton |
9fc74c |
@@ -45,6 +45,14 @@ $libtoolize --copy --automake
|
|
jorton |
9fc74c |
|
|
jorton |
9fc74c |
if [ -f libtool.m4 ]; then
|
|
jorton |
9fc74c |
ltfile=`pwd`/libtool.m4
|
|
jorton |
9fc74c |
+elif grep all_pkgmacro_files $libtoolize > /dev/null; then
|
|
jorton |
9fc74c |
+ # libtool 2.x
|
|
jorton |
9fc74c |
+ aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
|
|
jorton |
9fc74c |
+ ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
|
|
jorton |
9fc74c |
+ for f in $ltfiles; do
|
|
jorton |
9fc74c |
+ test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
|
|
jorton |
9fc74c |
+ done
|
|
jorton |
9fc74c |
+ ltfile=$aclocal_dir/libtool.m4
|
|
jorton |
9fc74c |
else
|
|
jorton |
9fc74c |
ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
|
|
jorton |
9fc74c |
< $libtoolize`"
|
|
jorton |
9fc74c |
--- apr-1.3.3/configure.in.libtool22
|
|
jorton |
9fc74c |
+++ apr-1.3.3/configure.in
|
|
jorton |
9fc74c |
@@ -20,6 +20,10 @@ sinclude(build/apr_win32.m4)
|
|
jorton |
9fc74c |
sinclude(build/apr_hints.m4)
|
|
jorton |
9fc74c |
sinclude(build/libtool.m4)
|
|
jorton |
9fc74c |
sinclude(build/ltsugar.m4)
|
|
jorton |
9fc74c |
+sinclude(build/argz.m4)
|
|
jorton |
9fc74c |
+sinclude(build/ltoptions.m4)
|
|
jorton |
9fc74c |
+sinclude(build/ltversion.m4)
|
|
jorton |
9fc74c |
+sinclude(build/lt~obsolete.m4)
|
|
jorton |
9fc74c |
|
|
jorton |
9fc74c |
dnl Hard-coded inclusion at the tail end of apr_private.h:
|
|
jorton |
9fc74c |
AH_BOTTOM([
|