kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-08 05:54:45 +00:00
Code Issues Projects Releases Wiki Activity

add apr-utils

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@189 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2005-12-21 22:38:53 +00:00
parent 6949227ca1
commit 98a797a2f2
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -5,8 +5,11 @@ MAKE=gmake
NAME=freeswitch NAME=freeswitch
PREFIX=$(prefix)/${NAME} PREFIX=$(prefix)/${NAME}
APR_CONFIG=$(prefix)/bin/apr-1-config APR_CONFIG=$(prefix)/bin/apr-1-config
APU_CONFIG=$(prefix)/bin/apu-1-config
AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) 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) OSARCH=$(shell uname -s)
if ISLINUX if ISLINUX
AM_LDFLAGS += -Wl,-E AM_LDFLAGS += -Wl,-E

11
Makefile.in
View File

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

8
src/include/switch_types.h
View File

@ -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_broadcast apr_thread_cond_broadcast
#define switch_thread_cond_destroy apr_thread_cond_destroy #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_poll_setup apr_poll_setup
#define switch_pollset_create apr_pollset_create #define switch_pollset_create apr_pollset_create
#define switch_pollset_add apr_pollset_add #define switch_pollset_add apr_pollset_add