[master] 82208b2 Also cfg-check for -ldl for linux

Poul-Henning Kamp phk at FreeBSD.org
Fri Dec 20 15:12:08 CET 2013


commit 82208b2482fa6dfce911f0e3c348e5b0f350b2fd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 20 14:11:50 2013 +0000

    Also cfg-check for -ldl for linux

diff --git a/Makefile.inc.phk b/Makefile.inc.phk
index 048430d..5c25d59 100644
--- a/Makefile.inc.phk
+++ b/Makefile.inc.phk
@@ -31,9 +31,9 @@ LIB_VARNISHTOOLS = -L $(TOPDIR)/lib/libvarnishtools -lvarnishtools
 LIB_VCC = -L $(TOPDIR)/lib/libvcc -lvcc
 LIB_VGZ = -L $(TOPDIR)/lib/libvgz -lvgz
 LIB_PCRE = -L /usr/local/lib -lpcre
-LIB_EXECINFO = ${EXECINFO}
+LIB_EXECINFO = ${CFG_EXECINFO}
 LIB_CURSES = -lcurses
-LIB_READLINE = ${LINEDISC}
+LIB_READLINE = ${CFG_LINEDISC}
 
 #######################################################################
 ifdef USE_THREADS
@@ -43,6 +43,7 @@ endif
 
 ifdef USE_DLOPEN
 PROG_LDFLAGS += -Wl,-E
+PROG_LIBS += ${CFG_LIBDL}
 endif
 
 #######################################################################
@@ -111,7 +112,7 @@ include _.depprog
 endif
 
 $(PROGNAME):	$(PROG_OBJ)
-	$(CC) $(PROG_LDFLAGS) -o $(PROGNAME) $^ $(LD_ADD)
+	$(CC) $(PROG_LDFLAGS) -o $(PROGNAME) $^ $(PROG_LIBS) $(LD_ADD)
 
 .PHONY: prog_install
 prog_install:	$(PROGNAME)
diff --git a/config.phk b/config.phk
index 3ce71ff..aa6856f 100644
--- a/config.phk
+++ b/config.phk
@@ -242,20 +242,27 @@ fi
 # Check for libedit
 
 if [ -f /usr/include/edit/readline/readline.h ] ; then
-	echo "LINEDISC=-ledit" >> _.cache
+	echo "CFG_LINEDISC=-ledit" >> _.cache
 elif [ -f /usr/include/editline/readline.h ] ; then
-	echo "LINEDISC=-ledit" >> _.cache
+	echo "CFG_LINEDISC=-ledit" >> _.cache
 elif [ -f /usr/include/readline/readline.h ] ; then
-	echo "LINEDISC=-lreadline" >> _.cache
+	echo "CFG_LINEDISC=-lreadline" >> _.cache
 else
-	echo "LINEDISC=" >> _.cache
+	echo "CFG_LINEDISC=" >> _.cache
 fi
 
 #######################################################################
-# Check for libexecinfo (FreeBSD::backtrace()
+# Check for libexecinfo for FreeBSD::backtrace()
 
 if [ -f /usr/lib/libexecinfo.so ] ; then
-	echo "EXECINFO=-lexecinfo" >> _.cache
+	echo "CFG_EXECINFO=-lexecinfo" >> _.cache
+fi
+
+#######################################################################
+# Check for libdl for Linux::dlopen()
+
+if [ `uname -s` = "Linux" ] ; then
+	echo "CFG_LIBDL=-ldl" >> _.cache
 fi
 
 #######################################################################



More information about the varnish-commit mailing list