From cb6268a1c621906f190d392f90d0ff343b21129f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 16 Jan 2012 12:34:32 +0100
Subject: [PATCH] flac: make build with libiconv optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/flac/build | 6 +++++-
 packages/audio/flac/meta  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/audio/flac/build b/packages/audio/flac/build
index f352e19865..1981020858 100755
--- a/packages/audio/flac/build
+++ b/packages/audio/flac/build
@@ -22,6 +22,10 @@
 
 . config/options $1
 
+if [ "$ICONV" = "libiconv" ]; then
+  CONFIG_FLAC="--with-libiconv-prefix=$SYSROOT_PREFIX/usr"
+fi
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -36,7 +40,7 @@ cd $PKG_BUILD
             --disable-xmms-plugin \
             --disable-oggtest \
             --with-ogg="$SYSROOT_PREFIX/usr" \
-            --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \
+            $CONFIG_FLAC \
             --with-gnu-ld
 
 make
diff --git a/packages/audio/flac/meta b/packages/audio/flac/meta
index 52acda5243..cb656b9216 100644
--- a/packages/audio/flac/meta
+++ b/packages/audio/flac/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://flac.sourceforge.net/"
 PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libiconv libogg"
-PKG_BUILD_DEPENDS="toolchain libiconv libogg"
+PKG_DEPENDS="$ICONV libogg"
+PKG_BUILD_DEPENDS="toolchain $ICONV libogg"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="flac: An Free Lossless Audio Codec"