From 9131967397ae48b858ab64e72c19497cbd830468 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 25 Apr 2013 22:51:19 -0700
Subject: [PATCH] We don't need libltdl

---
 .gitignore         | 3 +--
 Makefile.am        | 1 -
 autogen.sh         | 2 +-
 configure.ac       | 3 ---
 dist-build/msys.sh | 2 +-
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 564703c6..bbb3f16e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,12 +25,10 @@ config.*
 configure
 depcomp
 install-sh
-libltdl
 libtool
 ltmain.sh
 m4/argz.m4
 m4/libtool.m4
-m4/ltdl.m4
 m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
@@ -87,5 +85,6 @@ test/default/stream
 test/default/stream2
 test/default/stream3
 test/default/stream4
+test-driver
 testing
 
diff --git a/Makefile.am b/Makefile.am
index e6c95ace..7a046a9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,5 @@ EXTRA_DIST = \
 	THANKS
 
 SUBDIRS = \
-	libltdl \
 	src \
 	test
diff --git a/autogen.sh b/autogen.sh
index 2d2ed7e0..3361b682 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ else
   LIBTOOLIZE='libtoolize'
 fi
 
-$LIBTOOLIZE --ltdl && \
+$LIBTOOLIZE && \
 aclocal && \
 automake --add-missing --force-missing --include-deps && \
 autoconf
diff --git a/configure.ac b/configure.ac
index 6f77f3d1..2e57e442 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 AC_PREREQ([2.61])
 AC_INIT([libsodium],[0.4.1],[https://github.com/jedisct1/libsodium])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([libltdl/config])
 AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar])
@@ -283,8 +282,6 @@ AC_SUBST([LIBTOOL_EXTRA_FLAGS])
 dnl Libtool.
 
 LT_INIT([dlopen])
-LT_CONFIG_LTDL_DIR([libltdl])
-LTDL_INIT
 AC_LIBTOOL_WIN32_DLL
 gl_LD_OUTPUT_DEF
 
diff --git a/dist-build/msys.sh b/dist-build/msys.sh
index 2c4ef1ec..22ca8cb6 100755
--- a/dist-build/msys.sh
+++ b/dist-build/msys.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
 export CFLAGS="-O3 -fomit-frame-pointer -march=pentium2 -mtune=nocona"
-./configure --with-included-ltdl && make && make check && make install
+./configure && make && make check && make install