[GNUnet-SVN] r8104 - GNUnet

[gnunet]

Author: holindho
Date: 2009-01-13 11:08:26 -0700 (Tue, 13 Jan 2009)
New Revision: 8104

Modified:
   GNUnet/Makefile.am
   GNUnet/configure.ac
Log:
hopefully fix the antiquated libtool usage. If we really, REALLY don't want to
distribute a local libltdl version, the LTDL_INIT macro must be replaced by
a check of our own that checks for the ltdl libs and includes and produces
the LIBLTDL and LTDLINCL vars.


Modified: GNUnet/Makefile.am
===================================================================
--- GNUnet/Makefile.am  2009-01-13 15:44:06 UTC (rev 8103)
+++ GNUnet/Makefile.am  2009-01-13 18:08:26 UTC (rev 8104)
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/src/include
-SUBDIRS  = m4 po src doc contrib
+SUBDIRS  = m4 po libltdl src doc contrib
 
 EXTRA_DIST = \
  ABOUT-NLS \

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2009-01-13 15:44:06 UTC (rev 8103)
+++ GNUnet/configure.ac 2009-01-13 18:08:26 UTC (rev 8104)
@@ -37,12 +37,9 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_LIBTOOL_DLOPEN
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_LIBLTDL_INSTALLABLE
-AC_PROG_LIBTOOL
-AC_LIB_LTDL
+LT_CONFIG_LTDL_DIR([libltdl])
+LT_INIT([disable-static dlopen win32-dll])
+LTDL_INIT
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
 AC_SUBST(MKDIR_P)