From eaf03df8980501987c58cd3241c9f46ea940c410 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 15 Sep 2002 20:34:14 +0000 Subject: [PATCH] * configure.in (aclocal, automake): Don't create. * automake.in ($prefix): Don't define. * aclocal.in ($prefix): Don't define. * Makefile.am (do_subst): New macro. (automake): New target. (aclocal): Likewise. --- ChangeLog | 9 +++ Makefile.am | 18 +++++ Makefile.in | 89 ++++++++++++------------ aclocal.in | 2 - aclocal.m4 | 10 --- automake.in | 2 - configure | 143 ++++++++++++++++----------------------- configure.in | 3 - lib/Automake/Makefile.in | 8 +-- lib/Makefile.in | 8 +-- lib/am/Makefile.in | 8 +-- m4/Makefile.in | 8 +-- tests/Makefile.in | 8 +-- 13 files changed, 139 insertions(+), 177 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee1b9f62..d1a1528b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-09-15 Tom Tromey + + * configure.in (aclocal, automake): Don't create. + * automake.in ($prefix): Don't define. + * aclocal.in ($prefix): Don't define. + * Makefile.am (do_subst): New macro. + (automake): New target. + (aclocal): Likewise. + 2002-09-15 Alexandre Duret-Lutz * aclocal.in, automake.in: Requote each "@var@" as '@var@'. diff --git a/Makefile.am b/Makefile.am index 1be834df..c8197874 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,24 @@ uninstall-hook: rm -f $(DESTDIR)$(bindir)/$$fv; \ done + +## We can't use configure to do the substitution here; we must do it +## by hand. We use a funny notation here to avoid configure +## substitutions in our text. +do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \ + -e 's,[@]configure_input[@],@configure_input@,g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' + +automake: automake.in Makefile + $(do_subst) < $(srcdir)/automake.in > automake + chmod +x automake + +aclocal: aclocal.in Makefile + $(do_subst) < $(srcdir)/aclocal.in > aclocal + chmod +x aclocal + ################################################################ ## ## Everything past here is useful to the maintainer, but probably not diff --git a/Makefile.in b/Makefile.in index 6249ec16..5b0c8b2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -55,7 +54,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ LN = @LN@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -106,6 +104,13 @@ TAGS_DEPENDENCIES = automake.texi EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000 ChangeLog.2001 +do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \ + -e 's,[@]configure_input[@],@configure_input@,g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' + + WGET = wget FETCHFILES = config.guess config.sub texinfo.tex Automake/XFile.pm INSTALL \ @@ -114,7 +119,7 @@ FETCHFILES = config.guess config.sub texinfo.tex Automake/XFile.pm INSTALL \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = automake aclocal +CONFIG_CLEAN_FILES = SCRIPTS = $(bin_SCRIPTS) DIST_SOURCES = @@ -132,9 +137,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 automake.in \ - configure configure.in install-sh mdate-sh missing \ - mkinstalldirs stamp-vti version.texi + Makefile.in NEWS THANKS TODO aclocal.m4 configure configure.in \ + install-sh mdate-sh missing mkinstalldirs stamp-vti \ + version.texi DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -156,10 +161,6 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -automake: $(top_builddir)/config.status automake.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -aclocal: $(top_builddir)/config.status aclocal.in - cd $(top_builddir) && $(SHELL) ./config.status $@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @@ -180,24 +181,6 @@ uninstall-binSCRIPTS: echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done - -.texi.info: - @rm -f $@ $@-[0-9] $@-[0-9][0-9] - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - `test -f '$<' || echo '$(srcdir)/'`$< -o $@ - -.texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$< - -.texi.pdf: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< -automake.info: version.texi -automake.dvi: version.texi -automake.pdf: version.texi version.texi: stamp-vti stamp-vti: automake.texi $(top_srcdir)/configure.in @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ @@ -217,9 +200,27 @@ mostlyclean-vti: maintainer-clean-vti: -rm -f stamp-vti version.texi + +.texi.info: + @rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + `test -f '$<' || echo '$(srcdir)/'`$< -o $@ + +.texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$< -o $@ + +.texi.pdf: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< -o $@ +automake.info: version.texi +automake.dvi: version.texi +automake.pdf: version.texi TEXI2DVI = texi2dvi -TEXI2PDF = $(TEXI2DVI) --pdf --batch +TEXI2PDF = $(TEXI2DVI) --pdf DVIPS = dvips .dvi.ps: $(DVIPS) $< -o $@ @@ -246,7 +247,7 @@ uninstall-info-am: dist-info: $(INFO_DEPS) list='$(INFO_DEPS)'; \ for base in $$list; do \ - if test -f $$base; then d=.; else d=$(srcdir); fi; \ + d=$(srcdir); \ for file in $$d/$$base*; do \ relfile=`expr "$$file" : "$$d/\(.*\)"`; \ test -f $(distdir)/$$relfile || \ @@ -256,12 +257,12 @@ dist-info: $(INFO_DEPS) mostlyclean-aminfo: -rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \ - automake.fn automake.ky automake.log automake.op automake.ov \ - automake.pg automake.tmp automake.toc automake.tp automake.tr \ - automake.vr automake.vrs automake.dvi automake.pdf \ - automake.ps + automake.dvi automake.fn automake.ky automake.log automake.op \ + automake.ov automake.pdf automake.pg automake.ps automake.tmp \ + automake.toc automake.tp automake.tr automake.vr automake.vrs maintainer-clean-aminfo: + cd $(srcdir) && \ list='$(INFO_DEPS)'; for i in $$list; do \ rm -f $$i; \ if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ @@ -402,12 +403,8 @@ distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/m4 $(distdir)/tests - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + $(mkinstalldirs) $(distdir)/m4 $(distdir)/tests + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -492,7 +489,7 @@ distcheck: dist && (test `find "$$dc_destdir" -type f -print | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall (check DESTDIR support):" ; \ find "$$dc_destdir" -type f -print ; \ - exit 1; } >&2 ); \ + exit 1; } >&2 ) \ } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ @@ -570,7 +567,7 @@ install-info-am: $(INFO_DEPS) $(mkinstalldirs) $(DESTDIR)$(infodir) @list='$(INFO_DEPS)'; \ for file in $$list; do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + d=$(srcdir); \ for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \ if test -f $$ifile; then \ relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \ @@ -653,6 +650,14 @@ uninstall-hook: rm -f $(DESTDIR)$(bindir)/$$fv; \ done +automake: automake.in Makefile + $(do_subst) < $(srcdir)/automake.in > automake + chmod +x automake + +aclocal: aclocal.in Makefile + $(do_subst) < $(srcdir)/aclocal.in > aclocal + chmod +x aclocal + ################################################################ # Some simple checks, and then ordinary check. These are only really diff --git a/aclocal.in b/aclocal.in index 1c0baeab..5148422d 100644 --- a/aclocal.in +++ b/aclocal.in @@ -29,7 +29,6 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $prefix = '@prefix@'; my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; unshift @INC, $perllibdir; } @@ -41,7 +40,6 @@ use Automake::XFile; $VERSION = '@VERSION@'; $APIVERSION = '@APIVERSION@'; $PACKAGE = '@PACKAGE@'; -$prefix = '@prefix@'; # Note that this isn't pkgdatadir, but a separate directory. # Note also that the versioned directory is handled later. $acdir = '@datadir@/aclocal'; diff --git a/aclocal.m4 b/aclocal.m4 index c456519f..d836fce4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -69,16 +69,6 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], diff --git a/automake.in b/automake.in index 2cbe31ad..b4e4e1fc 100755 --- a/automake.in +++ b/automake.in @@ -31,7 +31,6 @@ package Language; BEGIN { - my $prefix = '@prefix@'; my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; unshift @INC, $perllibdir; } @@ -127,7 +126,6 @@ use Carp; # VERSION as string so that eg version 0.30 will print correctly. my $VERSION = '@VERSION@'; my $PACKAGE = '@PACKAGE@'; -my $prefix = '@prefix@'; my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; # Some regular expressions. One reason to put them here is that it diff --git a/configure b/configure index d58c08d6..7700bfbf 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.53d for GNU Automake 1.6c. +# Generated by GNU Autoconf 2.53b for GNU Automake 1.6c. # # Report bugs to . # @@ -23,6 +23,7 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -30,22 +31,31 @@ else as_unset=false fi +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1; then @@ -87,7 +97,7 @@ if test "${PATH_SEPARATOR+set}" != set; then echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh - if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: @@ -236,7 +246,7 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } # Name of the host. @@ -270,7 +280,7 @@ PACKAGE_STRING='GNU Automake 1.6c' PACKAGE_BUGREPORT='bug-automake@gnu.org' ac_unique_file="automake.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL LN EGREP FGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL LN EGREP FGREP' ac_subst_files='' # Initialize some variables set by options. @@ -695,9 +705,6 @@ if test ! -r $srcdir/$ac_unique_file; then { (exit 1); exit 1; }; } fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -849,7 +856,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF GNU Automake configure 1.6c -generated by GNU Autoconf 2.53d +generated by GNU Autoconf 2.53b Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -864,7 +871,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.6c, which was -generated by GNU Autoconf 2.53d. Invocation command line was +generated by GNU Autoconf 2.53b. Invocation command line was $ $0 $@ @@ -1427,16 +1434,6 @@ echo "$as_me: error: source directory already configured; run \"make distclean\" { (exit 1); exit 1; }; } fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - # Define the identity of the package. PACKAGE=automake VERSION=1.6c @@ -1707,11 +1704,6 @@ echo "${ECHO_T}$ac_cv_prog_fgrep" >&6 - ac_config_files="$ac_config_files automake" - - ac_config_files="$ac_config_files aclocal" - - ac_config_files="$ac_config_files Makefile lib/Automake/Makefile lib/Makefile lib/am/Makefile m4/Makefile m4/amversion.m4:m4/amversion.in tests/Makefile tests/defs" @@ -1822,21 +1814,6 @@ DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -1870,6 +1847,7 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -1877,22 +1855,31 @@ else as_unset=false fi +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1; then @@ -1934,7 +1921,7 @@ if test "${PATH_SEPARATOR+set}" != set; then echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh - if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: @@ -2085,7 +2072,7 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 @@ -2102,7 +2089,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by GNU Automake $as_me 1.6c, which was -generated by GNU Autoconf 2.53d. Invocation command line was +generated by GNU Autoconf 2.53b. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2156,7 +2143,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ GNU Automake config.status 1.6c -configured by $0, generated by GNU Autoconf 2.53d, +configured by $0, generated by GNU Autoconf 2.53b, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -2245,8 +2232,6 @@ for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. - "automake" ) CONFIG_FILES="$CONFIG_FILES automake" ;; - "aclocal" ) CONFIG_FILES="$CONFIG_FILES aclocal" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Automake/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Automake/Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; @@ -2338,7 +2323,6 @@ s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t s,@ACLOCAL@,$ACLOCAL,;t t @@ -2359,8 +2343,6 @@ s,@PERL@,$PERL,;t t s,@LN@,$LN,;t t s,@EGREP@,$EGREP,;t t s,@FGREP@,$FGREP,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF @@ -2564,11 +2546,6 @@ s,@INSTALL@,$ac_INSTALL,;t t rm -f $tmp/out fi - # Run the commands associated with the file. - case $ac_file in - automake ) chmod +x automake ;; - aclocal ) chmod +x aclocal ;; - esac done _ACEOF diff --git a/configure.in b/configure.in index 3c4f356f..538a85e3 100644 --- a/configure.in +++ b/configure.in @@ -83,9 +83,6 @@ AC_MSG_RESULT([$result]) AC_PROG_EGREP AC_PROG_FGREP -AC_CONFIG_FILES([automake], [chmod +x automake]) -AC_CONFIG_FILES([aclocal], [chmod +x aclocal]) - AC_CONFIG_FILES([ Makefile lib/Automake/Makefile diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 9472751b..88ea3e38 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -42,7 +42,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -55,7 +54,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ LN = @LN@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -139,11 +137,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 1aac595f..23c53448 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -42,7 +42,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -55,7 +54,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ LN = @LN@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -285,11 +283,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 393e6697..96d4b3bc 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -42,7 +42,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -55,7 +54,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ LN = @LN@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -147,11 +145,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 8ed7004d..5eb14039 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -42,7 +42,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -55,7 +54,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ LN = @LN@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -193,11 +191,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 942ffbcc..8d2c96ce 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -42,7 +42,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -55,7 +54,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ LN = @LN@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -619,11 +617,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- 2.43.5