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

  of absolute paths.

diff --git a/ChangeLog b/ChangeLog
index dd6afcb14ace70b4021d4e5314ffd663b49d946a..b1e675b093c1b98999040b30e4b0bc07834d53ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index d92c2de94d4652d7387bb8e013a0d2ed39237a2b..b89017aa83abc6239347fd0be0439f842a70188d 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -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