fix some bulk build issues

1 files changed, 35 insertions, 26 deletions

diff --git a/package/icecast/patches/autotool.patch b/package/icecast/patches/autotool.patch
index 213ef0965..e8feb2e3a 100644
--- a/package/icecast/patches/autotool.patch
+++ b/package/icecast/patches/autotool.patch
@@ -1,6 +1,6 @@
 diff -Nur icecast-2.3.2.orig/aclocal.m4 icecast-2.3.2/aclocal.m4
 --- icecast-2.3.2.orig/aclocal.m4	2008-05-27 02:21:50.000000000 +0200
-+++ icecast-2.3.2/aclocal.m4	2010-02-18 21:27:36.308858757 +0100
++++ icecast-2.3.2/aclocal.m4	2011-05-16 17:41:51.277851096 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -7233,7 +7233,7 @@ diff -Nur icecast-2.3.2.orig/aclocal.m4 icecast-2.3.2/aclocal.m4
  m4_include([m4/theora.m4])
 diff -Nur icecast-2.3.2.orig/admin/Makefile.in icecast-2.3.2/admin/Makefile.in
 --- icecast-2.3.2.orig/admin/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/admin/Makefile.in	2010-02-18 21:27:41.556853485 +0100
++++ icecast-2.3.2/admin/Makefile.in	2011-05-16 17:41:51.296610263 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -7531,7 +7531,7 @@ diff -Nur icecast-2.3.2.orig/admin/Makefile.in icecast-2.3.2/admin/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/conf/Makefile.in icecast-2.3.2/conf/Makefile.in
 --- icecast-2.3.2.orig/conf/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/conf/Makefile.in	2010-02-18 21:27:41.872855443 +0100
++++ icecast-2.3.2/conf/Makefile.in	2011-05-16 17:41:51.356602233 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -7832,7 +7832,7 @@ diff -Nur icecast-2.3.2.orig/conf/Makefile.in icecast-2.3.2/conf/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/config.h.in icecast-2.3.2/config.h.in
 --- icecast-2.3.2.orig/config.h.in	2008-04-29 06:54:28.000000000 +0200
-+++ icecast-2.3.2/config.h.in	2010-02-18 21:27:40.476856140 +0100
++++ icecast-2.3.2/config.h.in	2011-05-16 17:41:51.416610152 +0200
 @@ -93,7 +93,7 @@
  /* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H
@@ -7865,7 +7865,7 @@ diff -Nur icecast-2.3.2.orig/config.h.in icecast-2.3.2/config.h.in
  
 diff -Nur icecast-2.3.2.orig/configure icecast-2.3.2/configure
 --- icecast-2.3.2.orig/configure	2008-05-27 02:21:57.000000000 +0200
-+++ icecast-2.3.2/configure	2010-02-18 21:27:38.596852163 +0100
++++ icecast-2.3.2/configure	2011-05-16 17:41:51.446599626 +0200
 @@ -1,62 +1,85 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -42577,7 +42577,7 @@ diff -Nur icecast-2.3.2.orig/configure icecast-2.3.2/configure
  
 diff -Nur icecast-2.3.2.orig/debian/Makefile.in icecast-2.3.2/debian/Makefile.in
 --- icecast-2.3.2.orig/debian/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/debian/Makefile.in	2010-02-18 21:27:41.980853846 +0100
++++ icecast-2.3.2/debian/Makefile.in	2011-05-16 17:41:51.496601840 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -42816,7 +42816,7 @@ diff -Nur icecast-2.3.2.orig/debian/Makefile.in icecast-2.3.2/debian/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/doc/Makefile.in icecast-2.3.2/doc/Makefile.in
 --- icecast-2.3.2.orig/doc/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/doc/Makefile.in	2010-02-18 21:27:42.072851881 +0100
++++ icecast-2.3.2/doc/Makefile.in	2011-05-16 17:41:51.536609889 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -43114,7 +43114,7 @@ diff -Nur icecast-2.3.2.orig/doc/Makefile.in icecast-2.3.2/doc/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/examples/Makefile.in icecast-2.3.2/examples/Makefile.in
 --- icecast-2.3.2.orig/examples/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/examples/Makefile.in	2010-02-18 21:27:42.160852195 +0100
++++ icecast-2.3.2/examples/Makefile.in	2011-05-16 17:41:51.576610251 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -43353,7 +43353,7 @@ diff -Nur icecast-2.3.2.orig/examples/Makefile.in icecast-2.3.2/examples/Makefil
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/ltmain.sh icecast-2.3.2/ltmain.sh
 --- icecast-2.3.2.orig/ltmain.sh	2007-08-29 14:28:46.000000000 +0200
-+++ icecast-2.3.2/ltmain.sh	2010-02-18 21:27:29.560857065 +0100
++++ icecast-2.3.2/ltmain.sh	2011-05-16 17:41:51.596605253 +0200
 @@ -1,52 +1,83 @@
 -# ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -57541,7 +57541,7 @@ diff -Nur icecast-2.3.2.orig/ltmain.sh icecast-2.3.2/ltmain.sh
 +
 diff -Nur icecast-2.3.2.orig/m4/libtool.m4 icecast-2.3.2/m4/libtool.m4
 --- icecast-2.3.2.orig/m4/libtool.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/libtool.m4	2010-02-18 21:27:29.616856377 +0100
++++ icecast-2.3.2/m4/libtool.m4	2011-05-16 17:41:51.666726639 +0200
 @@ -0,0 +1,7377 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
@@ -64922,7 +64922,7 @@ diff -Nur icecast-2.3.2.orig/m4/libtool.m4 icecast-2.3.2/m4/libtool.m4
 +])
 diff -Nur icecast-2.3.2.orig/m4/lt~obsolete.m4 icecast-2.3.2/m4/lt~obsolete.m4
 --- icecast-2.3.2.orig/m4/lt~obsolete.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/lt~obsolete.m4	2010-02-18 21:27:29.996853947 +0100
++++ icecast-2.3.2/m4/lt~obsolete.m4	2011-05-16 17:41:51.676600869 +0200
 @@ -0,0 +1,92 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
@@ -65018,7 +65018,7 @@ diff -Nur icecast-2.3.2.orig/m4/lt~obsolete.m4 icecast-2.3.2/m4/lt~obsolete.m4
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 diff -Nur icecast-2.3.2.orig/m4/ltoptions.m4 icecast-2.3.2/m4/ltoptions.m4
 --- icecast-2.3.2.orig/m4/ltoptions.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/ltoptions.m4	2010-02-18 21:27:29.720856211 +0100
++++ icecast-2.3.2/m4/ltoptions.m4	2011-05-16 17:41:51.736619821 +0200
 @@ -0,0 +1,368 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -65390,7 +65390,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltoptions.m4 icecast-2.3.2/m4/ltoptions.m4
 +		 [m4_define([_LTDL_TYPE], [convenience])])
 diff -Nur icecast-2.3.2.orig/m4/ltsugar.m4 icecast-2.3.2/m4/ltsugar.m4
 --- icecast-2.3.2.orig/m4/ltsugar.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/ltsugar.m4	2010-02-18 21:27:29.812854518 +0100
++++ icecast-2.3.2/m4/ltsugar.m4	2011-05-16 17:41:51.776607116 +0200
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
@@ -65517,7 +65517,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltsugar.m4 icecast-2.3.2/m4/ltsugar.m4
 +])
 diff -Nur icecast-2.3.2.orig/m4/ltversion.m4 icecast-2.3.2/m4/ltversion.m4
 --- icecast-2.3.2.orig/m4/ltversion.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/ltversion.m4	2010-02-18 21:27:29.900855680 +0100
++++ icecast-2.3.2/m4/ltversion.m4	2011-05-16 17:41:51.819110062 +0200
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -65544,7 +65544,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltversion.m4 icecast-2.3.2/m4/ltversion.m4
 +])
 diff -Nur icecast-2.3.2.orig/m4/xiph_curl.m4 icecast-2.3.2/m4/xiph_curl.m4
 --- icecast-2.3.2.orig/m4/xiph_curl.m4	2008-04-19 03:54:26.000000000 +0200
-+++ icecast-2.3.2/m4/xiph_curl.m4	2010-02-18 21:27:17.216857590 +0100
++++ icecast-2.3.2/m4/xiph_curl.m4	2011-05-16 17:41:51.856607453 +0200
 @@ -52,7 +52,7 @@
  AC_MSG_CHECKING(for libcurl)
  if test "$curl_ok" = "yes"
@@ -65556,7 +65556,7 @@ diff -Nur icecast-2.3.2.orig/m4/xiph_curl.m4 icecast-2.3.2/m4/xiph_curl.m4
  {
 diff -Nur icecast-2.3.2.orig/Makefile.in icecast-2.3.2/Makefile.in
 --- icecast-2.3.2.orig/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/Makefile.in	2010-02-18 21:27:43.484852142 +0100
++++ icecast-2.3.2/Makefile.in	2011-05-16 17:41:51.886674860 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66203,7 +66203,7 @@ diff -Nur icecast-2.3.2.orig/Makefile.in icecast-2.3.2/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/avl/Makefile.in icecast-2.3.2/src/avl/Makefile.in
 --- icecast-2.3.2.orig/src/avl/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/avl/Makefile.in	2010-02-18 21:27:42.448854807 +0100
++++ icecast-2.3.2/src/avl/Makefile.in	2011-05-16 17:41:51.947265588 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66558,7 +66558,7 @@ diff -Nur icecast-2.3.2.orig/src/avl/Makefile.in icecast-2.3.2/src/avl/Makefile.
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/httpp/Makefile.in icecast-2.3.2/src/httpp/Makefile.in
 --- icecast-2.3.2.orig/src/httpp/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/httpp/Makefile.in	2010-02-18 21:27:42.572851611 +0100
++++ icecast-2.3.2/src/httpp/Makefile.in	2011-05-16 17:41:51.986604412 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66913,7 +66913,7 @@ diff -Nur icecast-2.3.2.orig/src/httpp/Makefile.in icecast-2.3.2/src/httpp/Makef
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/log/Makefile.in icecast-2.3.2/src/log/Makefile.in
 --- icecast-2.3.2.orig/src/log/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/log/Makefile.in	2010-02-18 21:27:42.692851808 +0100
++++ icecast-2.3.2/src/log/Makefile.in	2011-05-16 17:41:52.029105504 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -67252,7 +67252,7 @@ diff -Nur icecast-2.3.2.orig/src/log/Makefile.in icecast-2.3.2/src/log/Makefile.
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in
 --- icecast-2.3.2.orig/src/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/Makefile.in	2010-02-18 21:27:42.308853999 +0100
++++ icecast-2.3.2/src/Makefile.in	2011-05-16 17:42:11.207851020 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -67438,6 +67438,15 @@ diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign
+@@ -268,7 +305,7 @@
+ icecast_LDADD = $(icecast_DEPENDENCIES) @XIPH_LIBS@ @KATE_LIBS@
+ AM_CFLAGS = @XIPH_CFLAGS@
+ AM_CPPFLAGS = @XIPH_CPPFLAGS@
+-AM_LDFLAGS = @XIPH_LDFLAGS@ @KATE_LIBS@
++AM_LDFLAGS = @KATE_LIBS@
+ all: all-recursive
+ 
+ .SUFFIXES:
 @@ -277,14 +314,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -67799,7 +67808,7 @@ diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/net/Makefile.in icecast-2.3.2/src/net/Makefile.in
 --- icecast-2.3.2.orig/src/net/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/net/Makefile.in	2010-02-18 21:27:42.832852040 +0100
++++ icecast-2.3.2/src/net/Makefile.in	2011-05-16 17:41:52.106679736 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68164,7 +68173,7 @@ diff -Nur icecast-2.3.2.orig/src/net/Makefile.in icecast-2.3.2/src/net/Makefile.
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/thread/Makefile.in icecast-2.3.2/src/thread/Makefile.in
 --- icecast-2.3.2.orig/src/thread/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/thread/Makefile.in	2010-02-18 21:27:42.960855785 +0100
++++ icecast-2.3.2/src/thread/Makefile.in	2011-05-16 17:41:52.136773431 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68519,7 +68528,7 @@ diff -Nur icecast-2.3.2.orig/src/thread/Makefile.in icecast-2.3.2/src/thread/Mak
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/timing/Makefile.in icecast-2.3.2/src/timing/Makefile.in
 --- icecast-2.3.2.orig/src/timing/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/timing/Makefile.in	2010-02-18 21:27:43.088853096 +0100
++++ icecast-2.3.2/src/timing/Makefile.in	2011-05-16 17:41:52.199109940 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68874,7 +68883,7 @@ diff -Nur icecast-2.3.2.orig/src/timing/Makefile.in icecast-2.3.2/src/timing/Mak
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/web/Makefile.in icecast-2.3.2/web/Makefile.in
 --- icecast-2.3.2.orig/web/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/web/Makefile.in	2010-02-18 21:27:43.184852192 +0100
++++ icecast-2.3.2/web/Makefile.in	2011-05-16 17:41:52.236766604 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -69172,7 +69181,7 @@ diff -Nur icecast-2.3.2.orig/web/Makefile.in icecast-2.3.2/web/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/win32/Makefile.in icecast-2.3.2/win32/Makefile.in
 --- icecast-2.3.2.orig/win32/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/win32/Makefile.in	2010-02-18 21:27:43.280852401 +0100
++++ icecast-2.3.2/win32/Makefile.in	2011-05-16 17:41:52.286732567 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -69617,7 +69626,7 @@ diff -Nur icecast-2.3.2.orig/win32/Makefile.in icecast-2.3.2/win32/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/win32/res/Makefile.in icecast-2.3.2/win32/res/Makefile.in
 --- icecast-2.3.2.orig/win32/res/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/win32/res/Makefile.in	2010-02-18 21:27:43.368851884 +0100
++++ icecast-2.3.2/win32/res/Makefile.in	2011-05-16 17:41:52.326869656 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.