From eb02d30791cbdab309ba06cfdc9536192395a3b1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 19 Jul 2012 16:30:53 +0200
Subject: [PATCH] configure: explicitly link dynamic executables to the shared
 library.

---
 configure  | 2 --
 mk/prog.mk | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index c853a249..8208ce14 100755
--- a/configure
+++ b/configure
@@ -423,12 +423,10 @@ if $XCC -lfetch _$func.c -o _$func 2>/dev/null; then
 	LIBFETCH=yes
 	echo "USE_EXTERNAL_LIBFETCH =	1" >>$CONFIG_MK
 	echo "LDFLAGS +=	-lfetch" >>$CONFIG_MK
-	echo "PROG_LDFLAGS +=	-lxbps -lfetch" >>$CONFIG_MK
 	echo "STATIC_LIBS =	\$(TOPDIR)/lib/libxbps.a -lfetch" >>$CONFIG_MK
 else
 	LIBFETCH=no
 	echo "CPPFLAGS +=	-I\$(TOPDIR)/lib/fetch" >>$CONFIG_MK
-	echo "PROG_LDFLAGS +=	\$(TOPDIR)/lib/libxbps.a" >>$CONFIG_MK
 	echo "STATIC_LIBS =	\$(TOPDIR)/lib/libxbps.a" >>$CONFIG_MK
 fi
 echo "$LIBFETCH."
diff --git a/mk/prog.mk b/mk/prog.mk
index d9bca2cd..88701e24 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -50,5 +50,5 @@ $(BIN).static: $(OBJS)
 $(BIN): $(OBJS)
 	@printf " [CCLD]\t\t$@\n"
 	${SILENT}$(CC) $^ $(CPPFLAGS) -L$(TOPDIR)/lib $(CFLAGS) \
-		$(PROG_CFLAGS) $(LDFLAGS) $(PROG_LDFLAGS) -o $@
+		$(PROG_CFLAGS) $(LDFLAGS) -lxbps -o $@