add xml/expat stuff back to apr-utils (will require re-bootstrap before building...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13289 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/apr-util/.update b/libs/apr-util/.update
index 2f0db60b985b6f7f23b39f879194f29256dbb461..f70b46d237decce1cd540f7ebc1ef275fda37eee 100644 (file)
--- a/libs/apr-util/.update
+++ b/libs/apr-util/.update
@@ -1 +1 @@
-Thu May  8 18:41:57 EDT 2008
+Wed May 13 10:45:16 CDT 2009

diff --git a/libs/apr-util/build-outputs.mk b/libs/apr-util/build-outputs.mk
index db19f82a4a7c45a8c26d7c25945d427b88e39a86..d42cda80ff947867dca7ac384280322028d5b6ab 100644 (file)
--- a/libs/apr-util/build-outputs.mk
+++ b/libs/apr-util/build-outputs.mk
@@ -13,10 +13,11 @@ misc/apr_date.lo: misc/apr_date.c .make.dirs include/apr_date.h
 misc/apu_version.lo: misc/apu_version.c .make.dirs include/apu_version.h
 misc/apr_queue.lo: misc/apr_queue.c .make.dirs include/apr_queue.h
 uri/apr_uri.lo: uri/apr_uri.c .make.dirs include/apr_uri.h
+xml/apr_xml.lo: xml/apr_xml.c .make.dirs include/apr_xml.h include/apr_xlate.h
 strmatch/apr_strmatch.lo: strmatch/apr_strmatch.c .make.dirs include/apr_strmatch.h
 xlate/xlate.lo: xlate/xlate.c .make.dirs include/apr_xlate.h
 
-OBJECTS_all = crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/apr_md4.lo encoding/apr_base64.lo hooks/apr_hooks.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_date.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo strmatch/apr_strmatch.lo xlate/xlate.lo
+OBJECTS_all = crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/apr_md4.lo encoding/apr_base64.lo hooks/apr_hooks.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_date.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo
 
 OBJECTS_unix = $(OBJECTS_all)
 
@@ -28,11 +29,11 @@ OBJECTS_os2 = $(OBJECTS_all)
 
 OBJECTS_os390 = $(OBJECTS_all)
 
-HEADERS = $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_sha1.h
+HEADERS = $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_xml.h $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_sha1.h
 
-SOURCE_DIRS = encoding hooks misc crypto uri strmatch xlate $(EXTRA_SOURCE_DIRS)
+SOURCE_DIRS = xml encoding hooks misc crypto uri strmatch xlate $(EXTRA_SOURCE_DIRS)
 
-BUILD_DIRS = crypto encoding hooks misc strmatch uri xlate
+BUILD_DIRS = crypto encoding hooks misc strmatch uri xlate xml
 
 .make.dirs: $(srcdir)/build-outputs.mk
        @for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done

diff --git a/libs/apr-util/build.conf b/libs/apr-util/build.conf
index fd02e340188d7fd3301bf86e7ed98929871c9a60..066009fdaa3ffc1c6c2caad1a4a74ddf6c2761bf 100644 (file)
--- a/libs/apr-util/build.conf
+++ b/libs/apr-util/build.conf
@@ -15,10 +15,10 @@ paths =
   ldap/*.c
   misc/*.c
   uri/apr_uri.c
+  xml/*.c
   strmatch/*.c
   xlate/*.c
   dbd/*.c
-#  xml/*.c
 
 # we have no platform-specific subdirs
 platform_dirs =

diff --git a/libs/apr-util/configure.in b/libs/apr-util/configure.in
index 37e38554dd44e557579d2892c6aac669b158b64b..cb2ff3f43d16ab7e5cbb5683c2cd5056d7cfe89b 100644 (file)
--- a/libs/apr-util/configure.in
+++ b/libs/apr-util/configure.in
@@ -122,7 +122,7 @@ APU_CHECK_DBD
 APU_CHECK_DBD_MYSQL
 APU_CHECK_DBD_SQLITE3
 APU_CHECK_DBD_SQLITE2
-#APU_FIND_EXPAT
+APU_FIND_EXPAT
 APU_FIND_ICONV
 
 AC_SEARCH_LIBS(crypt, crypt ufc)