From 379ba9a761d1fa259e673ed9552fc2e73b5b2ea3 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 8 Dec 2009 20:36:35 +0000 Subject: 2009-12-08 Marcus Brinkmann Update to libtool 2.2.6a. * configure.ac: Invoke AC_CONFIG_MACRO_DIR. (AC_LIBTOOL_WIN32_DLL, AC_LIBTOOL_RC): Replace by ... (LT_PREREQ, LT_INIT, LT_LANG): ... these. * config.guess, config.sub, install-sh, ltmain.sh, m4/libtool.m4: Updated to libtool 2.2.6a. * m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4, m4/lt~obsolete.m4: New files from libtool 2.2.6a. src/ 2009-12-08 Marcus Brinkmann * Makefile.am (LTRCCOMPILE): Refactor with ... (RCCOMPILE): ... this new macro. Add $(libgcrypt_la_CPPFLAGS). (SUFFIXES): Add .lo. (.rc.o): Change to ... (.rc.lo): ... this implicit rule. (gcrypt_res_ldflag): Removed. (gcrypt_res): Use libtool object file name here. (libgcrypt_la_LDFLAGS): Remove gcrypt_res_ldflag usage. (libgcrypt_la_LIBADD): Add gcrypt_res. --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 76ba205a..93f4c03b 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ VERSION=$PACKAGE_VERSION AC_CONFIG_SRCDIR([src/libgcrypt.vers]) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST AM_MAINTAINER_MODE @@ -132,9 +133,9 @@ AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_AWK -AC_LIBTOOL_WIN32_DLL -AC_LIBTOOL_RC -AM_PROG_LIBTOOL +LT_PREREQ([2.2.6]) +LT_INIT([win32-dll disable-static]) +LT_LANG([Windows Resource]) ########################## -- cgit v1.2.1