Commit c77f77a1 authored May 22, 2001 by Daniel Stenberg

general autoconf and automake fixes

parent 2966ef66

CHANGES

+5 −1

Original line number	Diff line number	Diff line
		@@ -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

Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

configure.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -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}")

maketgz

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

		############################################################################

src/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -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