Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir

(This used to be commit 74e1dd28f2f669bc196dc16b68c8b175bf835721)

diff --combined source4/configure.ac
index 693d4d7fbd8aa73f31d3823f34c17596f856d11a,7690e700a5f1e7aa51331864a816b883c3d69d4a..ca38f6add4d6bfeec416f3b147b95c9b234e4a17
--- 1/source4/configure.ac
--- 2/source4/configure.ac
+++ b/source4/configure.ac
@@@ -1,8 -1,7 +1,7 @@@
  dnl -*- mode: m4-mode -*-
  dnl Process this file with autoconf to produce a configure script.
  
- dnl disabled 2.53 requirement - we do work with 2.52 on suse 7.3 for example
- dnl AC_PREREQ(2.53)
+ AC_PREREQ(2.54)
  
  AC_INIT([samba],[4],[samba-technical@samba.org])
  
@@@ -14,7 -13,7 +13,7 @@@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Mar
  m4_include(build/m4/env.m4)
  m4_include(lib/replace/samba.m4)
  m4_include(lib/smbreadline/readline.m4)
- m4_include(heimdal_build/config.m4)
+ m4_include(heimdal_build/internal.m4)
  m4_include(lib/util/fault.m4)
  m4_include(lib/util/signal.m4)
  m4_include(lib/util/util.m4)
@@@ -184,8 -183,8 +183,8 @@@ SMB_WRITE_MAKEVARS(mkconfig.mk
  if test $USESHARED = true
  then
        echo "To run binaries without installing, set the following environment variable:"
 -      echo "$ac_cv_LIB_PATH_VAR=$builddir/bin/shared"
 +      echo "$LIB_PATH_VAR=$builddir/bin/shared"
  fi
  
  echo
 -echo "To build Samba, run $ac_cv_path_MAKE"
 +echo "To build Samba, run $MAKE"