[Freeswitch-svn] [commit] r13289 - freeswitch/trunk/libs/apr-util

[FreeSWITCH SVN]

Author: mikej
Date: Wed May 13 10:46:01 2009
New Revision: 13289

Log:
add xml/expat stuff back to apr-utils (will require re-bootstrap before building anything that uses this)

Modified:
   freeswitch/trunk/libs/apr-util/.update
   freeswitch/trunk/libs/apr-util/build-outputs.mk
   freeswitch/trunk/libs/apr-util/build.conf
   freeswitch/trunk/libs/apr-util/configure.in

Modified: freeswitch/trunk/libs/apr-util/.update
==============================================================================
--- freeswitch/trunk/libs/apr-util/.update	(original)
+++ freeswitch/trunk/libs/apr-util/.update	Wed May 13 10:46:01 2009
@@ -1 +1 @@
-Thu May  8 18:41:57 EDT 2008
+Wed May 13 10:45:16 CDT 2009

Modified: freeswitch/trunk/libs/apr-util/build-outputs.mk
==============================================================================
--- freeswitch/trunk/libs/apr-util/build-outputs.mk	(original)
+++ freeswitch/trunk/libs/apr-util/build-outputs.mk	Wed May 13 10:46:01 2009
@@ -13,10 +13,11 @@
 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_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

Modified: freeswitch/trunk/libs/apr-util/build.conf
==============================================================================
--- freeswitch/trunk/libs/apr-util/build.conf	(original)
+++ freeswitch/trunk/libs/apr-util/build.conf	Wed May 13 10:46:01 2009
@@ -15,10 +15,10 @@
   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 =

Modified: freeswitch/trunk/libs/apr-util/configure.in
==============================================================================
--- freeswitch/trunk/libs/apr-util/configure.in	(original)
+++ freeswitch/trunk/libs/apr-util/configure.in	Wed May 13 10:46:01 2009
@@ -122,7 +122,7 @@
 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)