[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-313-g3e2c067

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  3e2c067ec734d8c14006ce9bec75a8ffccbf72c1 (commit)
       via  32da606e3759026c2744f853cd8948333ed0579c (commit)
      from  bd089818a3182698dfe85039c1b2e22d8c2835bb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 3e2c067ec734d8c14006ce9bec75a8ffccbf72c1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat May 10 00:48:11 2008 +0200

    Fix location of torture pc file.

commit 32da606e3759026c2744f853cd8948333ed0579c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat May 10 00:46:25 2008 +0200

    Fix installation of pidl perl files, torture pc file.

-----------------------------------------------------------------------

Summary of changes:
 source/configure.ac                    |    2 +-
 source/lib/torture/config.mk           |    3 +++
 source/{ => lib}/torture/torture.pc.in |    0 
 source/librpc/config.mk                |    2 +-
 source/pidl/config.mk                  |    2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 rename source/{ => lib}/torture/torture.pc.in (100%)


Changeset truncated at 500 lines:

diff --git a/source/configure.ac b/source/configure.ac
index 66fb696..a845082 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -31,7 +31,7 @@ m4_include(pidl/config.m4)
 AC_CONFIG_FILES(lib/registry/registry.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(librpc/ndr.pc)
-AC_CONFIG_FILES(torture/torture.pc)
+AC_CONFIG_FILES(lib/torture/torture.pc)
 AC_CONFIG_FILES(auth/gensec/gensec.pc)
 AC_CONFIG_FILES(param/samba-hostconfig.pc)
 AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
diff --git a/source/lib/torture/config.mk b/source/lib/torture/config.mk
index e981ee0..15c6478 100644
--- a/source/lib/torture/config.mk
+++ b/source/lib/torture/config.mk
@@ -5,6 +5,9 @@ PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL \
 		LIBTALLOC
 
+TORTURE_VERSION = 0.0.1
+TORTURE_SO_VERSION = 0
+
 PC_FILES += lib/torture/torture.pc
 torture_OBJ_FILES = $(addprefix lib/torture/, torture.o)
 
diff --git a/source/torture/torture.pc.in b/source/lib/torture/torture.pc.in
similarity index 100%
rename from source/torture/torture.pc.in
rename to source/lib/torture/torture.pc.in
diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index 11a320a..527fec9 100644
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -340,7 +340,7 @@ NDR_WINSREPL_OBJ_FILES = librpc/gen_ndr/ndr_winsrepl.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
 
 NDR_WINBIND_OBJ_FILES = librpc/gen_ndr/ndr_winbind.o
-PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
+#PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
 
 librpc/idl-deps:
 	./librpc/idl-deps.pl librpc/idl/*.idl >$@
diff --git a/source/pidl/config.mk b/source/pidl/config.mk
index 25cea49..19b2d53 100644
--- a/source/pidl/config.mk
+++ b/source/pidl/config.mk
@@ -6,7 +6,7 @@ pidl-testcov: pidl/Makefile
 
 installpidl:: pidl/Makefile
 	$(MAKE) -C pidl install_vendor VENDORPREFIX=$(prefix) \
-		                           INSTALLVENDORLIB=$(libdir) \
+		                           INSTALLVENDORLIB=$(datarootdir)/perl5 \
 								   INSTALLVENDORBIN=$(bindir) \
 								   INSTALLVENDORSCRIPT=$(bindir) \
 								   INSTALLVENDORMAN1DIR=$(mandir)/man1 \


-- 
Samba Shared Repository