Permalink
Browse files

Add libltdl

  • Loading branch information...
1 parent a89df42 commit fa2704f0ac00f4d7c8b128c9abbb02beab02c9e3 @jedisct1 jedisct1 committed Jul 18, 2012
Showing with 17 additions and 15 deletions.
  1. +3 −0 .gitignore
  2. +4 −4 autogen.sh
  3. +10 −11 configure.ac
View
@@ -22,9 +22,12 @@ 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
View
@@ -1,7 +1,7 @@
#! /bin/sh
if [ -x "`which autoreconf 2>/dev/null`" ] ; then
- exec autoreconf -ivf
+ exec autoreconf -ivf
fi
if glibtoolize --version > /dev/null 2>&1; then
@@ -13,10 +13,10 @@ fi
src/libevent/autogen.sh &
cpid=$!
-$LIBTOOLIZE && \
-aclocal -I m4 && \
+$LIBTOOLIZE --ltdl && \
+aclocal && \
autoheader && \
automake --add-missing --force-missing --include-deps && \
-autoconf -I m4
+autoconf
wait $cpid
View
@@ -1,6 +1,7 @@
-AC_PREREQ(2.61)
-AC_INIT(dnscrypt-proxy, 1.1-dev, https://github.com/opendns/dnscrypt-proxy/issues)
+AC_PREREQ([2.61])
+AC_INIT([dnscrypt-proxy],[1.1-dev],[https://github.com/opendns/dnscrypt-proxy/issues])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([libltdl/config])
AC_CONFIG_SRCDIR([src/dnscrypt-proxy/app.c])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_SUBDIRS([src/libevent])
@@ -80,17 +81,13 @@ AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wall], [CWFLAGS="$CWFLAGS -Wall"])
AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wextra], [CWFLAGS="$CWFLAGS -Wextra"])
AC_MSG_CHECKING(for clang)
-AC_TRY_COMPILE(,
- [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
#ifndef __clang__
be sad
#endif
- ],
- [AC_MSG_RESULT(yes)
+ ]])],[AC_MSG_RESULT(yes)
AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wno-unknown-warning-option],
- [CWFLAGS="$CWFLAGS -Wno-unknown-warning-option"])],
- [AC_MSG_RESULT(no)],
-)
+ [CWFLAGS="$CWFLAGS -Wno-unknown-warning-option"])],[AC_MSG_RESULT(no)])
AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wbad-function-cast], [CWFLAGS="$CWFLAGS -Wbad-function-cast"])
AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wcast-align], [CWFLAGS="$CWFLAGS -Wcast-align"])
@@ -115,7 +112,7 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
-AC_PROG_LIBTOOL
+LT_INIT
AC_SUBST(LIBTOOL_DEPS)
AC_ARG_VAR([RONN], [path to the ronn text processor])
@@ -345,7 +342,9 @@ AC_SUBST([PLUGINS])
dnl Libtool.
-LT_INIT([disable-shared])
+LT_INIT([dlopen])
+LT_CONFIG_LTDL_DIR([libltdl])
+LTDL_INIT
dnl Subconfig.

0 comments on commit fa2704f

Please sign in to comment.