From 22348e18faba6b8a2c9881cf095eb157c0227a9e Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 17 Oct 2011 14:52:22 +0000
Subject: [PATCH] [packages] netatalk: remove some redundant CFLAG overrides,
 use autoreconf to ensure a consistent configure outcome, patch broken shipped
 iconv.m4

SVN-Revision: 28482
---
 net/netatalk/Makefile                          | 7 ++-----
 net/netatalk/patches/001-automake-compat.patch | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 net/netatalk/patches/001-automake-compat.patch

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index dca1814ad7..443ff61418 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=4a371025daf96adb73fa491efdbfef28
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -40,13 +41,9 @@ define Package/netatalk/conffiles
 /etc/netatalk/afpd.conf
 endef
 
-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+TARGET_CFLAGS += -std=c99 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 TARGET_LDFLAGS += $(LIBRPC)
 
-CONFIGURE_VARS += \
-	CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -DNO_DEBUG "
-
 CONFIGURE_ARGS += \
 	--disable-afs \
 	--enable-hfs \
diff --git a/net/netatalk/patches/001-automake-compat.patch b/net/netatalk/patches/001-automake-compat.patch
new file mode 100644
index 0000000000..e56b08650e
--- /dev/null
+++ b/net/netatalk/patches/001-automake-compat.patch
@@ -0,0 +1,9 @@
+--- a/macros/iconv.m4
++++ b/macros/iconv.m4
+@@ -114,6 +114,5 @@ int main() {
+ 
+         CFLAGS="$savedcflags"
+         LDFLAGS="$savedldflags"
+-	CPPFLAGS="$saved_CPPFLAGS"
+ 	
+ ])
-- 
2.30.2