From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 17 Feb 2010 17:22:16 +0000 (+0000)
Subject: [packages] weechat: Use pkg-config instead of gnutls-config
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=3f4f13d7161a6bb102778a59de454f95d3e51762;p=packages.git

[packages] weechat: Use pkg-config instead of gnutls-config

We don't ship gnutls-config and configure might end up using the hosts
gnutls-config.


git-svn-id: svn://svn.openwrt.org/openwrt/packages@19690 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index cf41d0e65..338997aa0 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -79,11 +79,11 @@ CONFIGURE_ARGS+= \
 	--disable-python \
 	--disable-ruby \
 	LUACONFIG="" \
+	ac_cv_path_LIBGNUTLS_CONFIG="pkg-config gnutls" \
 
-CONFIGURE_VARS+= \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
-
-TARGET_LDFLAGS += -lgnutls
+TARGET_LDFLAGS += \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+	-Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 ifneq ($(CONFIG_PACKAGE_weechat-mod-lua),)
   CONFIGURE_ARGS+= \
@@ -108,7 +108,7 @@ define Build/Compile
 		all install
 endef
 
-define Package/weechat/install	
+define Package/weechat/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib/weechat/plugins
@@ -116,7 +116,7 @@ endef
 
 define BuildPlugin
 
-  define Package/weechat-mod-$(1)/install	
+  define Package/weechat-mod-$(1)/install
 	$(INSTALL_DIR) $$(1)/usr/lib/weechat/plugins
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/$(1).so* $$(1)/usr/lib/weechat/plugins/
   endef
diff --git a/net/weechat/patches/010-use-pkg-config.patch b/net/weechat/patches/010-use-pkg-config.patch
new file mode 100644
index 000000000..2fb3f1606
--- /dev/null
+++ b/net/weechat/patches/010-use-pkg-config.patch
@@ -0,0 +1,15 @@
+diff --git a/configure b/configure
+index f388ffe..c9ec352 100755
+--- a/configure
++++ b/configure
+@@ -31400,8 +31400,8 @@ echo "$as_me: WARNING:
+ 
+ 
+     if test "x$found_gnutls" = "xyes" ; then
+-        GNUTLS_CFLAGS=`libgnutls-config --cflags`
+-        GNUTLS_LFLAGS=`libgnutls-config --libs`
++        GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
++        GNUTLS_LFLAGS=`pkg-config gnutls --libs`
+ 
+ 
+         cat >>confdefs.h <<\_ACEOF