Index: Makefile.in
===================================================================
--- Makefile.in	(.../branches/xachen)	(revision 559)
+++ Makefile.in	(.../trunk)	(revision 559)
@@ -984,10 +984,10 @@
 
 
 version: Makefile
-	./build/checkversion.sh
+	./checkversion.sh
 
 newversion: Makefile
-	./build/checkversion.sh force
+	./checkversion.sh force
 	$(MAKE)
 
 .nodepends:
@@ -999,10 +999,10 @@
 	rm .nodepends
 
 .depend:
-	MAKE=$(MAKE) ./build/buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
-	MAKE=$(MAKE) ./build/buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
-	MAKE=$(MAKE) ./build/buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
-	MAKE=$(MAKE) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
+	MAKE=$(MAKE) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+	MAKE=$(MAKE) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
+	MAKE=$(MAKE) ./buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
 	cp libs/libresample-0.1.3/*.a $(PREFIX)/lib
 	cp libs/libresample-0.1.3/include/* $(PREFIX)/include
 	ranlib $(PREFIX)/lib/libresample.a
@@ -1012,10 +1012,10 @@
 
 modules: $(NAME)
 	@echo making modules
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) 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)/build/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) 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 ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
+	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
 
 everything: install install_mod
 
@@ -1031,7 +1031,7 @@
 	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
 	@if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
 	@echo Installing Modules
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i install || exit 1; done
 	@echo done
 
 dox:
Index: src/mod/codecs/mod_speex/Makefile
===================================================================
--- src/mod/codecs/mod_speex/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/codecs/mod_speex/Makefile	(.../trunk)	(revision 559)
@@ -1,7 +1,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
Index: src/mod/codecs/mod_gsm/Makefile
===================================================================
--- src/mod/codecs/mod_gsm/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/codecs/mod_gsm/Makefile	(.../trunk)	(revision 559)
@@ -3,7 +3,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
Index: src/mod/codecs/mod_g729/Makefile
===================================================================
--- src/mod/codecs/mod_g729/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/codecs/mod_g729/Makefile	(.../trunk)	(revision 559)
@@ -4,7 +4,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
Index: src/mod/codecs/mod_ilbc/Makefile
===================================================================
--- src/mod/codecs/mod_ilbc/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/codecs/mod_ilbc/Makefile	(.../trunk)	(revision 559)
@@ -3,7 +3,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
Index: src/mod/event_handlers/mod_xmpp_event/Makefile
===================================================================
--- src/mod/event_handlers/mod_xmpp_event/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/event_handlers/mod_xmpp_event/Makefile	(.../trunk)	(revision 559)
@@ -3,7 +3,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
Index: src/mod/endpoints/mod_iax/Makefile
===================================================================
--- src/mod/endpoints/mod_iax/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/endpoints/mod_iax/Makefile	(.../trunk)	(revision 559)
@@ -3,7 +3,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
Index: src/mod/endpoints/mod_portaudio/Makefile
===================================================================
--- src/mod/endpoints/mod_portaudio/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/endpoints/mod_portaudio/Makefile	(.../trunk)	(revision 559)
@@ -4,7 +4,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
 %.o:  %.c
 	$(CC) -fPIC $(CFLAGS) -c -o $@ $<
 
Index: src/mod/endpoints/mod_exosip/Makefile
===================================================================
--- src/mod/endpoints/mod_exosip/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/endpoints/mod_exosip/Makefile	(.../trunk)	(revision 559)
@@ -10,9 +10,9 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
 
 
 $(MODNAME).so: $(MODNAME).c
Index: src/mod/dialplans/mod_pcre/Makefile
===================================================================
--- src/mod/dialplans/mod_pcre/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/dialplans/mod_pcre/Makefile	(.../trunk)	(revision 559)
@@ -3,7 +3,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
Index: src/mod/formats/mod_sndfile/Makefile
===================================================================
--- src/mod/formats/mod_sndfile/Makefile	(.../branches/xachen)	(revision 559)
+++ src/mod/formats/mod_sndfile/Makefile	(.../trunk)	(revision 559)
@@ -3,7 +3,7 @@
 all:	depends $(MODNAME).so
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
Index: buildlib.sh
===================================================================
--- buildlib.sh	(.../branches/xachen)	(revision 0)
+++ buildlib.sh	(.../trunk)	(revision 559)
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+root=$1
+shift
+
+if [ -f $root/.nodepends ] ; then
+    echo "***depends disabled*** use $MAKE yesdepends to re-enable"
+    exit 0
+fi
+
+if [ -z $MAKE ] ; then
+    make=`which dmake 2>/dev/null`
+    if [ -z $MAKE ] ; then
+	make=make
+    fi
+fi
+
+install=
+base=http://www.freeswitch.org/downloads/libs
+
+if [ ! -z $1 ] && [ $1 = install ] ; then
+    install=1
+    shift
+fi
+
+tar=$1
+shift
+
+cd $root/libs/.
+CFLAGS=
+LDFLAGS=
+MAKEFLAGS=
+
+if [ -d $tar ] ; then
+    uncompressed=$tar
+    tar=
+else
+    uncompressed=`echo $tar | sed "s/\.tar\.gz//g"`
+    uncompressed=`echo $uncompressed | sed "s/\.tgz//g"`
+
+    if [ ! -f $tar ] ; then
+	rm -fr $uncompressed
+	wget $base/$tar
+	if [ ! -f $tar ] ; then
+	    echo cannot find $tar
+	    exit
+	fi
+    fi
+    if [ ! -d $uncompressed ] ; then
+	tar -zxvf $tar
+    fi
+fi
+
+if [ -f $uncompressed/.complete ] ; then
+    echo $uncompressed already installed
+    exit 0
+fi
+
+cd $uncompressed
+$MAKE clean 2>&1
+sh ./configure $@
+
+if [ $? = 0 ] ; then
+    $MAKE
+else 
+    echo ERROR
+    exit 1
+fi
+
+if [ ! -z $install ] ; then
+    $MAKE install
+fi
+
+if [ $? = 0 ] ; then
+    touch .complete
+else 
+    echo ERROR
+    exit 1
+fi
+
+exit 0

Property changes on: buildlib.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: build.sh
===================================================================
--- build.sh	(.../branches/xachen)	(revision 0)
+++ build.sh	(.../trunk)	(revision 559)
@@ -0,0 +1 @@
+make depends && make install modules install_mod 

Property changes on: build.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: modmake.sh
===================================================================
--- modmake.sh	(.../branches/xachen)	(revision 0)
+++ modmake.sh	(.../trunk)	(revision 559)
@@ -0,0 +1,23 @@
+#!/bin/sh
+pwd=$1
+shift
+mod=$1
+shift
+
+make=`which gmake`
+
+if [ -z $make ] ; then
+    make=`which make`
+fi
+
+end=`echo $mod | sed "s/^.*\///g"`
+if [ -z $end ] ; then
+    end=$mod
+fi
+
+if [ -f $mod/Makefile ] ; then
+    MODNAME=$end $make -C $mod $@
+else 
+    MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@
+fi
+

Property changes on: modmake.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: checkversion.sh
===================================================================
--- checkversion.sh	(.../branches/xachen)	(revision 0)
+++ checkversion.sh	(.../trunk)	(revision 559)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ ! -z $1 ] ; then
+    if [ $1 = force ] ; then
+	rm -f .version
+    fi
+fi
+
+force=0
+version=`svnversion . -n || echo hacked`
+oldversion=`cat .version 2>/dev/null || echo "0"`
+grep "@SVN_VERSION@" src/include/switch_version.h && force=1
+
+if [ $oldversion != $version ] || [ $force = 1 ] ; then
+    cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$version/g" > src/include/switch_version.h
+    echo $version > .version
+    make modclean
+fi
+
+
+

Property changes on: checkversion.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: Makefile.am
===================================================================
--- Makefile.am	(.../branches/xachen)	(revision 559)
+++ Makefile.am	(.../trunk)	(revision 559)
@@ -108,10 +108,10 @@
 
 
 version: Makefile
-	./build/checkversion.sh
+	./checkversion.sh
 
 newversion: Makefile
-	./build/checkversion.sh force
+	./checkversion.sh force
 	$(MAKE)
 
 .nodepends:
@@ -123,10 +123,10 @@
 	rm .nodepends
 
 .depend:
-	MAKE=$(MAKE) ./build/buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
-	MAKE=$(MAKE) ./build/buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
-	MAKE=$(MAKE) ./build/buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
-	MAKE=$(MAKE) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
+	MAKE=$(MAKE) ./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+	MAKE=$(MAKE) ./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) ./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
+	MAKE=$(MAKE) ./buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
 	cp libs/libresample-0.1.3/*.a $(PREFIX)/lib
 	cp libs/libresample-0.1.3/include/* $(PREFIX)/include
 	ranlib $(PREFIX)/lib/libresample.a
@@ -137,10 +137,10 @@
 
 modules: $(NAME)
 	@echo making modules
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) 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)/build/modmake.sh $(PWD) $$i || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; MAKE=$(MAKE) 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 ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i clean || exit 1; done
+	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; MAKE=$(MAKE) SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
 
 everything: install install_mod
 
@@ -156,7 +156,7 @@
 	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
 	@if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
 	@echo Installing Modules
-	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i install || exit 1; done
 	@echo done
 
 dox: