r15551: Fix clash between config.pm and globally installed Config.pm on

case-insensitive filesystems. Patch by John Malmberg tweaked by me

diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 16306955a9de3c6ff13a3c0b742fc2a62f6698f8..b07c9b1a07c9ab703e2407667126f68264a592f9 100644 (file)
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -5,7 +5,7 @@
 #  Copyright (C) Jelmer Vernooij 2004
 #  Released under the GNU GPL
 
-use config;
+use smb_build::config;
 use strict;
 package smb_build::input;
 

diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index d89be4bebfda58443173edb5ca44830b1e55735d..908222d504ba88b3fbdb8e970c1ba9e872c2477d 100644 (file)
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -13,7 +13,7 @@ use smb_build::output;
 use smb_build::env;
 use smb_build::cflags;
 use smb_build::summary;
-use config;
+use smb_build::config;
 use strict;
 
 my $INPUT = {};

diff --git a/source/configure.in b/source/configure.in
index 48e000be346518ae3a9d73db491e4d0f72f506de..4e8cd8b14c0fbd73b9265cb5f994474f6627280f 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -88,8 +88,8 @@ CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 
 AC_SUBST(ac_default_prefix)
 
-echo "configure: creating config.pm"
-cat >config.pm<<CEOF
+echo "configure: creating build/smb_build/config.pm"
+cat >${srcdir}/build/smb_build/config.pm<<CEOF
 # config.pm - Autogenerate by configure. DO NOT EDIT!
 
 package config;