update

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

Makefile.am

 EXTRA_DIST =
 SUBDIRS = 
-AUTOMAKE_OPTS		= gnu
+AUTOMAKE_OPTS= gnu
 MAKE=gmake
 NAME=freeswitch
 PREFIX=$(prefix)
 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 )
-AM_CFLAGS  += $(shell $(APU_CONFIG) --includes)
+AM_CFLAGS  = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags --includes)
+AM_LDFLAGS = -L$(PREFIX)/lib
+AM_LDFLAGS += $(shell $(APR_CONFIG) --link-ld --libs )
+AM_CFLAGS  += $(shell $(APU_CONFIG) --includes) 
 AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs ) -lsqlite3
-AM_LDFLAGS += -lresample -lm
+AM_LDFLAGS += -lresample -lm -L/usr/local/lib/db42 -L/usr/local/lib
 OSARCH=$(shell uname -s)
 if ISLINUX
 AM_LDFLAGS += -Wl,-E
@@ -24,7 +25,7 @@ SOLINK=-shared -Xlinker -x
 endif
 
 
-#AM_LDFLAGS += -L$(PREFIX)/lib
+
 
 
 AM_CFLAGS  += -fPIC -Wall
@@ -126,7 +127,7 @@ depends: .depend
 
 modules: $(NAME)
 	@echo making modules
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
 
 modclean:
 	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done

Makefile.in

@@ -231,18 +231,17 @@ NAME = freeswitch
 PREFIX = $(prefix)
 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) \
-	$(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\" \
+AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags \
+	--cppflags --includes) $(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 ) $(shell \
-	$(APU_CONFIG) --link-ld --libs ) -lsqlite3 -lresample -lm \
-	$(am__append_1)
+AM_LDFLAGS = -L$(PREFIX)/lib $(shell $(APR_CONFIG) --link-ld --libs ) \
+	$(shell $(APU_CONFIG) --link-ld --libs ) -lsqlite3 -lresample \
+	-lm -L/usr/local/lib/db42 -L/usr/local/lib $(am__append_1)
 OSARCH = $(shell uname -s)
 @ISMAC_FALSE@SOLINK = -shared -Xlinker -x
 @ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
@@ -997,7 +996,7 @@ depends: .depend
 
 modules: $(NAME)
 	@echo making modules
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; DYLD_LIBRARY_PATH="$(PREFIX)/lib:$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="$(PREFIX)/lib:$LD_LIBRARY_PATH" PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
 
 modclean:
 	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done

buildlib.sh

@@ -4,7 +4,7 @@ root=$1
 shift
 
 if [ -f $root/.nodepends ] ; then
-    echo "***depends disabled*** use make yesdepends to re-enable"
+    echo "***depends disabled*** use gmake yesdepends to re-enable"
     exit 0
 fi
 
@@ -24,7 +24,7 @@ shift
 cd $root/libs/.
 CFLAGS=
 LDFLAGS=
-MAKEFLAGS=
+GMAKEFLAGS=
 
 if [ -d $tar ] ; then
     uncompressed=$tar
@@ -52,18 +52,18 @@ if [ -f $uncompressed/.complete ] ; then
 fi
 
 cd $uncompressed
-make clean 2>&1
+gmake clean 2>&1
 sh ./configure $@
 
 if [ $? == 0 ] ; then
-    make
+    gmake
 else 
     echo ERROR
     exit 1
 fi
 
 if [ ! -z $install ] ; then
-    make install
+    gmake install
     ldconfig 2>&1
 fi
 

libs/jrtp4c/Makefile.am

@@ -5,13 +5,13 @@ MAKE=gmake
 NAME=jrtp4c
 
 AM_CC=g++
-AM_CFLAGS	= -Wall -ansi -pedantic -g -O2 -Isrc -I/usr/local/include/jthread -I/usr/local/include/jrtplib3
-AM_CPPFLAGS = $(AM_CFLAGS)
+AM_CFLAGS	= -Wall -ansi -pedantic -g -O2 -Isrc -I${prefix}/include/jthread -I${prefix}/include/jrtplib3
+AM_CPPFLAGS = $(AM_CFLAGS) 
 
 lib_LTLIBRARIES		= libjrtp4c.la
 libjrtp4c_la_SOURCES	= src/jrtp4c.cpp
 libjrtp4c_la_CFLAGS	= $(AM_CFLAGS)
-libjrtp4c_la_LDFLAGS	= -ljrtp -ljthread -lpthread
+libjrtp4c_la_LDFLAGS	= -L${prefix}/lib -ljrtp -ljthread -lpthread
 
 library_includedir	= $(prefix)/include
 library_include_HEADERS = src/jrtp4c.h

modules.conf

@@ -10,7 +10,7 @@ dialplans/mod_dialplan_demo
 endpoints/mod_exosip
 endpoints/mod_iax
 #endpoints/mod_opal
-endpoints/mod_portaudio
+#endpoints/mod_portaudio
 #endpoints/mod_wanpipe
 endpoints/mod_woomera
 #event_handlers/mod_event_test