From 8f5ffd94a2b7b751b95d1abddf936138f3235838 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 23 Oct 2000 13:56:12 +0000 Subject: [PATCH] the configure script dynamically gets the version from the include file now which lets the maketgz skip updating the configure.in file --- configure.in | 4 +++- maketgz | 38 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/configure.in b/configure.in index 3b701db21..f3c786a5c 100644 --- 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 79982d0d3..d39d12943 100755 --- 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 ############################################################################ #