8 files changed, 21 insertions, 16 deletions
diff --git a/source4/build/smb_build/config_mk.pl b/source4/build/smb_build/config_mk.pm
index 7a85bfa24b..eaf7079352 100644
--- a/source4/build/smb_build/config_mk.pl
+++ b/source4/build/smb_build/config_mk.pm
@@ -432,3 +432,4 @@ sub binary_get_array($$$)
 
 	return _fetch_array_from_config_mk($filename,$section,$var);
 }
+1;
diff --git a/source4/build/smb_build/core.m4 b/source4/build/smb_build/core.m4
index 0249c7e2d9..8f0959208c 100644
--- a/source4/build/smb_build/core.m4
+++ b/source4/build/smb_build/core.m4
@@ -21,29 +21,16 @@ AC_DEFUN([_SMB_BUILD_CORE],
 echo "config.status: creating ./config.smb_build.pl"
 
 cat > config.smb_build.pl <<\_SMB_ACEOF
-#!$PERL
+#!$PERL -I$srcdir/build/smb_build
 #
 
 use strict;
 
 my \$SMB_BUILD_CTX;
 
-_SMB_ACEOF
+use main;
 
-echo "#line 1 \"build/smb_build/config_mk.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/config_mk.pl
-echo "#line 1 \"build/smb_build/input.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/input.pl
-echo "#line 1 \"build/smb_build/depend.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/depend.pl
-echo "#line 1 \"build/smb_build/output.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/output.pl
-echo "#line 1 \"build/smb_build/makefile.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/makefile.pl
-echo "#line 1 \"build/smb_build/smb_build_h.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/smb_build_h.pl
-echo "#line 1 \"build/smb_build/main.pl\"" >> config.smb_build.pl
-cat >> config.smb_build.pl < build/smb_build/main.pl
+_SMB_ACEOF
 
 echo "#line 8 \"build/smb_build/core.m4\"" >> config.smb_build.pl
 cat >> config.smb_build.pl <<\_SMB_ACEOF
diff --git a/source4/build/smb_build/depend.pl b/source4/build/smb_build/depend.pm
index a45fb725e1..771a83ca2c 100644
--- a/source4/build/smb_build/depend.pl
+++ b/source4/build/smb_build/depend.pm
@@ -456,3 +456,4 @@ sub create_depend($)
 
 	return;
 }
+1;
diff --git a/source4/build/smb_build/input.pl b/source4/build/smb_build/input.pm
index 8488a33c3c..d3737ea7d1 100644
--- a/source4/build/smb_build/input.pl
+++ b/source4/build/smb_build/input.pm
@@ -137,3 +137,4 @@ sub check_input($)
 
 	return;
 }
+1;
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pm
index 18d3de3991..4df7be7dae 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pm
@@ -6,8 +6,17 @@
 ###  Released under the GNU GPL				###
 ###########################################################
 
+use makefile;
+use depend;
+use smb_build_h;
+use input;
+use config_mk;
+use output;
+use strict;
+
 sub smb_build_main($)
 {
+	my $SMB_BUILD_CTX = shift;
 	check_input($SMB_BUILD_CTX);
 
 	create_depend($SMB_BUILD_CTX);
@@ -20,3 +29,4 @@ sub smb_build_main($)
 
 	return 0;
 }
+1;
diff --git a/source4/build/smb_build/makefile.pl b/source4/build/smb_build/makefile.pm
index a5e86e76f0..0e0da317f5 100644
--- a/source4/build/smb_build/makefile.pl
+++ b/source4/build/smb_build/makefile.pm
@@ -913,3 +913,5 @@ sub create_makefile_in($)
 	print "config.smb_build.pl: creating Makefile.in\n";
 	return;	
 }
+
+1;
diff --git a/source4/build/smb_build/output.pl b/source4/build/smb_build/output.pm
index 800f743efe..42b4403e73 100644
--- a/source4/build/smb_build/output.pl
+++ b/source4/build/smb_build/output.pm
@@ -260,3 +260,5 @@ sub create_output($)
 
 	return;
 }
+
+1;
diff --git a/source4/build/smb_build/smb_build_h.pl b/source4/build/smb_build/smb_build_h.pm
index cd6cb29525..bc12b9a268 100644
--- a/source4/build/smb_build/smb_build_h.pl
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -130,3 +130,4 @@ sub create_smb_build_h($)
 	print "config.smb_build.pl: creating include/smb_build.h\n";
 	return;	
 }
+1;