update

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

diff --git a/Makefile.am b/Makefile.am
index a021e908be1444163fcdd0e47c6d5a4a5181c744..99796fb12d3776a025169664db27f10a513014f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ 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 )
-AM_LDFLAGS += -lm -L/usr/local/lib/db42 -L/usr/local/lib 
+AM_LDFLAGS += -lm -L/usr/local/lib/db42 -L/usr/local/lib -lsrtp
 OSARCH=$(shell uname -s)
 if ISLINUX
 AM_LDFLAGS += -Wl,-E
@@ -112,7 +112,7 @@ CLEANFILES = src/include/switch_version.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
-libfreeswitch_la_LIBADD  = -lteletone -lresample -lsrtp -lsqlite3
+libfreeswitch_la_LIBADD  = -lteletone -lresample -lsqlite3
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
 
 bin_PROGRAMS = freeswitch

diff --git a/src/include/switch_am_config.h.in b/src/include/switch_am_config.h.in
index f085b4ebf5a05828af68ad4d0a436ced8717792c..9205ccad28017d1a48b7b78abdc5c08688942c24 100644 (file)
--- a/src/include/switch_am_config.h.in
+++ b/src/include/switch_am_config.h.in
@@ -1,5 +1,3 @@
-#ifndef SWITCH_AM_CONFIG_H
-#define SWITCH_AM_CONFIG_H
 /* src/include/switch_am_config.h.in.  Generated from configure.in by autoheader.  */
 
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
@@ -116,4 +114,3 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
-#endif