Revert "s3-build: Remove --enable-merged support."
authorGünther Deschner <gd@samba.org>
Tue, 27 Apr 2010 16:00:43 +0000 (18:00 +0200)
committerGünther Deschner <gd@samba.org>
Tue, 27 Apr 2010 16:14:09 +0000 (18:14 +0200)
commit8f8e7c788a12d1e0bda9183ed765cc1048e105f7
tree21540af7a9a35e4a0ed8579fd773a6369e2d249e
parent158d41b6b4264e7ece93cf77a15e70ccbf8673b8
Revert "s3-build: Remove --enable-merged support."

This reverts commit f8fc7fcbeb8141c5b2775e2219bae17c55ad4a3c.

Was that pushed by coincidence ? merged build is really, really required over
here.
source3/configure.in
source3/samba4-templates.mk [new file with mode: 0644]
source3/samba4.m4 [new file with mode: 0644]
source3/samba4.mk [new file with mode: 0644]