From: Alexandre Duret-Lutz Date: Mon, 2 Jun 2003 23:35:00 +0000 (+0000) Subject: * alocal.in: Use Automake::Configure_ac. X-Git-Tag: Release-1-7b~167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f02b686c685da8630fbb86eac63cf1293f24310;p=thirdparty%2Fautomake.git * alocal.in: Use Automake::Configure_ac. ($configure_ac): Delete. (scan_configure): Adjust use of find_configure_ac; * automake.in: Use Automake::Configure_ac. ($configure_ac): Delete. (scan_autoconf_files): Adjust use of find_configure_ac; * lib/Automake/Configure_ac.pm: New file. * lib/Automake/General.pm (find_configure_ac): Delete. Now replaced by Automake::Configure_ac::search_configure_ac. * lib/Automake/Makefile.am (dist_perllib_DATA): Add Configure_ac.pm. * lib/Automake/Variable.pm: Use Automake::Configure_ac. (require_variables): Adjust use of $configure_ac. --- diff --git a/ChangeLog b/ChangeLog index 3c922f6a7..5ca59d88a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-06-03 Alexandre Duret-Lutz + + * alocal.in: Use Automake::Configure_ac. + ($configure_ac): Delete. + (scan_configure): Adjust use of find_configure_ac; + * automake.in: Use Automake::Configure_ac. + ($configure_ac): Delete. + (scan_autoconf_files): Adjust use of find_configure_ac; + * lib/Automake/Configure_ac.pm: New file. + * lib/Automake/General.pm (find_configure_ac): Delete. Now + replaced by Automake::Configure_ac::search_configure_ac. + * lib/Automake/Makefile.am (dist_perllib_DATA): Add Configure_ac.pm. + * lib/Automake/Variable.pm: Use Automake::Configure_ac. + (require_variables): Adjust use of $configure_ac. + 2003-06-02 Akim Demaille * lib/am/texi-vers.am, lib/am/subdirs.am, lib/am/scripts.am, diff --git a/Makefile.in b/Makefile.in index ad7bab4c2..25bfe5c2b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,9 +187,6 @@ all: all-recursive .SUFFIXES: .SUFFIXES: .dvi .html .info .pdf .ps .texi - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno am--refresh: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ @@ -221,7 +218,6 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_D cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -297,11 +293,6 @@ mostlyclean-vti: maintainer-clean-vti: -rm -f stamp-vti version.texi - -TEXI2DVI = texi2dvi - -TEXI2PDF = $(TEXI2DVI) --pdf --batch -DVIPS = dvips .dvi.ps: $(DVIPS) -o $@ $< @@ -340,11 +331,11 @@ dist-info: $(INFO_DEPS) mostlyclean-aminfo: -rm -rf automake.aux automake.cm automake.cp automake.cps automake.cv \ - automake.fn automake.ky automake.kys automake.log automake.op \ - automake.ov automake.pg automake.pgs automake.tmp \ - automake.toc automake.tp automake.tps automake.tr automake.vr \ - automake.vrs automake.dvi automake.pdf automake.ps \ - automake.html + automake.fn automake.ky automake.kys automake.log \ + automake.op automake.ov automake.pg automake.pgs \ + automake.tmp automake.toc automake.tp automake.tps \ + automake.tr automake.vr automake.vrs automake.dvi \ + automake.pdf automake.ps automake.html maintainer-clean-aminfo: @list='$(INFO_DEPS)'; for i in $$list; do \ @@ -412,12 +403,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -476,19 +461,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) @@ -733,10 +705,10 @@ uninstall-info: uninstall-info-recursive info-recursive install install-am install-binSCRIPTS \ install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-aminfo \ + install-info install-info-am install-info-recursive \ + install-man install-recursive install-strip installcheck \ + installcheck-am installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-recursive \ maintainer-clean-vti mostlyclean mostlyclean-aminfo \ mostlyclean-generic mostlyclean-recursive mostlyclean-vti pdf \ diff --git a/aclocal.in b/aclocal.in index d7307a1e9..a74d72803 100644 --- a/aclocal.in +++ b/aclocal.in @@ -34,6 +34,7 @@ BEGIN } use Automake::General; +use Automake::Configure_ac; use Automake::XFile; use File::stat; @@ -56,9 +57,6 @@ $default_dirlist = "$default_acdir/dirlist"; # Exit status. $exit_status = 0; -# Name of the top autoconf input: `configure.ac' or `configure.in'. -$configure_ac = find_configure_ac; - # Text to output. $output = ''; @@ -238,8 +236,7 @@ sub parse_arguments (@) sub scan_configure () { - die "aclocal: `configure.ac' or `configure.in' is required\n" - if !$configure_ac; + find_configure_ac; open (CONFIGURE, $configure_ac) || die "aclocal: couldn't open `$configure_ac': $!\n"; diff --git a/automake.in b/automake.in index 05bf00570..2808db0b2 100755 --- a/automake.in +++ b/automake.in @@ -125,6 +125,7 @@ use Automake::General; use Automake::XFile; use Automake::Channels; use Automake::ChannelDefs; +use Automake::Configure_ac; use Automake::Location; use Automake::Condition qw/TRUE FALSE/; use Automake::DisjConditions; @@ -309,9 +310,6 @@ my $force_missing = 0; ## Variables filled during files scanning. ## ## ---------------------------------------- ## -# Name of the top autoconf input: `configure.ac' or `configure.in'. -my $configure_ac = ''; - # Files found by scanning configure.ac for LIBOBJS. my %libsources = (); @@ -5081,11 +5079,7 @@ sub scan_autoconf_files # that won't always be the case. %libsources = (); - $configure_ac = find_configure_ac; - fatal "`configure.ac' or `configure.in' is required\n" - if !$configure_ac; - - scan_autoconf_traces ($configure_ac); + scan_autoconf_traces (find_configure_ac); # Set input and output files if not specified by user. if (! @input_files) diff --git a/configure b/configure index 12a60fdac..481b18963 100755 --- a/configure +++ b/configure @@ -4,8 +4,7 @@ # # Report bugs to . # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -24,7 +23,7 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -632,7 +631,7 @@ done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -672,10 +671,10 @@ if test -z "$srcdir"; then # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -747,9 +746,9 @@ _ACEOF cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -841,7 +840,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -857,8 +856,7 @@ if $ac_init_version; then GNU Automake configure 1.7a generated by GNU Autoconf 2.57a -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -947,19 +945,19 @@ do 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -993,12 +991,12 @@ _ASBOX case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1027,7 +1025,7 @@ _ASBOX for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1126,7 +1124,7 @@ fi # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1143,13 +1141,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1308,20 +1306,20 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -1872,13 +1870,13 @@ _ACEOF # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -1908,13 +1906,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -1928,13 +1926,13 @@ fi cat >confdef2opt.sed <<\_ACEOF t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g @@ -1956,7 +1954,7 @@ 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$//'` + 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' @@ -2002,7 +2000,7 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -2280,7 +2278,7 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -2294,8 +2292,7 @@ GNU Automake config.status 1.7a configured by $0, generated by GNU Autoconf 2.57a, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -2547,9 +2544,9 @@ _ACEOF (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -2567,21 +2564,21 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -2597,10 +2594,10 @@ echo X"$ac_file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -2665,7 +2662,7 @@ echo "$as_me: creating $ac_file" >&6;} configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -2674,24 +2671,24 @@ echo "$as_me: creating $ac_file" >&6;} case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo "$f";; + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm new file mode 100644 index 000000000..52d40b865 --- /dev/null +++ b/lib/Automake/Configure_ac.pm @@ -0,0 +1,95 @@ +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +package Automake::Configure_ac; + +use strict; +use Exporter; +use Automake::Channels; +use Automake::ChannelDefs; + +use vars qw (@ISA @EXPORT); + +@ISA = qw (Exporter); +@EXPORT = qw ($configure_ac &search_configure_ac &find_configure_ac); + +=head1 NAME + +Automake::Configure_ac - Locate configure.ac or configure.in. + +=head1 SYNOPSIS + + use Automake::Configure_ac; + + # Try to locate configure.in or configure.ac in the current + # directory. It may be absent. Complain if both files exist. + my $filename = search_configure_ac; + + # Likewise, but bomb out if the file does not exist. + my $filename = find_configure_ac; + +In both cases, the name of the file found is also put in the +C<$configure_ac> global variable. + +=cut + +use vars '$configure_ac'; + +sub search_configure_ac () +{ + if (-f 'configure.ac') + { + if (-f 'configure.in') + { + msg ('unsupported', + "`configure.ac' and `configure.in' both present.\n" + . "proceeding with `configure.ac'."); + } + $configure_ac = 'configure.ac'; + } + elsif (-f 'configure.in') + { + $configure_ac = 'configure.in'; + } + return $configure_ac; +} + +sub find_configure_ac () +{ + fatal "`configure.ac' or `configure.in' is required" + unless search_configure_ac; + return $configure_ac; +} + +1; + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## End: diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm index fe8915b60..79a39d61c 100644 --- a/lib/Automake/General.pm +++ b/lib/Automake/General.pm @@ -28,7 +28,7 @@ use strict; use vars qw (@ISA @EXPORT); @ISA = qw (Exporter); -@EXPORT = qw (&debug &find_configure_ac &find_file &getopt &mktmpdir &mtime +@EXPORT = qw (&debug &find_file &getopt &mktmpdir &mtime &uniq &update_file &verbose &xsystem &contents $debug $help $me $tmp $verbose $version); @@ -98,28 +98,6 @@ sub debug (@) } -# $CONFIGURE_AC -# &find_configure_ac () -# --------------------- -sub find_configure_ac () -{ - if (-f 'configure.ac') - { - if (-f 'configure.in') - { - carp "warning: `configure.ac' and `configure.in' both present.\n"; - carp "warning: proceeding with `configure.ac'.\n"; - } - return 'configure.ac'; - } - elsif (-f 'configure.in') - { - return 'configure.in'; - } - return; -} - - # $FILENAME # find_file ($FILENAME, @INCLUDE) # ------------------------------- diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am index 88fb07fca..4f5ea1e08 100644 --- a/lib/Automake/Makefile.am +++ b/lib/Automake/Makefile.am @@ -24,6 +24,7 @@ dist_perllib_DATA = \ ChannelDefs.pm \ Channels.pm \ Condition.pm \ + Configure_ac.pm \ DisjConditions.pm \ General.pm \ Location.pm \ diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index eab668e01..53691156b 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -132,6 +132,7 @@ dist_perllib_DATA = \ ChannelDefs.pm \ Channels.pm \ Condition.pm \ + Configure_ac.pm \ DisjConditions.pm \ General.pm \ Location.pm \ @@ -174,7 +175,6 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_D $(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -dist_perllibDATA_INSTALL = $(INSTALL_DATA) install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(perllibdir) @@ -252,12 +252,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -316,7 +310,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -437,22 +430,22 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive html html-am html-recursive info \ - info-am info-recursive install install-am install-data \ - install-data-am install-data-recursive install-dist_perllibDATA \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-dist_perllibDATA uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-recursive distclean-tags \ + distdir dvi dvi-am dvi-recursive html html-am html-recursive \ + info info-am info-recursive install install-am install-data \ + install-data-am install-data-recursive \ + install-dist_perllibDATA install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + pdf-am pdf-recursive ps ps-am ps-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-dist_perllibDATA \ + uninstall-info-am uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index c92066854..5e705512d 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -20,6 +20,7 @@ use strict; use Carp; use Automake::Channels; use Automake::ChannelDefs; +use Automake::Configure_ac; use Automake::VarDef; use Automake::Condition qw (TRUE FALSE); use Automake::DisjConditions; @@ -1226,13 +1227,13 @@ sub require_variables ($$$@) if (exists $_am_macro_for_var{$var}) { $text .= "\nThe usual way to define `$var' is to add " - . "`$_am_macro_for_var{$var}'\nto `$Automake::configure_ac' and " + . "`$_am_macro_for_var{$var}'\nto `$configure_ac' and " . "run `aclocal' and `autoconf' again."; } elsif (exists $_ac_macro_for_var{$var}) { $text .= "\nThe usual way to define `$var' is to add " - . "`$_ac_macro_for_var{$var}'\nto `$Automake::configure_ac' and " + . "`$_ac_macro_for_var{$var}'\nto `$configure_ac' and " . "run `autoconf' again."; } diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 9831915ab..f18ba25ad 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -172,24 +172,24 @@ check-TESTS: $(TESTS) all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ ;; \ *) \ - echo "PASS: $$tst"; \ + echo "PASS: $$tst"; \ ;; \ esac; \ elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ ;; \ *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ ;; \ esac; \ else \ @@ -231,7 +231,6 @@ check-TESTS: $(TESTS) echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -266,7 +265,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/lib/Makefile.in b/lib/Makefile.in index 28b971030..b1716f3dc 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -169,7 +169,6 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_D $(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA) install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgvdatadir) @@ -187,7 +186,6 @@ uninstall-dist_pkgvdataDATA: echo " rm -f $(DESTDIR)$(pkgvdatadir)/$$f"; \ rm -f $(DESTDIR)$(pkgvdatadir)/$$f; \ done -dist_scriptDATA_INSTALL = $(INSTALL_DATA) install-dist_scriptDATA: $(dist_script_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(scriptdir) @@ -265,12 +263,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -329,7 +321,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -453,23 +444,24 @@ uninstall-am: uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \ uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive html html-am html-recursive info \ - info-am info-recursive install install-am install-data \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-recursive distclean-tags \ + distdir dvi dvi-am dvi-recursive html html-am html-recursive \ + info info-am info-recursive install install-am install-data \ install-data-am install-data-recursive \ install-dist_pkgvdataDATA install-dist_scriptDATA install-exec \ install-exec-am install-exec-recursive install-info \ install-info-am install-info-recursive install-man \ install-recursive install-strip installcheck installcheck-am \ installcheck-local installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + pdf-am pdf-recursive ps ps-am ps-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-dist_pkgvdataDATA \ + uninstall-dist_scriptDATA uninstall-info-am \ + uninstall-info-recursive uninstall-recursive install-data-hook: diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 5fa673e63..f029a3325 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -157,7 +157,6 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_D $(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -dist_amDATA_INSTALL = $(INSTALL_DATA) install-dist_amDATA: $(dist_am_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(amdir) @@ -181,7 +180,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -216,7 +214,6 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(amdir) - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/m4/Makefile.in b/m4/Makefile.in index 9d9e0b9ab..c94314002 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -187,7 +187,6 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_D $(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -dist_m4dataDATA_INSTALL = $(INSTALL_DATA) install-dist_m4dataDATA: $(dist_m4data_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(m4datadir) @@ -205,7 +204,6 @@ uninstall-dist_m4dataDATA: echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ rm -f $(DESTDIR)$(m4datadir)/$$f; \ done -nodist_m4dataDATA_INSTALL = $(INSTALL_DATA) install-nodist_m4dataDATA: $(nodist_m4data_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(m4datadir) @@ -229,7 +227,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -264,7 +261,6 @@ all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(m4datadir) $(DESTDIR)$(m4datadir) - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/stamp-vti b/stamp-vti index 65ea591db..1346a6fd9 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 28 May 2003 +@set UPDATED 22 May 2003 @set UPDATED-MONTH May 2003 @set EDITION 1.7a @set VERSION 1.7a diff --git a/tests/Makefile.in b/tests/Makefile.in index 3427c16ab..a0a97e3d7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -639,24 +639,24 @@ check-TESTS: $(TESTS) all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ ;; \ *) \ - echo "PASS: $$tst"; \ + echo "PASS: $$tst"; \ ;; \ esac; \ elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ ;; \ *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ ;; \ esac; \ else \ @@ -698,7 +698,6 @@ check-TESTS: $(TESTS) echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -734,7 +733,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/version.texi b/version.texi index 65ea591db..1346a6fd9 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 28 May 2003 +@set UPDATED 22 May 2003 @set UPDATED-MONTH May 2003 @set EDITION 1.7a @set VERSION 1.7a