2005-05-24  Stepan Kasal  <address@hidden>

	* lib/autoconf/general.m4  (_AC_INIT_SRCDIR): Merge the two error
	  messages when ac_unique_file is not found.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.857
diff -u -r1.857 general.m4
--- lib/autoconf/general.m4	20 May 2005 07:58:43 -0000	1.857
+++ lib/autoconf/general.m4	24 May 2005 05:34:36 -0000
@@ -524,11 +524,8 @@
   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])