Use modern AC_INIT.

Remove GNUTLS_*VERSION.
Separate libtool versioning from package versioning.

diff --git a/configure.in b/configure.in
index 54785c32b72e04a7f02fe9d74f6376419d9db17e..bfb471624e3a211f267984e8d930625ba6b7097c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,39 +20,25 @@ dnl License along with GNU TLS; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 dnl 02111-1307, USA
 
-AC_INIT
+AC_INIT(gnutls, [1.1.17], [bug-gnutls@gnu.org])
 AC_PREREQ(2.57)
 
 AC_CANONICAL_TARGET
 
-dnl Gnutls Version
-GNUTLS_MAJOR_VERSION=1
-GNUTLS_MINOR_VERSION=1
-GNUTLS_MICRO_VERSION=17
-GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION
-
-AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls])
-
 GNUTLS_GCRYPT_VERSION=1:1.2.0
 GNUTLS_LIBTASN1_VERSION=0.2.10
 AC_DEFINE_UNQUOTED(GNUTLS_GCRYPT_VERSION, "$GNUTLS_GCRYPT_VERSION", [version of gcrypt])
 AC_DEFINE_UNQUOTED(GNUTLS_LIBTASN1_VERSION, "$GNUTLS_LIBTASN1_VERSION", [version of libtasn1])
 
-AM_INIT_AUTOMAKE(gnutls, $GNUTLS_VERSION, [version of gnutls])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 AB_INIT
 
 dnl This is the library version
 GNUTLS_MOST_RECENT_INTERFACE=13
-GNUTLS_CURRENT_INTERFACE_IMPLEMENTATION_NUMBER=$GNUTLS_MICRO_VERSION
+GNUTLS_CURRENT_INTERFACE_IMPLEMENTATION_NUMBER=17
 GNUTLS_OLDEST_INTERFACE=12
 
-
-AC_SUBST(GNUTLS_MAJOR_VERSION)
-AC_SUBST(GNUTLS_MINOR_VERSION)
-AC_SUBST(GNUTLS_MICRO_VERSION)
-AC_SUBST(GNUTLS_VERSION)
-
 AC_SUBST(GNUTLS_MOST_RECENT_INTERFACE)
 AC_SUBST(GNUTLS_CURRENT_INTERFACE_IMPLEMENTATION_NUMBER)
 AC_SUBST(GNUTLS_OLDEST_INTERFACE)