summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Hay <SteveHay@planit.com>2005-03-31 14:36:44 +0000
committerSteve Hay <SteveHay@planit.com>2005-03-31 14:36:44 +0000
commit394255e0cb5f21d1c945968ba7ae7c0fcdb03757 (patch)
treeb2a4a63866a0c3557bdb8009cf15a9ed7b742fc3
parent9ff75b3baa7e5c46b246cab0b2dea110471b99a1 (diff)
downloadperl-394255e0cb5f21d1c945968ba7ae7c0fcdb03757.tar.gz
Add support for USE_SITECUSTOMIZE in the Win32 makefiles
Note that this feature doesn't actually work correctly on Win32 until the problem described here is solved: http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2005-03/msg00740.html p4raw-id: //depot/perl@24120
-rw-r--r--win32/Makefile18
-rw-r--r--win32/config.bc1
-rw-r--r--win32/config.gc1
-rw-r--r--win32/config.vc1
-rw-r--r--win32/config.vc641
-rw-r--r--win32/makefile.mk14
6 files changed, 36 insertions, 0 deletions
diff --git a/win32/Makefile b/win32/Makefile
index d63d6023b9..a062526a24 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -46,6 +46,14 @@ INST_TOP = $(INST_DRV)\perl
#INST_ARCH = \$(ARCHNAME)
#
+# Uncomment this if you want perl to run
+# $Config{sitelibexp}\sitecustomize.pl
+# before anything else. This script can then be set up, for example,
+# to add additional entries to @INC.
+#
+#USE_SITECUST = define
+
+#
# uncomment to enable multiple interpreters. This is need for fork()
# emulation and for thread support.
#
@@ -160,6 +168,7 @@ CCLIBDIR = $(CCHOME)\lib
# Additional compiler flags can be specified here.
#
+#
# Adding -DPERL_HASH_SEED_EXPLICIT will disable randomization of Perl's
# internal hash function unless the PERL_HASH_SEED environment variable is set.
# Alternatively, adding -DNO_HASH_SEED will completely disable the
@@ -234,6 +243,10 @@ DEBUG_MSTATS = undef
BUILDOPT = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
!ENDIF
+!IF "$(USE_SITECUST)" == ""
+USE_SITECUST = undef
+!ENDIF
+
!IF "$(USE_MULTI)" == ""
USE_MULTI = undef
!ENDIF
@@ -266,6 +279,10 @@ USE_MULTI = define
USE_MULTI = define
!ENDIF
+!IF "$(USE_SITECUST)" == "define"
+BUILDOPT = $(BUILDOPT) -DUSE_SITECUSTOMIZE
+!ENDIF
+
!IF "$(USE_MULTI)" != "undef"
BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
!ENDIF
@@ -835,6 +852,7 @@ CFG_VARS = \
"usemultiplicity=$(USE_MULTI)" \
"useperlio=$(USE_PERLIO)" \
"uselargefiles=$(USE_LARGE_FILES)" \
+ "usesitecustomize=$(USE_SITECUST)" \
"LINK_FLAGS=$(LINK_FLAGS:"=\")" \
"optimize=$(OPTIMIZE:"=\")"
diff --git a/win32/config.bc b/win32/config.bc
index c920a4121f..55c8562d12 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -923,6 +923,7 @@ useposix='true'
usereentrant='undef'
usesfio='false'
useshrplib='yes'
+usesitecustomize='~USE_SITECUST~'
usesocks='undef'
usethreads='undef'
usevendorprefix='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 925eab21f5..03f34d6d01 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -922,6 +922,7 @@ useposix='true'
usereentrant='undef'
usesfio='false'
useshrplib='yes'
+usesitecustomize='~USE_SITECUST~'
usesocks='undef'
usethreads='undef'
usevendorprefix='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 3c97a0b758..d0a3a3cec8 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -922,6 +922,7 @@ useposix='true'
usereentrant='undef'
usesfio='false'
useshrplib='yes'
+usesitecustomize='~USE_SITECUST~'
usesocks='undef'
usethreads='undef'
usevendorprefix='undef'
diff --git a/win32/config.vc64 b/win32/config.vc64
index 39946428f7..de484fe3ac 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -922,6 +922,7 @@ useposix='true'
usereentrant='undef'
usesfio='false'
useshrplib='yes'
+usesitecustomize='~USE_SITECUST~'
usesocks='undef'
usethreads='undef'
usevendorprefix='undef'
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 9e11fec277..5502526bdb 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -48,6 +48,14 @@ INST_TOP *= $(INST_DRV)\perl
#INST_ARCH *= \$(ARCHNAME)
#
+# Uncomment this if you want perl to run
+# $Config{sitelibexp}\sitecustomize.pl
+# before anything else. This script can then be set up, for example,
+# to add additional entries to @INC.
+#
+#USE_SITECUST *= define
+
+#
# uncomment to enable multiple interpreters. This is need for fork()
# emulation and for thread support.
#
@@ -251,6 +259,7 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT
PERL_MALLOC *= undef
DEBUG_MSTATS *= undef
+USE_SITECUST *= undef
USE_MULTI *= undef
USE_ITHREADS *= undef
USE_IMP_SYS *= undef
@@ -278,6 +287,10 @@ USE_MULTI != define
USE_MULTI != define
.ENDIF
+.IF "$(USE_SITECUST)" == "define"
+BUILDOPT += -DUSE_SITECUSTOMIZE
+.ENDIF
+
.IF "$(USE_MULTI)" != "undef"
BUILDOPT += -DPERL_IMPLICIT_CONTEXT
.ENDIF
@@ -885,6 +898,7 @@ CFG_VARS = \
usemultiplicity=$(USE_MULTI) ~ \
useperlio=$(USE_PERLIO) ~ \
uselargefiles=$(USE_LARGE_FILES) ~ \
+ usesitecustomize=$(USE_SITECUST) ~ \
LINK_FLAGS=$(LINK_FLAGS:s,\,$B,) ~ \
optimize=$(OPTIMIZE)