From 155d76f4fbc48ede292e067e52e8b984de6fbd54 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Sat, 5 Mar 2011 11:52:55 +0100
Subject: [PATCH] Setup libltdl in ltdl/, so we can use it in the dve2
 interface.

Don't keep it under version control since it is installed by
autoreconf.

* configure.ac: Call LT_CONFIG_LTDL_DIR and LTDL_INIT.
* README: Mention ltdl/.
* Makefile.am: Recurse into ldtl.
* iface/dve2/Makefile.am: Link with it.
---
 .gitignore             |  1 +
 ChangeLog              | 12 ++++++++++++
 Makefile.am            |  4 +++-
 README                 |  1 +
 configure.ac           |  2 ++
 iface/dve2/Makefile.am |  6 ++++--
 m4/.gitignore          |  2 ++
 7 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e8eebcd8..090ff160f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ cachegrind.*
 *.gcda
 *.gcno
 *.info
+ltdl
diff --git a/ChangeLog b/ChangeLog
index b2dd6e453..69417db05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-05  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Setup libltdl in ltdl/, so we can use it in the dve2 interface.
+
+	Don't keep it under version control since it is installed by
+	autoreconf.
+
+	* configure.ac: Call LT_CONFIG_LTDL_DIR and LTDL_INIT.
+	* README: Mention ltdl/.
+	* Makefile.am: Recurse into ldtl.
+	* iface/dve2/Makefile.am: Link with it.
+
 2011-03-05  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Setup build system for a new dve2 interface.
diff --git a/Makefile.am b/Makefile.am
index 0a330457d..27b779185 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+## Copyright (C) 2011 Laboratoire de Recherche et Développement
+## de l'Epita (LRDE).
 ## Copyright (C) 2003, 2005  Laboratoire d'Informatique de Paris 6 (LIP6),
 ## département Systèmes Répartis Coopératifs (SRC), Université Pierre
 ## et Marie Curie.
@@ -33,7 +35,7 @@ if NEVER
   NEVER_BENCH = bench
 endif
 
-SUBDIRS = $(MAYBE_BUDDY) $(MAYBE_LBTT) $(NEVER_BENCH) doc src wrap iface
+SUBDIRS = $(MAYBE_BUDDY) $(MAYBE_LBTT) $(NEVER_BENCH) doc src wrap ltdl iface
 
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = HACKING
diff --git a/README b/README
index 8a7eb2f41..dd8a3e5f2 100644
--- a/README
+++ b/README
@@ -156,6 +156,7 @@ Third party software
 
 buddy/            A patched version of BuDDy 2.3 (a BDD library).
 lbtt/             lbtt 1.2.1 (an LTL to Büchi automata test bench).
+ltdl/             Libtool's portable dlopen() wrapper library.
 iface/            Interfaces to other libraries.
    nips/          NIPS interface (to use Promela models).
       nips_vm/    NIPS VM 1.2.7 (New Implementation of Promela Semantics
diff --git a/configure.ac b/configure.ac
index 7d4403158..3dccec72d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,9 @@ AX_CHECK_BOOST([1.34], [103400])
 
 AC_CHECK_FUNCS([srand48 drand48])
 
+LT_CONFIG_LTDL_DIR([ltdl])
 LT_INIT([win32-dll])
+LTDL_INIT([subproject convenience])
 
 spot_INTEL
 if test x$enable_warnings = xyes; then
diff --git a/iface/dve2/Makefile.am b/iface/dve2/Makefile.am
index 9b74ddab9..fe040020b 100644
--- a/iface/dve2/Makefile.am
+++ b/iface/dve2/Makefile.am
@@ -18,7 +18,7 @@
 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-AM_CPPFLAGS = -I$(top_srcdir)/src $(BUDDY_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 dve2dir = $(pkgincludedir)/iface/dve2
@@ -26,5 +26,7 @@ dve2dir = $(pkgincludedir)/iface/dve2
 dve2_HEADERS = dve2.hh
 
 lib_LTLIBRARIES = libspotdve2.la
-libspotdve2_la_LIBADD = $(top_builddir)/src/libspot.la
+libspotdve2_la_LIBADD = \
+  $(top_builddir)/src/libspot.la \
+  $(top_builddir)/ltdl/libltdlc.la
 libspotdve2_la_SOURCES = dve2.cc
diff --git a/m4/.gitignore b/m4/.gitignore
index 38066ddf7..abd6c8463 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -3,3 +3,5 @@ ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
+argz.m4
+ltdl.m4
\ No newline at end of file