the configure script dynamically gets the version from the include file now

which lets the maketgz skip updating the configure.in file

diff --git a/configure.in b/configure.in
index 3b701db21bbf2242ff93efc3e563a1c18d48c01d..f3c786a5c1a3ff4e56239c84c92d2d6d423c9d2b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,9 @@ dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(lib/urldata.h)
 AM_CONFIG_HEADER(config.h src/config.h)
-AM_INIT_AUTOMAKE(curl,"7.4.1")
+
+VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/curl/curl.h`
+AM_INIT_AUTOMAKE(curl,$VERSION)
 AM_PROG_LIBTOOL
 
 dnl

diff --git a/maketgz b/maketgz
index 79982d0d35a24eee44a3802988b2810c707f3d54..d39d12943cf18f5661494c17eadc50f2fa2dbfa2 100755 (executable)
--- a/maketgz
+++ b/maketgz
@@ -62,25 +62,25 @@ findprog()
 # brand new version number:
 #
  
-if { findprog autoconf >/dev/null 2>/dev/null; } then
-  echo "- No autoconf found, we leave configure as it is"
-else
-  # Replace version number in configure.in file:
-
-  CONF="configure.in"
-
-  sed 's/^AM_INIT_AUTOMAKE.*/AM_INIT_AUTOMAKE(curl,"'$version'")/g' $CONF >$CONF.new
-
-  # Save old  file
-  cp -p $CONF $CONF.old
-
-  # Make new configure.in
-  mv $CONF.new $CONF
- 
-  # Update the configure script
-  echo "Runs autoconf"
-  autoconf
-fi
+#if { findprog autoconf >/dev/null 2>/dev/null; } then
+#  echo "- No autoconf found, we leave configure as it is"
+#else
+#  # Replace version number in configure.in file:
+#
+#  CONF="configure.in"
+#
+#  sed 's/^AM_INIT_AUTOMAKE.*/AM_INIT_AUTOMAKE(curl,"'$version'")/g' $CONF >$CONF.new
+#
+#  # Save old  file
+#  cp -p $CONF $CONF.old
+#
+#  # Make new configure.in
+#  mv $CONF.new $CONF
+# 
+#  # Update the configure script
+#  echo "Runs autoconf"
+#  autoconf
+#fi
 
 ############################################################################
 #