update

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

Makefile.am

@@ -33,6 +33,7 @@ AM_CFLAGS 	+= -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\"
 AM_CFLAGS	+= -DSWITCH_PREFIX_DIR=\"$(PREFIX)\"
 AM_CFLAGS	+= -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\"
 AM_CFLAGS	+= -DSWITCH_DB_DIR=\"$(PREFIX)/db\"
+AM_CFLAGS	+= -DSWITCH_SVN_VERSION=\"$(shell svnversion . -n || echo 'get svn' )\"
 
 libfreeswitch_la_SOURCES	= \
 src/include/switch.h \
@@ -58,8 +59,8 @@ src/switch_core.c \
 src/switch_loadable_module.c \
 src/switch_mutex.c \
 src/switch_utils.c \
-src/switch_event.c \
-src/switch_resample.c
+src/switch_event.c
+
 
 
 #bindir = $(PREFIX)/bin
@@ -81,6 +82,7 @@ library_include_HEADERS =	src/include/switch.h \
 				src/include/switch_event.h \
 				src/include/switch_resample.h
 
+
 lib_LTLIBRARIES		= libfreeswitch.la
 libfreeswitch_la_CFLAGS	= $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g  
 libfreeswitch_la_LDFLAGS	= -version-info 1:0:0

Makefile.in

@@ -77,8 +77,7 @@ am_libfreeswitch_la_OBJECTS = libfreeswitch_la-switch_buffer.lo \
 	libfreeswitch_la-switch_loadable_module.lo \
 	libfreeswitch_la-switch_mutex.lo \
 	libfreeswitch_la-switch_utils.lo \
-	libfreeswitch_la-switch_event.lo \
-	libfreeswitch_la-switch_resample.lo
+	libfreeswitch_la-switch_event.lo
 libfreeswitch_la_OBJECTS = $(am_libfreeswitch_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -176,8 +175,6 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SVNVERSION = @SVNVERSION@
-SVN_VERSION = @SVN_VERSION@
 VERSION = @VERSION@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
@@ -238,7 +235,9 @@ AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
 	-I$(PREFIX)/include -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
 	-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
 	-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
-	-DSWITCH_DB_DIR=\"$(PREFIX)/db\"
+	-DSWITCH_DB_DIR=\"$(PREFIX)/db\" \
+	-DSWITCH_SVN_VERSION=\"$(shell svnversion . -n || echo 'get \
+	svn' )\"
 AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(shell \
 	$(APU_CONFIG) --link-ld --libs ) -lsqlite3 -lresample -lm \
 	$(am__append_1)
@@ -269,8 +268,7 @@ src/switch_core.c \
 src/switch_loadable_module.c \
 src/switch_mutex.c \
 src/switch_utils.c \
-src/switch_event.c \
-src/switch_resample.c
+src/switch_event.c
 
 
 #bindir = $(PREFIX)/bin
@@ -431,7 +429,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_event.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_mutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_resample.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_utils.Plo@am__quote@
 
 .c.o:
@@ -525,13 +522,6 @@ libfreeswitch_la-switch_event.lo: src/switch_event.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_event.lo `test -f 'src/switch_event.c' || echo '$(srcdir)/'`src/switch_event.c
 
-libfreeswitch_la-switch_resample.lo: src/switch_resample.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_resample.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_resample.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/switch_resample.c' object='libfreeswitch_la-switch_resample.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c
-
 freeswitch-switch.o: src/switch.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(freeswitch_CFLAGS) $(CFLAGS) -MT freeswitch-switch.o -MD -MP -MF "$(DEPDIR)/freeswitch-switch.Tpo" -c -o freeswitch-switch.o `test -f 'src/switch.c' || echo '$(srcdir)/'`src/switch.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/freeswitch-switch.Tpo" "$(DEPDIR)/freeswitch-switch.Po"; else rm -f "$(DEPDIR)/freeswitch-switch.Tpo"; exit 1; fi

configure.in

@@ -10,21 +10,11 @@ AC_CONFIG_HEADER([src/include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/freeswitch)
 
 # Checks for programs.
-AC_PATH_PROGS(SVNVERSION, svnversion, [echo Missing subversion so some stuff will be borked],${PATH}:/opt/csw/bin)
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
-# SVN Revision number, needed for FREESWITCH_VERSION
-if test -n "$SVNVERSION" ; then
-	AC_DEFINE_UNQUOTED([SVN_VERSION],"`${SVNVERSION} . -n`",[Which Subversion revision are we building here ?] )
-	AC_SUBST([SVN_VERSION])
-else
-	AC_DEFINE_UNQUOTED([SVN_VERSION],"UNKNOWN",[Unknown Subversion because it's not on this machine.] )
-	AC_SUBST([SVN_VERSION])
-fi   
-
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC

src/include/config.h.in

@@ -82,9 +82,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Unknown Subversion because it's not on this machine. */
-#undef SVN_VERSION
-
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 

src/switch.c

@@ -57,7 +57,7 @@ int main(int argc, char *argv[]) {
 		switch_event_fire(&event);
 	}
 
-	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "freeswitch Version %s Started\n\n", SWITCH_GLOBAL_VERSION);
+	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "freeswitch Version %s Started\n\n", SWITCH_SVN_VERSION);
 
 	/* wait for console input */
 	switch_console_loop();

src/switch_resample.c

@@ -166,22 +166,6 @@ SWITCH_DECLARE(int) switch_short_to_float(short *s, float *f, int len)
 }
 
 
-SWITCH_DECLARE(char *) switch_cut_path(char *in)
-{
-	char *p, *ret = in;
-	char delims[] = "/\\";
-	char *i;
-
-	for(i = delims; *i; i++) {
-		p = in;
-		while((p = strchr(p, *i))) {
-			ret = ++p;
-		}
-	}
-	return ret;
-}
-
-
 SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len)
 {
 	int i;

src/switch_utils.c

@@ -67,6 +67,21 @@ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char
 	return argc;
 }
 
+SWITCH_DECLARE(char *) switch_cut_path(char *in)
+{
+	char *p, *ret = in;
+	char delims[] = "/\\";
+	char *i;
+
+	for(i = delims; *i; i++) {
+		p = in;
+		while((p = strchr(p, *i))) {
+			ret = ++p;
+		}
+	}
+	return ret;
+}
+
 SWITCH_DECLARE(switch_status) switch_socket_create_pollfd(switch_pollfd_t *poll, switch_socket_t *sock, unsigned int flags, switch_memory_pool *pool)
 {
 	switch_pollset_t *pollset;