diff options
| author | Werner Koch <wk@gnupg.org> | 2013-06-27 09:22:00 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-06-27 09:27:32 +0200 |
| commit | 043e2728c813299fafcf62cd125ecf872b26179e (patch) | |
| tree | 031877c258041d94e60fce07cb353190d73fd9d3 /configure.ac | |
| parent | Update AUTHORS. (diff) | |
| download | gnupg2-043e2728c813299fafcf62cd125ecf872b26179e.tar.xz gnupg2-043e2728c813299fafcf62cd125ecf872b26179e.zip | |
Prepare for newer automake versions.
* configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
option form. Add options from the top Makefile.
(AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
* Makefile.am (AUTOMAKE_OPTIONS): Remove.
* kbx/Makefile.am: Remove INCLUDES. Include cmacros.am. FActor some
AM_CPPFLAGS options to AM_CFLAGS.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5335e56d4..01530e06c 100644 --- a/configure.ac +++ b/configure.ac @@ -63,10 +63,12 @@ PACKAGE=$PACKAGE_NAME PACKAGE_GT=${PACKAGE_NAME}2 VERSION=$PACKAGE_VERSION -AC_CONFIG_AUX_DIR(scripts) -AC_CONFIG_SRCDIR(sm/gpgsm.c) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AC_CONFIG_AUX_DIR([scripts]) +AC_CONFIG_SRCDIR([sm/gpgsm.c]) +AC_CONFIG_HEADER([config.h]) +# Note: For automake 1.13 add the option +# serial-tests +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) AC_CANONICAL_HOST AB_INIT |