From: mazilo <mazilo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 5 Nov 2011 01:37:35 +0000 (+0000)
Subject: bumped to the latest FS git (54b4b088d911d4c80f224ed561d8e278229a75ff)
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=8cfd00d0d29e4a46c8f9ba1568a05b0856dd2d37;hp=07a3a1c232ede78e86f6ff788df90ecd72dbdec1;p=packages.git

bumped to the latest FS git (54b4b088d911d4c80f224ed561d8e278229a75ff)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28759 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 5cc4aa601..7e7732ad1 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -17,7 +17,7 @@ PKG_RELEASE:=1
 #
 # The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org
 #
-PKG_REV:=84d029e4b92c5161aca2c6317f3ff1087c60d52a
+PKG_REV:=54b4b088d911d4c80f224ed561d8e278229a75ff
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
diff --git a/net/freeswitch/patches/002-Makefile.am.patch b/net/freeswitch/patches/002-Makefile.am.patch
index 6948da4e9..0e84f1b6f 100644
--- a/net/freeswitch/patches/002-Makefile.am.patch
+++ b/net/freeswitch/patches/002-Makefile.am.patch
@@ -7,7 +7,7 @@
 +
  EXTRA_DIST =
  SUBDIRS = . src
- AUTOMAKE_OPTS = foreign
+ AUTOMAKE_OPTIONS = foreign
 @@ -61,7 +65,7 @@ cd-moh-install: uhd-moh-install sounds-m
  # (1) if the variable is set in `config.status', edit `config.status'
  #     (which will cause the Makefiles to be regenerated when you run `make');
@@ -17,24 +17,6 @@
  clean-recusive: clean_core
  install-recursive: install-libLTLIBRARIES install-binPROGRAMS
  $(RECURSIVE_TARGETS):
-@@ -299,7 +303,7 @@ endif
- ##
- fs_encode_SOURCES = src/fs_encode.c
- fs_encode_CFLAGS = $(AM_CFLAGS)
--fs_encode_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
-+fs_encode_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
- fs_encode_LDADD = libfreeswitch.la -lcrypt -lrt
- 
- ##
-@@ -307,7 +311,7 @@ fs_encode_LDADD = libfreeswitch.la -lcry
- ##
- tone2wav_SOURCES = src/tone2wav.c
- tone2wav_CFLAGS  = $(AM_CFLAGS)
--tone2wav_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
-+tone2wav_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
- tone2wav_LDADD   = libfreeswitch.la -lcrypt -lrt
- 
- ##
 @@ -586,10 +590,13 @@ speex-reconf:
  
  tiff-reconf: