Merge the two error messages when ac_unique_file is not found.

diff --git a/ChangeLog b/ChangeLog
index 02a390d6ebd4b6f23f6c07e2319eeecb2a976b89..d37391f771c67600c2bed87e323cd53b8e0eb84c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/general.m4 (_AC_INIT_SRCDIR): Merge the two error
+         messages when ac_unique_file is not found.
+
 2005-05-24  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Simplify the
@@ -35,7 +40,7 @@
 
 2005-05-20  Stepan Kasal  <kasal@ucw.cz>
 
-       * ./lib/autoconf/general.m4 (_AC_INIT_PREPARE): Simplify the init
+       * lib/autoconf/general.m4 (_AC_INIT_PREPARE): Simplify the init
          of confdefs.h .
 
 2005-05-17  Stepan Kasal  <kasal@ucw.cz>

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index a5b1c3286599e2b79d21b0d36ae5e185cdd3f995..c3db68fa119810ae0270608b82db6b1d4950c439 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -524,11 +524,8 @@ else
   ac_srcdir_defaulted=no
 fi
 if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $ac_confdir or ..])
-  else
-    AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $srcdir])
-  fi
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $srcdir])
 fi
 (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
   AC_MSG_ERROR([sources are in $srcdir, but `cd $srcdir' does not work])