add apr-utils

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

diff --git a/Makefile.am b/Makefile.am
index c634c89d8342f68cf107137c36a3406e9ba3b689..24bffc5e9e497e0a461f4bed504ffaf68fa2f687 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,11 @@ MAKE=gmake
 NAME=freeswitch
 PREFIX=$(prefix)/${NAME}
 APR_CONFIG=$(prefix)/bin/apr-1-config
+APU_CONFIG=$(prefix)/bin/apu-1-config
 AM_CFLAGS  = $(shell $(APR_CONFIG) --cflags --cppflags --includes)
-AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) -lsqlite3
+AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs )
+AM_CFLAGS  += $(shell $(APU_CONFIG) --includes)
+AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs ) 
 OSARCH=$(shell uname -s)
 if ISLINUX
 AM_LDFLAGS += -Wl,-E

diff --git a/Makefile.in b/Makefile.in
index b2cc52046f195f159defa9710132ee11d0bf1772..21d66a3e8fc88c162b9ab1262f320a9d3b731712 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -226,17 +226,18 @@ MAKE = gmake
 NAME = freeswitch
 PREFIX = $(prefix)/${NAME}
 APR_CONFIG = $(prefix)/bin/apr-1-config
+APU_CONFIG = $(prefix)/bin/apu-1-config
 
 #AM_LDFLAGS += -L$(PREFIX)/lib
 AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
-       $(am__append_2) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
-       -I$(PWD)/src/include -I$(PREFIX)/include \
-       -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
+       $(shell $(APU_CONFIG) --includes) $(am__append_2) -fPIC -Wall \
+       -I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include \
+       -I$(PREFIX)/include -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
        -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
        -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
        -DSWITCH_DB_DIR=\"$(PREFIX)/db\"
-AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) -lsqlite3 \
-       $(am__append_1)
+AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(shell \
+       $(APU_CONFIG) --link-ld --libs ) $(am__append_1)
 OSARCH = $(shell uname -s)
 @ISMAC_FALSE@SOLINK = -shared -Xlinker -x
 @ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index c9b5c18076d54a1bdcf29ce1b0a444233234ce0c..77b49e0d50c15d1079d0f6d5d5fa4c0f2fbe4649 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -226,6 +226,14 @@ typedef apr_hash_index_t switch_hash_index_t;
 #define switch_thread_cond_broadcast apr_thread_cond_broadcast
 #define switch_thread_cond_destroy apr_thread_cond_destroy
 
+#define switch_queue_create apr_queue_create
+#define switch_queue_interrupt_all apr_queue_interrupt_all
+#define switch_queue_pop apr_queue_pop
+#define switch_queue_push apr_queue_push
+#define switch_queue_size apr_queue_size
+#define switch_queue_term apr_queue_term
+#define switch_queue_trypop apr_queue_trypop
+#define switch_queue_trypush apr_queue_trypush
 #define switch_poll_setup apr_poll_setup
 #define switch_pollset_create apr_pollset_create
 #define switch_pollset_add apr_pollset_add