diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-12 22:21:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:55 -0500 |
| commit | 4ff9e1c761a26bd31c782c771ef99a14916ed161 (patch) | |
| tree | 1574ea9d3d9a79f32b9e251afe24ae986aa1dd13 | |
| parent | 36a64c56b4debe814284c2fc742ad75bdd7a249e (diff) | |
| download | samba-4ff9e1c761a26bd31c782c771ef99a14916ed161.tar.gz samba-4ff9e1c761a26bd31c782c771ef99a14916ed161.tar.bz2 samba-4ff9e1c761a26bd31c782c771ef99a14916ed161.zip | |
r15551: Fix clash between config.pm and globally installed Config.pm on
case-insensitive filesystems. Patch by John Malmberg tweaked by me
(This used to be commit 58cc0b23eb1de818123b3b34278518e467f04f15)
| -rw-r--r-- | source4/build/smb_build/input.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 | ||||
| -rw-r--r-- | source4/configure.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 16306955a9..b07c9b1a07 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/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/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index d89be4bebf..908222d504 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/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/source4/configure.in b/source4/configure.in index 48e000be34..4e8cd8b14c 100644 --- a/source4/configure.in +++ b/source4/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; |