Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:02:17 +0000 (16:02 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:02:17 +0000 (16:02 +0200)
Conflicts:

source/headermap.txt

1  2 
source/headermap.txt
source/pidl/config.m4

@@@ -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
index 0000000,0000000..8b8bc5a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -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)