mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-04-12 15:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

* lib/autoconf/status.m4 (_AC_SRCPATHS): Rename buildpath to

Browse Source 
abs_builddir, top_buildpath to abs_top_builddir, srcpath to
abs_srcdir, top_srcpath to abs_top_srcdir.
(_AC_OUTPUT_FILES): Adjust.
* NEWS, doc/autoconf.texi, lib/autoconf/autotest.m4,
* tests/atspecific.m4, tests/autoreconf.in, tests/tools.at,
* tests/wrappl.in, tests/wrapsh.in: Adjust.
This commit is contained in:
Akim Demaille 2001-12-14 17:57:27 +00:00
parent 1f33da77de
commit 7e51b629b6
11 changed files with 81 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,19 +1,29 @@
2001-12-13 Peter Eisentraut <peter_e@gmx.net>
* lib/autoconf/status.m4 (_AC_SRCPATHS): Rename buildpath to
abs_builddir, top_buildpath to abs_top_builddir, srcpath to
abs_srcdir, top_srcpath to abs_top_srcdir.
(_AC_OUTPUT_FILES): Adjust.
* NEWS, doc/autoconf.texi, lib/autoconf/autotest.m4,
* tests/atspecific.m4, tests/autoreconf.in, tests/tools.at,
* tests/wrappl.in, tests/wrapsh.in: Adjust.
2001-12-12 Steven G. Johnson <stevenj@alum.mit.edu>
* lib/autoconf/fortran.m4 (_AC_PROG_F77_V_OUTPUT): Fix failed
C/Fortran linking on HP/UX, by extracting the Fortran library
search path from the LPATH line in the $F77 -v output.
2001-12-12 Kevin Ryde <user42@zip.com.au>
* doc/autoconf.texi (File Descriptors): Use a clearer layout for the
forbidden file descriptors table.
2001-11-26 Akim Demaille <akim@epita.fr>
* bin/autoscan.in (%c_keywords): Build it at top level.
Map to 1 in order to simplify its uses.
2001-11-26 Akim Demaille <akim@epita.fr>
* bin/autoscan.in (&scan_c_file, &scan_sh_file, &scan_makefile):
@ -25,7 +35,7 @@
because of `lex$U.$(OBJEXT)'.
(&scan_files): Use "@list" instead of join.
* doc/Makefile.am (CLEANFILES): Add *.fns.
2001-11-26 Akim Demaille <akim@epita.fr>
* tests/autoreconf.in, tests/autom4te.in, tests/autoupdate.in:
@ -39,7 +49,7 @@
* bin/autoscan.in (used): New.
Use it.
2001-11-26 Akim Demaille <akim@epita.fr>
* bin/autoscan.in (&scan_c_file): Better parsing of CPP
@ -47,13 +57,13 @@
(&scan_sh_file): Remove a duplicate pattern.
(&check_configure_ac): Use long options.
* lib/autoscan/headers (alloca.h): Check with AC_FUNC_ALLOCA.
2001-11-26 Akim Demaille <akim@epita.fr>
* bin/autoscan.in (scan_c_file): Fix the handling of C comments.
Before, having a line containing the opening of a multi line
comment made the whole line be ignored.
2001-11-26 Akim Demaille <akim@epita.fr>
* doc/autoconf.texi (Using an Autotest Test Suite): New.

8
NEWS
View File

@ -25,8 +25,8 @@
pressure over control version archives.
Automatic replacement for shells that don't support this feature.
- New output variables
@builddir@, @top_builddir@, @srcpath@, @top_srcpath@, @buildpath@,
@top_buildpath@.
@builddir@, @top_builddir@, @abs_srcdir@, @abs_top_srcdir@, @abs_builddir@,
@abs_top_builddir@.
** Emacs
@ -76,8 +76,8 @@
- AC_CONFIG_COMMANDS, HEADERS, FILES, LINKS.
Provide the user with srcdir, ac_srcdir, ac_top_srcdir, ac_builddir,
ac_top_builddir, ac_srcpath, ac_top_srcpath, ac_buildpath,
ac_top_buildpath.
ac_top_builddir, ac_abs_srcdir, ac_abs_top_srcdir, ac_abs_builddir,
ac_abs_top_builddir.
- AC_CONFIG_COMMANDS, HEADERS, FILES, LINKS and AC_OUTPUT.
Are much less expensive when using long lists of files.

47
configure vendored
View File

@ -817,10 +817,10 @@ case $srcdir in
esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute.
ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
@ -2494,10 +2494,10 @@ case $srcdir in
esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute.
ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
case $INSTALL in
@ -2558,13 +2558,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
s,@configure_input@,$configure_input,;t t
s,@srcdir@,$ac_srcdir,;t t
s,@srcpath@,$ac_srcpath,;t t
s,@abs_srcdir@,$ac_abs_srcdir,;t t
s,@top_srcdir@,$ac_top_srcdir,;t t
s,@top_srcpath@,$ac_top_srcpath,;t t
s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
s,@builddir@,$ac_builddir,;t t
s,@buildpath@,$ac_buildpath,;t t
s,@abs_builddir@,$ac_abs_builddir,;t t
s,@top_builddir@,$ac_top_builddir,;t t
s,@top_buildpath@,$ac_top_buildpath,;t t
s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
s,@INSTALL@,$ac_INSTALL,;t t
" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
rm -f $tmp/stdin
@ -2634,10 +2634,10 @@ case $srcdir in
esac
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
# absolute.
ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@ -2657,14 +2657,15 @@ ATEOF
# Generated by $0.
# Copyright 2000, 2001 Free Software Foundation, Inc.
# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
at_testdir='tests'
buildpath='$ac_buildpath'
srcdir='$ac_srcdir'
srcpath='$ac_srcpath'
top_srcdir='$ac_top_srcdir'
top_srcpath='$ac_top_srcpath'
top_builddir='$ac_top_builddir'
top_buildpath='$ac_top_buildpath'
abs_builddir='$ac_abs_builddir'
at_srcdir='$ac_srcdir'
abs_srcdir='$ac_abs_srcdir'
at_top_srcdir='$ac_top_srcdir'
abs_top_srcdir='$ac_abs_top_srcdir'
at_top_builddir='$ac_top_builddir'
abs_top_builddir='$ac_abs_top_builddir'
AUTOTEST_PATH='tests'

16
doc/autoconf.texi
View File

@ -2039,8 +2039,8 @@ programs to test for C, C++ and Fortran 77 features.
Rigorously equal to @samp{.}. Added for symmetry only.
@end defvar
@defvar buildpath
@ovindex buildpath
@defvar abs_builddir
@ovindex abs_builddir
Absolute path of @code{builddir}.
@end defvar
@ -2050,8 +2050,8 @@ The relative path to the top-level of the current build tree. In the
top-level directory, this is the same as @code{srcbuild}.
@end defvar
@defvar top_buildpath
@ovindex top_buildpath
@defvar abs_top_builddir
@ovindex abs_top_builddir
Absolute path of @code{top_builddir}.
@end defvar
@ -2061,8 +2061,8 @@ The relative path to the directory that contains the source code for
that @file{Makefile}.
@end defvar
@defvar srcpath
@ovindex srcpath
@defvar abs_srcdir
@ovindex abs_srcdir
Absolute path of @code{srcdir}.
@end defvar
@ -2072,8 +2072,8 @@ The relative path to the top-level source code directory for the
package. In the top-level directory, this is the same as @code{srcdir}.
@end defvar
@defvar top_srcpath
@ovindex top_srcpath
@defvar abs_top_srcdir
@ovindex abs_top_srcdir
Absolute path of @code{top_srcdir}.
@end defvar

8
lib/autoconf/autotest.m4
View File

@ -87,13 +87,13 @@ AC_CONFIG_COMMANDS([$1/atconfig],
# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
at_testdir='$1'
buildpath='$ac_buildpath'
abs_builddir='$ac_abs_builddir'
at_srcdir='$ac_srcdir'
srcpath='$ac_srcpath'
abs_srcdir='$ac_abs_srcdir'
at_top_srcdir='$ac_top_srcdir'
top_srcpath='$ac_top_srcpath'
abs_top_srcdir='$ac_abs_top_srcdir'
at_top_builddir='$ac_top_builddir'
top_buildpath='$ac_top_buildpath'
abs_top_builddir='$ac_abs_top_builddir'
AUTOTEST_PATH='m4_default([$2], [$1])'

18
lib/autoconf/status.m4
View File

@ -133,7 +133,7 @@
# - `ac_srcdir' is `build -> src'.
# - `ac_top_srcdir' is `build -> top-src'.
#
# and `ac_buildpath' etc., the absolute paths.
# and `ac_abs_builddir' etc., the absolute paths.
m4_define([_AC_SRCPATHS],
[ac_builddir=.
@ -162,10 +162,10 @@ case $srcdir in
esac
# Don't blindly perform a `cd $1/$ac_foo && pwd` since $ac_foo can be
# absolute.
ac_buildpath=`cd $1 && cd $ac_builddir && pwd`
ac_top_buildpath=`cd $1 && cd $ac_top_builddir && pwd`
ac_srcpath=`cd $1 && cd $ac_srcdir && pwd`
ac_top_srcpath=`cd $1 && cd $ac_top_srcdir && pwd`
ac_abs_builddir=`cd $1 && cd $ac_builddir && pwd`
ac_abs_top_builddir=`cd $1 && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd $1 && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd $1 && cd $ac_top_srcdir && pwd`
])# _AC_SRCPATHS
@ -965,13 +965,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF
[/@[a-zA-Z_][a-zA-Z_0-9]*@/!b]
s,@configure_input@,$configure_input,;t t
s,@srcdir@,$ac_srcdir,;t t
s,@srcpath@,$ac_srcpath,;t t
s,@abs_srcdir@,$ac_abs_srcdir,;t t
s,@top_srcdir@,$ac_top_srcdir,;t t
s,@top_srcpath@,$ac_top_srcpath,;t t
s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
s,@builddir@,$ac_builddir,;t t
s,@buildpath@,$ac_buildpath,;t t
s,@abs_builddir@,$ac_abs_builddir,;t t
s,@top_builddir@,$ac_top_builddir,;t t
s,@top_buildpath@,$ac_top_buildpath,;t t
s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
AC_PROVIDE_IFELSE([AC_PROG_INSTALL], [s,@INSTALL@,$ac_INSTALL,;t t
])dnl
dnl The parens around the eval prevent an "illegal io" in Ultrix sh.

4
tests/atspecific.m4
View File

@ -185,10 +185,10 @@ m4_define([AT_CHECK_AUTOHEADER],
# [EXIT-STATUS = 0],
# [SDOUT = IGNORE], STDERR)
# --------------------------------------------
# `top_srcpath' is needed so that `./configure' finds install-sh.
# `abs_top_srcdir' is needed so that `./configure' finds install-sh.
# Using --srcdir is more expensive.
m4_define([AT_CHECK_CONFIGURE],
[AT_CHECK([top_srcdir=$top_srcpath ./configure $1],
[AT_CHECK([top_srcdir=$abs_top_srcdir ./configure $1],
[$2],
m4_default([$3], [ignore]), [$4],
[test $at_verbose = echo && echo "$srcdir/AT_LINE: config.log" && cat config.log])])

2
tests/autoreconf.in
View File

@ -3,4 +3,4 @@
me=`echo "$0" | sed -e 's,.*[\\/],,'`
exec @top_buildpath@/bin/$me --autoconf-dir @top_buildpath@/lib ${1+"$@"}
exec @abs_top_builddir@/bin/$me --autoconf-dir @abs_top_builddir@/lib ${1+"$@"}

10
tests/tools.at
View File

@ -73,12 +73,12 @@ AT_CHECK([/bin/sh ./syntax.sh])
# Specify the path to the tool, some shells don't honor PATH when
# running `sh PROG'.
AT_CHECK([/bin/sh -n $top_buildpath/bin/autoconf], 0)
AT_CHECK([/bin/sh -n $abs_top_builddir/bin/autoconf], 0)
# These are not built, they are in the src tree.
AT_CHECK([/bin/sh -n $top_srcpath/config/install-sh], 0)
AT_CHECK([/bin/sh -n $top_srcpath/config/mkinstalldirs], 0)
AT_CHECK([/bin/sh -n $top_srcpath/config/missing], 0)
AT_CHECK([/bin/sh -n $abs_top_srcdir/config/install-sh], 0)
AT_CHECK([/bin/sh -n $abs_top_srcdir/config/mkinstalldirs], 0)
AT_CHECK([/bin/sh -n $abs_top_srcdir/config/missing], 0)
AT_CLEANUP
@ -96,7 +96,7 @@ AT_SETUP([Syntax of the Perl scripts])
# | ./autom4te syntax OK
# Ignore it, it might change between releases.
m4_define([AT_CHECK_PERL_SYNTAX],
[AT_CHECK([autom4te_perllibdir=$top_srcpath/lib $PERL -c $top_buildpath/bin/$1],
[AT_CHECK([autom4te_perllibdir=$abs_top_srcdir/lib $PERL -c $abs_top_builddir/bin/$1],
0, [], [ignore])])
AT_CHECK_PERL_SYNTAX([autoheader])

12
tests/wrappl.in
View File

@ -9,21 +9,21 @@ me=`echo "$0" | sed -e 's,.*[\\/],,'`
# autoconf which runs autom4te) because by themselves, they try to use
# subtools from the same directory (i.e., foo/autoheader will run
# foo/autoconf etc.).
autom4te_perllibdir=@top_srcpath@/lib
autom4te_perllibdir=@abs_top_srcdir@/lib
export autom4te_perllibdir
case $me in
ifnames)
# Does not have lib files.
exec @top_buildpath@/bin/$me ${1+"$@"}
exec @abs_top_builddir@/bin/$me ${1+"$@"}
;;
autom4te)
AUTOM4TE_CFG=@top_buildpath@/lib/autom4te.cfg
AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
export AUTOM4TE_CFG
;;
esac
# We might need files from build (frozen files), in addition of src files.
exec @top_buildpath@/bin/$me \
-I @top_buildpath@/lib \
-I @top_srcpath@/lib ${1+"$@"}
exec @abs_top_builddir@/bin/$me \
-I @abs_top_builddir@/lib \
-I @abs_top_srcdir@/lib ${1+"$@"}

2
tests/wrapsh.in
View File

@ -3,4 +3,4 @@
me=`echo "$0" | sed -e 's,.*[\\/],,'`
exec @top_buildpath@/bin/$me --include @top_buildpath@/lib ${1+"$@"}
exec @abs_top_builddir@/bin/$me --include @abs_top_builddir@/lib ${1+"$@"}