From f8a16cb2289c1fdd38982530e70926f5d3022c12 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 19 Dec 2001 12:59:19 +0000 Subject: [PATCH] * configure.ac (VERSION,PACKAGE): Defined and subst. Used for AM_INIT_AUTOMAKE and moved all version number more to the top. --- ChangeLog | 5 +++++ configure.ac | 31 ++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb9e8f94..49b30ce0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Werner Koch + + * configure.ac (VERSION,PACKAGE): Defined and subst. Used for + AM_INIT_AUTOMAKE and moved all version number more to the top. + 2001-12-18 Marcus Brinkmann * autogen.sh (libtool_vers): Bump to 1.4. diff --git a/configure.ac b/configure.ac index 355333a8..6c5a10d4 100644 --- a/configure.ac +++ b/configure.ac @@ -20,29 +20,32 @@ # (Process this file with autoconf to produce a configure script.) -AC_INIT(gpgme, 0.2.3a, [gnupg-devel@gnupg.org]) -AC_PREREQ(2.52) -AC_REVISION($Revision$) - -AC_CONFIG_SRCDIR(gpgme/gpgme.h) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gpgme, 0.3.0) -AM_MAINTAINER_MODE - -AC_PROG_CC - # Version numbers (Remember to change them just before a release.) # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) # (Interfaces added: AGE++) # (Interfaces removed: AGE=0) # XXXX new functions +AC_INIT(gpgme, 0.3.0a-cvs, [gnupg-devel@gnupg.org]) LIBGPGME_LT_CURRENT=5 LIBGPGME_LT_AGE=0 LIBGPGME_LT_REVISION=0 NEED_GPG_VERSION=1.0.6 NEED_GPGSM_VERSION=0.0.0 ############################################## +AC_PREREQ(2.52) +AC_REVISION($Revision$) + +PACKAGE=$PACKAGE_NAME +VERSION=$PACKAGE_VERSION + +AC_CONFIG_SRCDIR(gpgme/gpgme.h) +AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_MAINTAINER_MODE + +AC_PROG_CC + AC_SUBST(LIBGPGME_LT_CURRENT) AC_SUBST(LIBGPGME_LT_AGE) @@ -50,6 +53,12 @@ AC_SUBST(LIBGPGME_LT_REVISION) AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION") AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION") +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) + + dnl Don't default to build static libs. dnl AC_DISABLE_STATIC AC_PROG_LIBTOOL