21 Commits

Author	SHA1	Message	Date
Jelmer Vernooij	8f763308bc	Add *test4 rules to merged build Makefile, to allow running the Samba 4 tests against Samba 4. (doesn't work yet).	2008-11-02 16:38:27 +01:00
Jelmer Vernooij	c9f69f1436	Fix installation of Samba 4 during merged build.	2008-10-30 23:19:51 +01:00
Jelmer Vernooij	9d679c9a67	Fix merged build paths.	2008-10-24 04:18:47 +02:00
Jelmer Vernooij	f36e51617c	Don't include a (relative path) srcdir in samba4-data.mk.	2008-10-21 18:49:43 +02:00
Jelmer Vernooij	3678a98dcd	Remove duplicate searching of Samba 4 directory for tags.	2008-10-21 16:03:45 +02:00
Jelmer Vernooij	17e9d49915	Fix include flags for merged build.	2008-10-15 15:17:31 +02:00
Jelmer Vernooij	cbe4f1b4fa	Move zlib to top-level root.	2008-10-12 18:29:36 +02:00
Jelmer Vernooij	a19719ccea	Fix libutil path.	2008-10-11 21:32:48 +02:00
Jelmer Vernooij	08223692c6	fix libclinbtsrcdir variable.	2008-10-08 12:03:45 +02:00
Stefan Metzmacher	943387edc1	build: fix the libcryptosrcdir for the merged build ... metze	2008-09-24 23:11:13 +02:00
Jelmer Vernooij	1ca2e4b99f	Use new binary name in merged build.	2008-09-24 04:41:30 +02:00
Günther Deschner	1ea185a340	s3: fix merged_build. ... Guenther	2008-09-24 03:30:50 +02:00
Jelmer Vernooij	bc794246df	Fix merged build.	2008-09-21 23:57:59 +02:00
Jelmer Vernooij	661d25402e	Fix pidl/config.m4 location.	2008-09-17 18:57:40 +02:00
Jelmer Vernooij	7106cd9fd5	Fix merged build.	2008-09-17 14:25:25 +02:00
Jelmer Vernooij	cda87628bc	Fix merged build.	2008-09-16 17:22:03 +02:00
Jelmer Vernooij	9ef623beda	Merge branch 'singlepopt' into single ... Conflicts: source4/Makefile	2008-09-16 17:20:54 +02:00
Jelmer Vernooij	c8bff39df6	Use a single copy of popt in samba3 and samba4.	2008-09-16 17:20:16 +02:00
Jelmer Vernooij	80a5da73e9	Share talloc source code between Samba 3 and Samba 4.	2008-09-16 14:36:41 +02:00
Jelmer Vernooij	99d4af748f	Use new Samba 4 source location.	2008-09-15 14:32:58 +02:00
Jelmer Vernooij	c592ec0e13	Import merged build patch.	2008-09-15 14:30:15 +02:00