From d882a00d3476e19e5e7755bcaaa71e813fb8fb6c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 19 Aug 2014 21:34:11 +0200
Subject: fix package build, after using autoreconf

---
 package/alsa-lib/Makefile                   |  2 +-
 package/alsa-lib/patches/patch-configure    | 17 -----------------
 package/alsa-lib/patches/patch-configure_ac | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)
 delete mode 100644 package/alsa-lib/patches/patch-configure
 create mode 100644 package/alsa-lib/patches/patch-configure_ac

(limited to 'package')

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 8e101e0d9..6461e02f4 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.28
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		c9e21b88a2b3e6e12ea7ba0f3b271fc3
 PKG_DESCR:=		sound library
 PKG_SECTION:=		libs/audio
diff --git a/package/alsa-lib/patches/patch-configure b/package/alsa-lib/patches/patch-configure
deleted file mode 100644
index 35b1c2569..000000000
--- a/package/alsa-lib/patches/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- alsa-lib-1.0.28.orig/configure	2014-06-17 14:34:47.000000000 +0200
-+++ alsa-lib-1.0.28/configure	2014-06-28 22:00:55.656322468 +0200
-@@ -11929,14 +11929,6 @@ $as_echo "major $SND_LIB_MAJOR minor $SN
- 
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- 
--if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
--cat <<EOF
--  Please, do not try to compile static and shared libraries together.
--  See INSTALL file for more details (do not use --enable-shared=yes with
--  --enable-static=yes).
--EOF
--  exit 1
--fi
- 
- 
- # Check whether --with-configdir was given.
diff --git a/package/alsa-lib/patches/patch-configure_ac b/package/alsa-lib/patches/patch-configure_ac
new file mode 100644
index 000000000..631869f5c
--- /dev/null
+++ b/package/alsa-lib/patches/patch-configure_ac
@@ -0,0 +1,19 @@
+--- alsa-lib-1.0.28.orig/configure.ac	2014-06-17 14:34:19.000000000 +0200
++++ alsa-lib-1.0.28/configure.ac	2014-08-19 21:19:11.000000000 +0200
+@@ -72,16 +72,6 @@ AC_SUBST(LIBTOOL_VERSION_INFO)
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ 
+-dnl Do not build static and shared libraries together
+-if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
+-cat <<EOF
+-  Please, do not try to compile static and shared libraries together.
+-  See INSTALL file for more details (do not use --enable-shared=yes with
+-  --enable-static=yes).
+-EOF
+-  exit 1
+-fi
+-
+ dnl ALSA configuration directory
+ AC_ARG_WITH(configdir,
+     AS_HELP_STRING([--with-configdir=dir],
-- 
cgit v1.2.3