[Freeswitch-svn] [commit] r1802 - freeswitch/branches/stkn

[Freeswitch SVN]

Author: stkn
Date: Sun Jul  9 21:16:40 2006
New Revision: 1802

Modified:
   freeswitch/branches/stkn/Makefile.in
   freeswitch/branches/stkn/configure
   freeswitch/branches/stkn/configure.in

Log:
fix it to actually work

Modified: freeswitch/branches/stkn/Makefile.in
==============================================================================
--- freeswitch/branches/stkn/Makefile.in	(original)
+++ freeswitch/branches/stkn/Makefile.in	Sun Jul  9 21:16:40 2006
@@ -40,10 +40,11 @@
 build_triplet = @build@
 host_triplet = @host@
 @ISLINUX_TRUE at am__append_1 = -Wl,-E
- at CRASHPROT_TRUE@am__append_2 = -DCRASH_PROT
- at IS64BITLINUX_TRUE@am__append_3 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
- at IS64BITLINUX_TRUE@am__append_4 = --enable-64bit
- at ISMAC_TRUE@am__append_5 = -DMACOSX
+ at ISLINUX_TRUE@@ISPPC_TRUE at am__append_2 = -fsigned-char
+ at CRASHPROT_TRUE@am__append_3 = -DCRASH_PROT
+ at IS64BITLINUX_TRUE@am__append_4 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
+ at IS64BITLINUX_TRUE@am__append_5 = --enable-64bit
+ at ISMAC_TRUE@am__append_6 = -DMACOSX
 bin_PROGRAMS = freeswitch$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -252,9 +253,9 @@
 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_5) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
-	-I$(PWD)/src/include -I$(PREFIX)/include \
-	-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
+	$(am__append_4) $(am__append_6) -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\" \
@@ -265,7 +266,7 @@
 	$(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)
+AM_CFGARGS = $(am__append_5)
 @ISMAC_FALSE at SOLINK = -shared -Xlinker -x
 
 #put elsif win here

Modified: freeswitch/branches/stkn/configure
==============================================================================
--- freeswitch/branches/stkn/configure	(original)
+++ freeswitch/branches/stkn/configure	Sun Jul  9 21:16:40 2006
@@ -20838,11 +20838,14 @@
 	ppc|ppc64|powerpc)
 		MACHINE="ppc"
 		;;
+	*)
+		MACHINE="`uname -m`"
+		;;
 esac
 
 
 
-if test "$MACHINE" = "ppc" ; then
+if test "$MACHINE" = "ppc"; then
   ISPPC_TRUE=
   ISPPC_FALSE='#'
 else

Modified: freeswitch/branches/stkn/configure.in
==============================================================================
--- freeswitch/branches/stkn/configure.in	(original)
+++ freeswitch/branches/stkn/configure.in	Sun Jul  9 21:16:40 2006
@@ -59,9 +59,12 @@
 	ppc|ppc64|powerpc)
 		MACHINE="ppc"
 		;;
+	*)
+		MACHINE="`uname -m`"
+		;;
 esac
 
-AM_CONDITIONAL(ISPPC, [test "$MACHINE" = "ppc" ])
+AM_CONDITIONAL(ISPPC, [test "$MACHINE" = "ppc"])
 
 
 AC_OUTPUT([src/include/switch_version.h])