]> git.draconx.ca Git - upkg.git/commitdiff
build: Punt BUNDLED_LIBLDTL conditional.
authorNick Bowler <nbowler@draconx.ca>
Sat, 12 May 2012 01:14:03 +0000 (21:14 -0400)
committerNick Bowler <nbowler@draconx.ca>
Sat, 12 May 2012 01:14:03 +0000 (21:14 -0400)
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.

Makefile.am
common
configure.ac

index 70238856f3ea0b6acf4299265aa32efee89e9f2d..fda499306f5a1d7c4b7fddd0a365e98148e8f2e8 100644 (file)
@@ -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 90f9f764fa1d891ca8922f2fd0177ae44b1ed790..ff3807b3c1ad23f6a8811241665a00a0c9e957f4 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 90f9f764fa1d891ca8922f2fd0177ae44b1ed790
+Subproject commit ff3807b3c1ad23f6a8811241665a00a0c9e957f4
index 48ccbb228db67b2f970c691bf23a0693661c26ac..43dc62a905a473bef5bc71867eb6e488157c2b93 100644 (file)
@@ -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])