From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Feb 2011 17:16:24 +0000 (+0000)
Subject: libsdl-mixer: fix autoreconf
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=0b255377e83306c8f210906a820e8bc09612406f;p=openwrt%2Fsvn-archive%2Fpackages.git

libsdl-mixer: fix autoreconf

SVN-Revision: 25342
---

diff --git a/libs/libsdl_mixer/Makefile b/libs/libsdl_mixer/Makefile
index 0b6bcd9f9..379727d37 100644
--- a/libs/libsdl_mixer/Makefile
+++ b/libs/libsdl_mixer/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://www.libsdl.org/projects/SDL_mixer/release/
 PKG_MD5SUM:=65ada3d997fe85109191a5fb083f248c
 
 PKG_FIXUP:=libtool
+PKG_MACRO_PATHS:=acinclude
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/libsdl_mixer/patches/001-automake-compat.patch b/libs/libsdl_mixer/patches/001-automake-compat.patch
new file mode 100644
index 000000000..8e879c3c4
--- /dev/null
+++ b/libs/libsdl_mixer/patches/001-automake-compat.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(README)
+-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
++AC_CONFIG_AUX_DIR([build-scripts])
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
diff --git a/libs/libsdl_mixer/patches/001-fix-linking.patch b/libs/libsdl_mixer/patches/001-fix-linking.patch
deleted file mode 100644
index a7b1fb1f0..000000000
--- a/libs/libsdl_mixer/patches/001-fix-linking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 76fdd3c..3ab4939 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -75,10 +75,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
- 	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- install: all install-hdrs install-lib #install-bin
- install-hdrs:
diff --git a/libs/libsdl_mixer/patches/002-fix-linking.patch b/libs/libsdl_mixer/patches/002-fix-linking.patch
new file mode 100644
index 000000000..a7b1fb1f0
--- /dev/null
+++ b/libs/libsdl_mixer/patches/002-fix-linking.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.in b/Makefile.in
+index 76fdd3c..3ab4939 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,10 +75,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ install: all install-hdrs install-lib #install-bin
+ install-hdrs: