| 1 |
From a94e998bda68dc68b16d7b2b482f295bd9c5ec01 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Mark A. Grondona <[email protected]> |
| 3 |
Date: Tue, 8 Jun 2010 16:09:39 -0700 |
| 4 |
Subject: [PATCH 3/5] Build libcfengine with libltdl |
| 5 |
|
| 6 |
--- |
| 7 |
src/Makefile.am | 8 ++++---- |
| 8 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 9 |
|
| 10 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 11 |
index db8bdb3..97470ac 100644 |
| 12 |
--- a/src/Makefile.am |
| 13 |
+++ b/src/Makefile.am |
| 14 |
@@ -1,9 +1,9 @@ |
| 15 |
-AM_CFLAGS = $(GCC_CFLAG) @CFLAGS@ |
| 16 |
+AM_CFLAGS = $(GCC_CFLAG) -DPKGLIBDIR=\"$(pkglibdir)\" @CFLAGS@ |
| 17 |
AM_YFLAGS = -d |
| 18 |
LEXLIB = @LEXLIB@ |
| 19 |
-LDADD = libcfengine.la $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB) |
| 20 |
+LDADD = libcfengine.la $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB) $(LIBLTDL) |
| 21 |
INCLUDES = $(BERKELEY_DB_CFLAGS) $(OPENSSL_LIB_CPPFLAGS) |
| 22 |
-AM_LDFLAGS = $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@ |
| 23 |
+AM_LDFLAGS = -Wl,--export-dynamic $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@ |
| 24 |
|
| 25 |
sbin_PROGRAMS = cfagent cfservd cfrun cfkey cfenvd cfenvgraph cfexecd cfshow cfetool cfetoolgraph |
| 26 |
|
| 27 |
@@ -15,7 +15,7 @@ lib_LTLIBRARIES = libcfengine.la |
| 28 |
|
| 29 |
libcfengine_la_LDFLAGS = -version-info 1:0:0 -no-undefined |
| 30 |
libcfengine_la_LIBADD = $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB) |
| 31 |
-libcfengine_la_CFLAGS = $(AM_CFLAGS) |
| 32 |
+libcfengine_la_CFLAGS = $(INCLTDL) $(AM_CFLAGS) |
| 33 |
|
| 34 |
# Separate out a library |
| 35 |
|
| 36 |
-- |
| 37 |
1.6.5.2 |
| 38 |
|