Merge the two error messages when ac_unique_file is not found.

This commit is contained in:
Stepan Kasal 2005-05-24 07:24:49 +00:00
parent 220d13fef6
commit fbcb298898
2 changed files with 8 additions and 6 deletions

View File

@ -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>

View File

@ -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])