From a4fc74c37e962f8c56653e62b0a8feca3ac36327 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Wed, 24 May 2006 14:42:21 +0000
Subject: [PATCH] update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1497 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 Makefile.am                           | 5 ++++-
 Makefile.in                           | 9 ++++++---
 src/mod/endpoints/mod_exosip/Makefile | 4 ++--
 src/switch.c                          | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d36a0677b5..0e33947821 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,10 @@ if CRASHPROT
 AM_CFLAGS += -DCRASH_PROT
 endif
 
+AM_CFGARGS =
 if IS64BITLINUX
-AM_CFLAGS += -m64 -march=k8 -fPIC
+AM_CFLAGS += -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
+AM_CFGARGS += --enable-64bit
 endif
 
 #put elsif win here
@@ -183,6 +185,7 @@ modules: $(NAME)
 	@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
 	@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
+	@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
 	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
 	@rm -f build/freeswitch.env
 
diff --git a/Makefile.in b/Makefile.in
index f2cfcfb3d2..fec74137e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,8 +40,9 @@ build_triplet = @build@
 host_triplet = @host@
 @ISLINUX_TRUE@am__append_1 = -Wl,-E
 @CRASHPROT_TRUE@am__append_2 = -DCRASH_PROT
-@IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC
-@ISMAC_TRUE@am__append_4 = -DMACOSX
+@IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
+@IS64BITLINUX_TRUE@am__append_4 = --enable-64bit
+@ISMAC_TRUE@am__append_5 = -DMACOSX
 bin_PROGRAMS = freeswitch$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -246,7 +247,7 @@ APU_CONFIG = $(prefix)/bin/apu-1-config
 AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags \
 	--cppflags --includes) -I${prefix}/include/srtp $(shell \
 	$(APU_CONFIG) --includes) $(am__append_2) $(am__append_3) \
-	$(am__append_4) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
+	$(am__append_5) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
 	-I$(PWD)/src/include -I$(PREFIX)/include \
 	-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
 	-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
@@ -259,6 +260,7 @@ AM_LDFLAGS = -L$(PREFIX)/lib $(shell $(APR_CONFIG) --link-ld --libs ) \
 	$(shell $(APU_CONFIG) --link-ld --libs ) -lm \
 	-L/usr/local/lib/db42 -L/usr/local/lib $(am__append_1)
 OSARCH = $(shell uname -s)
+AM_CFGARGS = $(am__append_4)
 @ISMAC_FALSE@SOLINK = -shared -Xlinker -x
 
 #put elsif win here
@@ -1090,6 +1092,7 @@ modules: $(NAME)
 	@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
 	@./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)"
 	@./build/addenv.sh build/freeswitch.env CC "$(CC)"
+	@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
 	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(PWD) $$i || exit 1; done
 	@rm -f build/freeswitch.env
 
diff --git a/src/mod/endpoints/mod_exosip/Makefile b/src/mod/endpoints/mod_exosip/Makefile
index e3561f50de..65b3bc9e14 100644
--- a/src/mod/endpoints/mod_exosip/Makefile
+++ b/src/mod/endpoints/mod_exosip/Makefile
@@ -11,8 +11,8 @@ all:	depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 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.3-pre1.tar.gz  --disable-josua --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libosip2-2.2.3.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libeXosip2-2.2.3.tar.gz  --disable-josua --prefix=$(PREFIX)
 
 
 %.o:  %.c
diff --git a/src/switch.c b/src/switch.c
index 5296850e66..a1b62d15c2 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
 	SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
 #else
 	int pid;
-	nice(-20);
+	//nice(-20);
 #endif
 
 #ifndef WIN32