* lib/autoconf/status.m4 (_AC_SRCDIRS): Simplify the computation

of absolute paths.
This commit is contained in:
Paul Eggert 2005-05-12 23:46:42 +00:00
parent 9ce265f05c
commit d2e7431e9e
2 changed files with 14 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2005-05-12 Stepan Kasal <address@hidden>
* lib/autoconf/status.m4 (_AC_SRCDIRS): Simplify the computation
of absolute paths.
2005-05-11 Stepan Kasal <kasal@ucw.cz>
* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Make the check

View File

@ -144,6 +144,8 @@ if test $1 != .; then
else
ac_dir_suffix= ac_top_builddir=
fi
ac_abs_top_builddir=$ac_pwd
ac_abs_builddir=$ac_pwd$ac_dir_suffix
case $srcdir in
.) # No --srcdir option. We are building in place.
@ -152,22 +154,18 @@ case $srcdir in
ac_top_srcdir=.
else
ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
fi ;;
fi
ac_abs_top_srcdir=$ac_pwd ;;
[[\\/]]* | ?:[[\\/]]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
ac_top_srcdir=$srcdir ;;
ac_top_srcdir=$srcdir
ac_abs_top_srcdir=$srcdir ;;
*) # Relative name.
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
ac_top_srcdir=$ac_top_builddir$srcdir
ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
# Do not use `cd foo && pwd` to compute absolute names, because
# the directories may not exist.
AS_SET_CATFILE([ac_abs_builddir], [$ac_pwd], [$1])
AS_SET_CATFILE([ac_abs_top_builddir],
[$ac_abs_builddir], [${ac_top_builddir}.])
AS_SET_CATFILE([ac_abs_srcdir], [$ac_abs_builddir], [$ac_srcdir])
AS_SET_CATFILE([ac_abs_top_srcdir], [$ac_abs_builddir], [$ac_top_srcdir])
ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
])# _AC_SRCDIRS