svn commit: samba r15551 - in branches/SAMBA_4_0/source: . build/smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-12 22:21:44 +0000 (Fri, 12 May 2006)
New Revision: 15551

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15551

Log:
Fix clash between config.pm and globally installed Config.pm on 
case-insensitive filesystems. Patch by John Malmberg tweaked by me

Modified:
   branches/SAMBA_4_0/source/build/smb_build/input.pm
   branches/SAMBA_4_0/source/build/smb_build/main.pl
   branches/SAMBA_4_0/source/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2006-05-12 21:31:52 UTC (rev 15550)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2006-05-12 22:21:44 UTC (rev 15551)
@@ -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;
 

Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl	2006-05-12 21:31:52 UTC (rev 15550)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl	2006-05-12 22:21:44 UTC (rev 15551)
@@ -13,7 +13,7 @@
 use smb_build::env;
 use smb_build::cflags;
 use smb_build::summary;
-use config;
+use smb_build::config;
 use strict;
 
 my $INPUT = {};

Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2006-05-12 21:31:52 UTC (rev 15550)
+++ branches/SAMBA_4_0/source/configure.in	2006-05-12 22:21:44 UTC (rev 15551)
@@ -88,8 +88,8 @@
 
 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;