diff options
| author | Marcus Brinkmann <[email protected]> | 2009-12-08 21:38:22 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-12-08 21:38:22 +0000 |
| commit | 0a80f620897355a7b264c8fa1047c47fe2e86970 (patch) | |
| tree | 37251d6c9d3d9c0071cb7c8be9c015f89033a0ce /configure.ac | |
| parent | 2009-12-08 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-0a80f620897355a7b264c8fa1047c47fe2e86970.tar.gz gpgme-0a80f620897355a7b264c8fa1047c47fe2e86970.zip | |
2009-12-08 Marcus Brinkmann <[email protected]>
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 <[email protected]>
* Makefile.am (LTRCCOMPILE): Refactor with ...
(RCCOMPILE): ... this new macro.
(SUFFIXES): Add .lo.
(gpgme_res_ldflag): Removed.
(gpgme_res): Use libtool object file name here.
(libgpgme_la_LDFLAGS): Remove gpgme_res_ldflag usage.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index dc5ebe26..9d4cf425 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ AC_CONFIG_SRCDIR(src/gpgme.h.in) dnl FIXME: Enable this with autoconf 2.59. dnl AC_CONFIG_MACRO_DIR(m4) AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_MAINTAINER_MODE AC_CANONICAL_HOST @@ -95,10 +96,9 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package]) AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) # Don't default to build static libs. -AC_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL -AC_LIBTOOL_RC -AC_PROG_LIBTOOL +LT_PREREQ([2.2.6]) +LT_INIT([win32-dll disable-static]) +LT_LANG([Windows Resource]) # For now we hardcode the use of version scripts. It would be better # to write a test for this or even implement this within libtool. |