apr: force full autoreconfig, fix compilation after reconf

SVN-Revision: 24395

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 29c242d1289886a65d032eef86a25ade2e330c41..d1bf55d2b07dfb467ee1fbaa3e923d72ab20dfe8 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr
 PKG_MD5SUM:=4b00e8f70c067893d075577962656b35
 
 PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=build/libtool.m4 build/ltmain.sh
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/libs/apr/patches/001-autoconf-compat.patch b/libs/apr/patches/001-autoconf-compat.patch
new file mode 100644 (file)
index 0000000..0f383eb
--- /dev/null
+++ b/libs/apr/patches/001-autoconf-compat.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,6 +3,7 @@ srcdir=@srcdir@
+ VPATH=@srcdir@
+ top_srcdir=@apr_srcdir@
+ top_blddir=@apr_builddir@
++top_builddir=@top_builddir@
+ 
+ #
+ # APR (Apache Portable Runtime) library Makefile.