| 1 |
From 938c28680e5cb4fe93d3cf042bb05ebb8cb08ff4 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Mark A. Grondona <[email protected]> |
| 3 |
Date: Tue, 8 Jun 2010 16:05:01 -0700 |
| 4 |
Subject: [PATCH 2/5] Build libltdl |
| 5 |
|
| 6 |
Add relevant macros to configure.ac to build libltdl and configure it. |
| 7 |
Add libltdl to Makefile.am SUBDIRS. |
| 8 |
--- |
| 9 |
Makefile.am | 4 +++- |
| 10 |
configure.ac | 11 +++++++++++ |
| 11 |
2 files changed, 14 insertions(+), 1 deletions(-) |
| 12 |
|
| 13 |
diff --git a/Makefile.am b/Makefile.am |
| 14 |
index aff1617..70874c5 100644 |
| 15 |
--- a/Makefile.am |
| 16 |
+++ b/Makefile.am |
| 17 |
@@ -4,7 +4,9 @@ else |
| 18 |
DOC_DIR = |
| 19 |
endif |
| 20 |
|
| 21 |
-SUBDIRS = pub src contrib inputs $(DOC_DIR) |
| 22 |
+ACLOCAL_AMFLAGS = "-I m4" |
| 23 |
+ |
| 24 |
+SUBDIRS = pub libltdl src contrib inputs $(DOC_DIR) |
| 25 |
|
| 26 |
EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE |
| 27 |
|
| 28 |
diff --git a/configure.ac b/configure.ac |
| 29 |
index 3a86fb3..83b3ceb 100644 |
| 30 |
--- a/configure.ac |
| 31 |
+++ b/configure.ac |
| 32 |
@@ -15,9 +15,20 @@ dnl The version in the next line is the only one to set |
| 33 |
dnl |
| 34 |
|
| 35 |
AM_INIT_AUTOMAKE(cfengine, 2.2.10) dnl remember to set version |
| 36 |
+AM_MAINTAINER_MODE |
| 37 |
|
| 38 |
AM_CONFIG_HEADER(src/conf.h) |
| 39 |
|
| 40 |
+AC_CONFIG_MACRO_DIR([libltdl/m4]) |
| 41 |
+LT_INIT |
| 42 |
+LT_CONFIG_LTDL_DIR([libltdl]) |
| 43 |
+LTDL_INIT |
| 44 |
+AC_LIBTOOL_DLOPEN |
| 45 |
+AC_LIBLTDL_CONVENIENCE |
| 46 |
+ |
| 47 |
+AC_SUBST(LTDLINCL) |
| 48 |
+AC_SUBST(LIBLTDL) |
| 49 |
+ |
| 50 |
# |
| 51 |
# Add to the default list of places in LDFLAGS to compensate for |
| 52 |
# ... the configure default value of LIBS on some systems |
| 53 |
-- |
| 54 |
1.6.5.2 |
| 55 |
|