build: autogenarate VPATH by configure

metze
(This used to be commit 16147753adcdbdc0ee9faa16fafb1c74240a6858)

diff --git a/source4/Makefile b/source4/Makefile
index fba06ccfa9f9937a82ccaed292523c617bd602a1..93e3ceb72f44a58e60b90a6c478466aa055f0f54 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -10,8 +10,6 @@ include mkconfig.mk
 
 pidldir := $(srcdir)/pidl
 
-VPATH = $(builddir):$(srcdir):$(srcdir)/heimdal_build:$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
-
 BASEDIR = $(prefix)
 TORTUREDIR = $(libdir)/torture
 SWATDIR = $(datadir)/swat

diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 9510a8ee0d0bb0ecdf6bb44ae2a138412aa7a6d2..6c040b9babc276a5563a810f149e4292506b1031 100644 (file)
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -16,6 +16,9 @@ export builddir;
 
 AC_SUBST(datarootdir)
 
+AC_SUBST(VPATH)
+VPATH="\$(builddir):\$(srcdir)"
+
 SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
 

diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index e1e495d69bb33ee4ce0a767f483bd34efb3da8c8..f83fdf74602997483e7d8814de0c6f22778a9fcc 100644 (file)
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -255,3 +255,7 @@ if test t$ac_cv_func_getprogname != tyes; then
        SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES)
        SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, YES)
 fi
+
+VPATH="$VPATH:\$(HEIMDAL_VPATH)"
+
+SMB_INCLUDE_MK(heimdal_build/internal.mk)

diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 264a5c2f1c601b23b20f8cb81491e89373c8ebe0..81c90c8ea2bef3ac9c240cc3a7481bd0271a6b6f 100644 (file)
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -1,5 +1,7 @@
 heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build
 
+HEIMDAL_VPATH = $(heimdalbuildsrcdir):$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
+
 #######################
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]

diff --git a/source4/main.mk b/source4/main.mk
index f0ce9685f9b62c89f18d73a6a57b1edd9c849ee5..28db54c10f78035cd27bc868cbf1bb0373538f24 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,5 +1,4 @@
 mkinclude dynconfig/config.mk
-mkinclude heimdal_build/internal.mk
 mkinclude config.mk
 mkinclude dsdb/config.mk
 mkinclude smbd/config.mk