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

Conflicts:

	source/headermap.txt
(This used to be commit 1b084e85c1f5963d924f7764ae751f8cd8e57364)

diff --cc source4/headermap.txt
index 7984149837dc9b28ac87b899f80033f55d6ec1c3,670b14c95659caa1e2cb1052db4f93d45e0f7971..fbfc56e127436ac923caf319ff5c105dd6844f8e
--- 1/source4/headermap.txt
--- 2/source4/headermap.txt
+++ b/source4/headermap.txt
@@@ -66,6 -66,8 +66,8 @@@ param/share.h: share.
  lib/util/util_tdb.h: util_tdb.h
  lib/util/util_ldb.h: util_ldb.h
  lib/util/wrap_xattr.h: wrap_xattr.h
+ lib/events/events.h: events/events.h
+ lib/events/events_internal.h: events/events_internal.h
  libcli/ldap/ldap_ndr.h: ldap_ndr.h
 -libcli/wbclient/wbclient.h: wbclient/wbclient.h
 -lib/gencache/gencache.h: gencache.h
 +lib/events/events.h: events.h
 +lib/events/events_internal.h: events_internal.h

diff --cc source4/pidl/config.m4
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8b8bc5acf02a46d280d73566126b9e5c91eedb26
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/source4/pidl/config.m4
@@@ -1,0 -1,0 +1,9 @@@
++# Check whether ExtUtils::ExtMaker is available
++
++if perl -e "use ExtUtils::MakeMaker" 2>/dev/null; then
++      HAVE_PERL_EXTUTILS_MAKEMAKER=1
++else
++      HAVE_PERL_EXTUTILS_MAKEMAKER=0
++fi
++
++AC_SUBST(HAVE_PERL_EXTUTILS_MAKEMAKER)