commit 90896f810a297b49a26efb3f8c72e51d34418d35
parent cf274c238b06bec0fcdb51c62271221e9c2ac277
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 11 Feb 2009 07:01:33 +0000
trying to modernize configure script
Diffstat:
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -16,7 +16,8 @@ dist-hook:
rm -f $(distdir)/src/plugins/printable/peno.c
rm -f $(distdir)/src/plugins/printable/pept.c
-ACLOCAL_AMFLAGS = -I m4
-
pkgconfigdatadir = $(libdir)/pkgconfig
pkgconfigdata_DATA = libextractor.pc
+
+
+ACLOCAL_AMFLAGS = -I m4 -I libltdl/m4
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([libextractor], [0.5.21], [bug-libextractor@gnu.org])
+AC_CONFIG_AUX_DIR([libltdl/config])
AM_INIT_AUTOMAKE([libextractor], [0.5.21])
AC_CONFIG_HEADERS([config.h])
AH_TOP([#define _GNU_SOURCE 1])
@@ -23,6 +24,7 @@ AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+LT_CONFIG_LTDL_DIR([libltdl])
AC_LIBTOOL_DLOPEN
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
@@ -30,6 +32,8 @@ AC_LIBLTDL_INSTALLABLE
AC_PROG_LIBTOOL
AC_LIB_LTDL
AC_CANONICAL_HOST
+LT_INIT
+LTDL_INIT
AC_SUBST(LTDLINCL)
AC_SUBST(LIBLTDL)
AC_SUBST(MKDIR_P)