aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--Makefile.am3
-rw-r--r--configure.in1
-rwxr-xr-xmaketgz4
-rw-r--r--src/Makefile.am2
5 files changed, 11 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index e347a16c3..d401cd8e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,11 @@ Daniel (22 May 2001)
automake 1.4-p1
I wouldn't recommend any developer to try to generate things with older
- versions than these.
+ versions than these. Building from CVS will probably more or less require
+ at least these versions.
+
+ As a result of this, the configure script grew to more than double its
+ previous size!
Daniel (21 May 2001)
- I made ftps:// work. Added test case 400 to the release archive, as the
diff --git a/Makefile.am b/Makefile.am
index 321f238ff..ed8cac95d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
EXTRA_DIST = \
CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \
- config-win32.h reconf packages/README Makefile.dist
+ config-win32.h reconf packages/README Makefile.dist \
+ curl-config.in
bin_SCRIPTS = curl-config
diff --git a/configure.in b/configure.in
index 9bbc1f881..13bc7e3f9 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,7 @@ dnl
dnl Detect the canonical host and target build environment
dnl
+AC_CANONICAL_HOST
dnl Get system canonical name
AC_DEFINE_UNQUOTED(OS, "${host}")
diff --git a/maketgz b/maketgz
index 200d8b6b0..bc1914244 100755
--- a/maketgz
+++ b/maketgz
@@ -61,7 +61,7 @@ findprog()
# Enforce a rerun of configure (updates the VERSION)
#
-./config.status --recheck
+#./config.status --recheck
############################################################################
#
@@ -73,7 +73,7 @@ if { findprog automake >/dev/null 2>/dev/null; } then
echo "- Could not find or run automake, I hope you know what you're doing!"
else
echo "Runs automake --include-deps"
- automake --include-deps
+ automake --include-deps Makefile
fi
############################################################################
diff --git a/src/Makefile.am b/src/Makefile.am
index b64ea24bb..ea77c6a1e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ CLEANFILES = hugehelp.c
NROFF=@NROFF@
EXTRA_DIST = mkhelp.pl config-win32.h \
- Makefile.vc6 Makefile.b32 Makefile.m32
+ Makefile.vc6 Makefile.b32 Makefile.m32 config.h.in
AUTOMAKE_OPTIONS = foreign no-dependencies