From 8dc6926664307ee421636b696d3eda3d1680d41f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 19 Jan 2011 14:45:58 +0100
Subject: [PATCH] configure: fixes for building with an installed static
 libxbps.

---
 configure | 31 +++++++++++++++++--------------
 prog.mk   |  1 -
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index 7548a08f..0b6a2014 100755
--- a/configure
+++ b/configure
@@ -368,6 +368,22 @@ else
 	echo yes
 fi
 
+#
+# Check if external libfetch should be used.
+#
+if [ -z "$EXTERNAL_LIBFETCH" ]; then
+	EXTERNAL_LIBFETCH_VALUE="no (using internal copy)"
+	echo "CPPFLAGS +=	-I\$(TOPDIR)/lib/fetch" >>$CONFIG_MK
+	echo "PROG_LDFLAGS +=	-lxbps" >>$CONFIG_MK
+	echo "STATIC_LIBS =	-lxbps" >>$CONFIG_MK
+else
+	EXTERNAL_LIBFETCH_VALUE=yes
+	echo "USE_EXTERNAL_LIBFETCH =	1" >>$CONFIG_MK
+	echo "LDFLAGS +=	-lfetch" >>$CONFIG_MK
+	echo "PROG_LDFLAGS +=	-lxbps -lfetch" >>$CONFIG_MK
+	echo "STATIC_LIBS =	-lxbps -lfetch" >>$CONFIG_MK
+fi
+
 #
 # zlib with pkg-config support is required.
 #
@@ -379,7 +395,7 @@ else
 	echo "found version $($PKGCONFIG_BIN --modversion zlib)."
 	echo "CFLAGS +=	$($PKGCONFIG_BIN --cflags zlib)" >>$CONFIG_MK
 	echo "LDFLAGS +=	$($PKGCONFIG_BIN --libs zlib)" >>$CONFIG_MK
-	echo "STATIC_LIBS =	$($PKGCONFIG_BIN --libs --static zlib)" \
+	echo "STATIC_LIBS +=	$($PKGCONFIG_BIN --libs --static zlib)" \
 		>>$CONFIG_MK
 fi
 
@@ -423,19 +439,6 @@ else
 		>>$CONFIG_MK
 fi
 
-#
-# Check if external libfetch should be used.
-#
-if [ -z "$EXTERNAL_LIBFETCH" ]; then
-	EXTERNAL_LIBFETCH_VALUE="no (using internal copy)"
-	echo "CPPFLAGS +=	-I\$(TOPDIR)/lib/fetch" >>$CONFIG_MK
-else
-	EXTERNAL_LIBFETCH_VALUE=yes
-	echo "USE_EXTERNAL_LIBFETCH =	1" >>$CONFIG_MK
-	echo "LDFLAGS +=	-lfetch" >>$CONFIG_MK
-	echo "STATIC_LIBS +=	-lfetch" >>$CONFIG_MK
-fi
-
 #
 # OpenSSL libssl with pkg-config support is required.
 #
diff --git a/prog.mk b/prog.mk
index 3ebf12a6..349e5acf 100644
--- a/prog.mk
+++ b/prog.mk
@@ -2,7 +2,6 @@
 
 OBJS	?= main.o
 CFLAGS  += $(PROG_CFLAGS)
-LDFLAGS += -lxbps
 
 .PHONY: all
 all: $(BIN) $(BIN).static