2005-08-04  Stepan Kasal  <address@hidden>

	* lib/autoconf/general.m4 (_AC_INIT_SRCDIR): When autodetecting,
	  try the current directory first.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.879
diff -u -c -r1.879 general.m4
*** lib/autoconf/general.m4	25 Jul 2005 18:10:25 -0000	1.879
--- lib/autoconf/general.m4	4 Aug 2005 10:29:06 -0000
***************
*** 474,492 ****
  [m4_divert_push([PARSE_ARGS])dnl
  
  # Find the source files, if location was not specified.
! if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
!   # Try the directory containing this script, then the parent directory.
!   ac_confdir=`AS_DIRNAME(["$[0]"])`
!   srcdir=$ac_confdir
!   if test ! -r "$srcdir/$ac_unique_file"; then
!     srcdir=..
    fi
- else
-   ac_srcdir_defaulted=no
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
!   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 ||
--- 474,499 ----
  [m4_divert_push([PARSE_ARGS])dnl
  
  # Find the source files, if location was not specified.
! if test "x$srcdir" != x; then
!   ac_srcdir_defaulted=no
! else
    ac_srcdir_defaulted=yes
!   # We have to try the current directory first, because srcdir != .
!   # would indicates a VPATH build.  Then we try the directory
!   # containing this script, and then the parent directory.
!   if test -r "./$ac_unique_file"; then
!     srcdir=.
!   else
!     ac_confdir=`AS_DIRNAME(["$[0]"])`
!     if test -r "$ac_confdir/$ac_unique_file"; then
!       srcdir=$ac_confdir
!     else
!       srcdir=..
!     fi
    fi
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
!   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 ||