add some deps, now it shouldn't add features if it notices something it can include

[openwrt/svn-archive/archive.git] / utils / apr-util / Makefile

diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile
index 950d4eca922c13af30b8d204176bf6fb15665b8e..093f7d56e5373c8de538ee513df55772cbd75e79 100644 (file)
--- a/utils/apr-util/Makefile
+++ b/utils/apr-util/Makefile
@@ -4,17 +4,17 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $ Id: $ 
+# $Id$ 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr-util
-PKG_VERSION:=0.9.13
+PKG_VERSION:=1.2.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://apache.autinity.de/apr/
-PKG_MD5SUM:=31e3881af0d9546286b0057717cdb89b
+PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -25,17 +25,22 @@ include $(INCLUDE_DIR)/package.mk
 define Package/apr-util
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libexpat +apr
+  DEPENDS:=+libiconv +libexpat +apr +libpthread +libopenssl +libsqlite3
   TITLE:=Apache Portable Runtime Library Util
   URL:=http://apr.apache.org/
 endef
 
 define Build/Configure 
        $(call Build/Configure/Default, \
-               --with-apr="$(STAGING_DIR)/usr/bin/apr-config" \
+               --with-pgsql=no \
+               --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
+               --with-expat="$(STAGING_DIR)/usr" \
                , \
-               APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build" \
+               ac_cv_file_dbd_apr_dbd_mysql_c=no \
+               APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
                CFLAGS="-I$(STAGING_DIR)/usr/lib/libiconv/include/" \
+               LDFLAGS="-ldl -L$(STAGING_DIR)/lib \
+                        -L$(STAGING_DIR)/usr/lib" \
        )
 endef
 
@@ -47,27 +52,32 @@ endef
 
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-config \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
                $(STAGING_DIR)/usr/bin
-       mkdir -p $(STAGING_DIR)/usr/include/apr-0/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-0/* \
-               $(STAGING_DIR)/usr/include/apr-0/
+       mkdir -p $(STAGING_DIR)/usr/include/apr-1/
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
+               $(STAGING_DIR)/usr/include/apr-1/
        mkdir -p $(STAGING_DIR)/usr/lib 
                $(CP)   $(PKG_INSTALL_DIR)/usr/lib/*aprutil* \
                $(STAGING_DIR)/usr/lib/
-       $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-config
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-0.la
+       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
+               $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
+               $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-1-config
+       $(SED)  "s,bindir\=\"/usr/bin\",bindir\=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apu-1-config
+       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-1.la
+       
 endef
 
 define Build/UninstallDev
-       -rm     $(STAGING_DIR)/usr/bin/apu-config \
-               $(STAGING_DIR)/usr/include/apr-0/{apr_anylock.h,apr_base64.h,apr_buckets.h,apr_date.h,apr_dbm.h,apr_hooks.h,apr_ldap.h,apr_ldap_url.h,apr_md4.h,apr_md5.h,apr_optional.h,apr_optional_hooks.h,apr_queue.h,apr_reslist.h,apr_rmm.h,apr_sdbm.h,apr_sha1.h,apr_strmatch.h,apr_uri.h,apr_uuid.h,apr_xlate.h,apr_xml.h,apu_compat.h,apu.h,apu_version.h,apu_want.h} \
-               $(STAGING_DIR)/usr/lib/*aprutil*
+       rm      $(STAGING_DIR)/usr/bin/apu-1-config \
+               $(STAGING_DIR)/usr/lib/{*aprutil-1*,aprutil.exp}
+       rm -rf  $(STAGING_DIR)/usr/include/apr-1
 endef
 
 define Package/apr-util/install        
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-config $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef