From cd3344e64610007dcd3a2bf2690b5a61aadf5d78 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 10 Apr 2002 20:45:16 +0000 Subject: [PATCH] * configure.in (APIVERSION): Fix definition. --- ChangeLog | 4 ++++ Makefile.in | 22 +++++++++++++++++----- aclocal.m4 | 4 ++-- configure | 27 ++++++++++++++------------- configure.in | 2 +- lib/Automake/Makefile.in | 26 +++++++++++++++++++++----- lib/Makefile.in | 30 +++++++++++++++++++++++------- lib/am/Makefile.in | 26 +++++++++++++++++++++----- m4/Makefile.in | 26 +++++++++++++++++++++----- tests/Makefile.in | 20 +++++++++++++++++--- 10 files changed, 141 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 145e8d7..7799a35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-04-10 Alexandre Duret-Lutz + * configure.in (APIVERSION): Fix definition. + +2002-04-10 Alexandre Duret-Lutz + * NEWS: Catch up with changes since 1.6. 2002-04-10 Alexandre Duret-Lutz diff --git a/Makefile.in b/Makefile.in index 0f8fadb..1aad5d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -65,16 +65,30 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEPDIR = @DEPDIR@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBS = @LIBS@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ +SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ +ac_ct_STRIP = @ac_ct_STRIP@ +build_alias = @build_alias@ +host_alias = @host_alias@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ +program_transform_name = @program_transform_name@ +target_alias = @target_alias@ SUBDIRS = . m4 lib tests @@ -197,8 +211,6 @@ automake.dvi: automake.texi $(srcdir)/version.texi cd $(srcdir) \ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ `echo $< | sed 's,.*/,,'` - -MAKEINFO = @MAKEINFO@ TEXI2DVI = texi2dvi DVIPS = dvips .dvi.ps: diff --git a/aclocal.m4 b/aclocal.m4 index a7ced59..a157f6b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -86,9 +86,9 @@ _AM_IF_OPTION([no-define],, # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}") +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}") +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) diff --git a/configure b/configure index 5230a7b..725ce33 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.52i for GNU Automake 1.6a. +# Generated by GNU Autoconf 2.53 for GNU Automake 1.6a. # # Report bugs to . # @@ -611,7 +611,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -623,18 +623,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -834,7 +835,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF GNU Automake configure 1.6a -generated by GNU Autoconf 2.52i +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -849,7 +850,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by GNU Automake $as_me 1.6a, which was -generated by GNU Autoconf 2.52i. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1167,8 +1168,8 @@ am__api_version="1.6a" # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1397,13 +1398,13 @@ _ACEOF # Some tools Automake needs. -ACLOCAL=${ACLOCAL-"${am_missing_run}"aclocal-${am__api_version}""} +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -AUTOMAKE=${AUTOMAKE-"${am_missing_run}"automake-${am__api_version}""} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} @@ -1517,7 +1518,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # are compatible. So 1.5.1c is compatible with 1.5. # * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c # aren't the same. -APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]?\).*$/\1/'` +APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'` # A versioned directory, defined here for convenience. @@ -1960,7 +1961,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by GNU Automake $as_me 1.6a, which was -generated by GNU Autoconf 2.52i. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2014,7 +2015,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ GNU Automake config.status 1.6a -configured by $0, generated by GNU Autoconf 2.52i, +configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 diff --git a/configure.in b/configure.in index 2e5e685..2ade88c 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,7 @@ AM_INIT_AUTOMAKE([1.6 dist-bzip2]) # are compatible. So 1.5.1c is compatible with 1.5. # * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c # aren't the same. -APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'` +APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'` AC_SUBST(APIVERSION) # A versioned directory, defined here for convenience. diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index fb45c1e..389d729 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -65,16 +65,30 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEPDIR = @DEPDIR@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBS = @LIBS@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ +SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ +ac_ct_STRIP = @ac_ct_STRIP@ +build_alias = @build_alias@ +host_alias = @host_alias@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ +program_transform_name = @program_transform_name@ +target_alias = @target_alias@ perllibdir = $(pkgvdatadir)/Automake dist_perllib_DATA = Struct.pm General.pm XFile.pm @@ -131,8 +145,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 9201a4d..9c490da 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -65,16 +65,30 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEPDIR = @DEPDIR@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBS = @LIBS@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ +SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ +ac_ct_STRIP = @ac_ct_STRIP@ +build_alias = @build_alias@ +host_alias = @host_alias@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ +program_transform_name = @program_transform_name@ +target_alias = @target_alias@ SUBDIRS = Automake am @@ -153,7 +167,7 @@ uninstall-dist_scriptDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -173,7 +187,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -257,8 +271,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 4b0b49b..f0b1995 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -65,16 +65,30 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEPDIR = @DEPDIR@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBS = @LIBS@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ +SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ +ac_ct_STRIP = @ac_ct_STRIP@ +build_alias = @build_alias@ +host_alias = @host_alias@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ +program_transform_name = @program_transform_name@ +target_alias = @target_alias@ amdir = $(pkgvdatadir)/am @@ -139,8 +153,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 2016e94..cb42309 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -65,16 +65,30 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEPDIR = @DEPDIR@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBS = @LIBS@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ +SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ +ac_ct_STRIP = @ac_ct_STRIP@ +build_alias = @build_alias@ +host_alias = @host_alias@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ +program_transform_name = @program_transform_name@ +target_alias = @target_alias@ m4datadir = $(datadir)/aclocal-$(APIVERSION) @@ -160,8 +174,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 6af9e11..926588e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -65,16 +65,30 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEPDIR = @DEPDIR@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBS = @LIBS@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ +SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ +ac_ct_STRIP = @ac_ct_STRIP@ +build_alias = @build_alias@ +host_alias = @host_alias@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ +program_transform_name = @program_transform_name@ +target_alias = @target_alias@ XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test specflags8.test -- 2.7.4