From: Nick Bowler <nbowler@draconx.ca>
Date: Sat, 12 May 2012 01:14:03 +0000 (-0400)
Subject: build: Punt BUNDLED_LIBLDTL conditional.
X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/commitdiff_plain/34e8cf65d5a4be354539da51e955e7988e50b303

build: Punt BUNDLED_LIBLDTL conditional.

Now that fix-ltdl removes the unconditional builds of the bundled
libltdl, instead relying on normal prerequisites, there is no need for
this Automake conditional.
---

diff --git a/Makefile.am b/Makefile.am
index 7023885..fda4993 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,6 +111,4 @@ STAMP_RECOVER = \
 .gobstamp.h: ; $(STAMP_RECOVER)
 
 include $(top_srcdir)/lib/gnulib.mk
-if BUNDLED_LIBLTDL
 include $(top_srcdir)/libltdl/ltdl.mk
-endif
diff --git a/common b/common
index 90f9f76..ff3807b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 90f9f764fa1d891ca8922f2fd0177ae44b1ed790
+Subproject commit ff3807b3c1ad23f6a8811241665a00a0c9e957f4
diff --git a/configure.ac b/configure.ac
index 48ccbb2..43dc62a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,6 @@ LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])
 LTDL_INIT([nonrecursive])
 
-AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
-
 gl_INIT
 
 m4_include([lib/gnulib.mk])