icecast: fix build, properly use libvorbisidec

git-svn-id: svn://svn.openwrt.org/openwrt/packages@25306 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-02-02 02:36:56 +00:00
parent af02696936
commit 724821318f
3 changed files with 13 additions and 14 deletions

View File

@ -53,12 +53,12 @@ define Build/Configure
BUILD_DIR="$(PKG_BUILD_DIR)" \
V=99 \
compile
$(SED) 's,-lvorbisidec,$(TREMOR_DIR)/lib/libvorbisidec.a,g' $(PKG_BUILD_DIR)/configure
$(SED) 's,-lvorbis ,$(TREMOR_DIR)/lib/libvorbisidec.a -logg ,g' $(PKG_BUILD_DIR)/configure
$(call Build/Configure/Default, \
--enable-yp \
--with-curl="yes" \
--with-curl-config="$(STAGING_DIR)/usr/bin/curl-config" \
--with-ogg="$(TREMOR_DIR)" \
--with-ogg="$(STAGING_DIR)/usr" \
--with-speex="no" \
--with-theora="no" \
--with-vorbis="$(TREMOR_DIR)" \

View File

@ -1,12 +0,0 @@
--- icecast-2.3.2/configure 2008-09-29 20:11:37.000000000 +0200
+++ icecast-2.3.2.new/configure 2008-09-29 20:12:00.000000000 +0200
@@ -24198,8 +24198,7 @@
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+See \`config.log' for more details." >&2;} }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */

View File

@ -0,0 +1,11 @@
--- a/m4/xiph_curl.m4
+++ b/m4/xiph_curl.m4
@@ -52,7 +52,7 @@
AC_MSG_CHECKING(for libcurl)
if test "$curl_ok" = "yes"
then
- AC_RUN_IFELSE(AC_LANG_SOURCE([
+ AC_COMPILE_IFELSE(AC_LANG_SOURCE([
#include <curl/curl.h>
int main()
{