From faa3dec34a67b59fc7e733a2ce3a9d9f2cb34b2d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 4 Apr 2008 16:03:54 +0200 Subject: Install pidl by default if ExtUtils::MakeMaker is available. This should make the build process for openchange users easier. (This used to be commit 7fccd85cc673c139bc1d57915e0fccd22316998c) --- source4/configure.ac | 1 + source4/libcli/wbclient/config.mk | 2 -- source4/pidl/config.mk | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source4/configure.ac b/source4/configure.ac index 01f514e859..66fb69694e 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -26,6 +26,7 @@ m4_include(lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(nsswitch/nsstest.m4) +m4_include(pidl/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) AC_CONFIG_FILES(librpc/dcerpc.pc) diff --git a/source4/libcli/wbclient/config.mk b/source4/libcli/wbclient/config.mk index 32f2f5aeed..9384a172ff 100644 --- a/source4/libcli/wbclient/config.mk +++ b/source4/libcli/wbclient/config.mk @@ -2,5 +2,3 @@ OBJ_FILES = wbclient.o PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING - -PUBLIC_HEADERS += libcli/wbclient/wbclient.h diff --git a/source4/pidl/config.mk b/source4/pidl/config.mk index c469afa1f5..0d36473ade 100644 --- a/source4/pidl/config.mk +++ b/source4/pidl/config.mk @@ -7,6 +7,10 @@ pidl-testcov: pidl/Makefile installpidl:: pidl/Makefile $(MAKE) -C pidl install_vendor PREFIX=$(prefix) +ifeq ($(HAVE_PERL_EXTUTILS_MAKEMAKER),1) +install:: installpidl +endif + idl_full:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL -- cgit