Configure changes for new-style version numbers (from Andy Dougherty,

slightly altered)

p4raw-id: //depot/perl@4771

5 files changed, 37 insertions, 19 deletions

diff --git a/win32/Makefile b/win32/Makefile
index 79edfc2bad..6cfb264612 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -29,7 +29,7 @@ INST_TOP	= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER	= \5.00563
+INST_VER	= \5.00564
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -47,7 +47,7 @@ INST_ARCH	= \$(ARCHNAME)
 #
 # uncomment to enable threads-capabilities
 #
-#USE_THREADS	= define
+#USE_5005THREADS= define
 
 #
 # XXX WARNING! This option currently undergoing changes.  May be broken.
@@ -203,7 +203,7 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 
 !IF "$(USE_OBJECT)" == "define"
 PERL_MALLOC	= undef
-USE_THREADS	= undef
+USE_5005THREADS	= undef
 USE_MULTI	= undef
 USE_IMP_SYS	= define
 !ENDIF
@@ -212,11 +212,11 @@ USE_IMP_SYS	= define
 PERL_MALLOC	= undef
 !ENDIF
 
-!IF "$(USE_THREADS)" == ""
-USE_THREADS	= undef
+!IF "$(USE_5005THREADS)" == ""
+USE_5005THREADS	= undef
 !ENDIF
 
-!IF "$(USE_THREADS)" == "define"
+!IF "$(USE_5005THREADS)" == "define"
 USE_ITHREADS	= undef
 !ENDIF
 
@@ -236,7 +236,7 @@ USE_ITHREADS	= undef
 USE_IMP_SYS	= undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -255,7 +255,7 @@ PROCESSOR_ARCHITECTURE	= x86
 !IF "$(USE_OBJECT)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
 !ELSE
-!IF "$(USE_THREADS)" == "define"
+!IF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
 !IF "$(USE_MULTI)" == "define"
@@ -266,6 +266,10 @@ ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
 
+!IF "$(USE_ITHREADS)" == "define"
+ARCHNAME	= $(ARCHNAME)-thread
+!ENDIF
+
 # Visual Studio 98 specific
 !IF "$(CCTYPE)" == "MSVC60"
 
@@ -518,7 +522,7 @@ WIN32_SRC	=		\
 		.\win32.c	\
 		.\win32sck.c
 
-!IF "$(USE_THREADS)" == "define"
+!IF "$(USE_5005THREADS)" == "define"
 WIN32_SRC	= $(WIN32_SRC) .\win32thread.c 
 !ENDIF
 
@@ -715,7 +719,9 @@ CFG_VARS	=					\
 		"static_ext=$(STATIC_EXT)"		\
 		"dynamic_ext=$(DYNAMIC_EXT)"		\
 		"nonxs_ext=$(NONXS_EXT)"		\
-		"usethreads=$(USE_THREADS)"		\
+		"use5005threads=$(USE_5005THREADS)"	\
+		"useithreads=$(USE_ITHREADS)"		\
+		"usethreads=$(USE_5005THREADS)"		\
 		"usemultiplicity=$(USE_MULTI)"		\
 		"LINK_FLAGS=$(LINK_FLAGS:"=\")"		\
 		"optimize=$(OPTIMIZE:"=\")"
diff --git a/win32/config.bc b/win32/config.bc
index 81ec602bac..915c733c7f 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -685,8 +685,10 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
+use5005threads='undef'
 use64bits='undef'
 usedl='define'
+useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
 uselonglong='undef'
diff --git a/win32/config.gc b/win32/config.gc
index ff2da5726b..a5f8d4087c 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -685,8 +685,10 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long long'
+use5005threads='undef'
 use64bits='undef'
 usedl='define'
+useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
 uselonglong='undef'
diff --git a/win32/config.vc b/win32/config.vc
index a294dbcf43..4428c470fa 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -685,8 +685,10 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
+use5005threads='undef'
 use64bits='undef'
 usedl='define'
+useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
 uselonglong='undef'
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 9bdcf3d796..b7bf93fcf2 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,7 @@ INST_TOP	*= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER	*= \5.00563
+INST_VER	*= \5.00564
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -51,7 +51,7 @@ INST_ARCH	*= \$(ARCHNAME)
 #
 # uncomment to enable threads-capabilities
 #
-#USE_THREADS	*= define
+#USE_5005THREADS	*= define
 
 #
 # XXX WARNING! This option currently undergoing changes.  May be broken.
@@ -228,16 +228,16 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 
 .IF "$(USE_OBJECT)" == "define"
 PERL_MALLOC	!= undef
-USE_THREADS	!= undef
+USE_5005THREADS	!= undef
 USE_MULTI	!= undef
 USE_IMP_SYS	!= define
 .ENDIF
 
 PERL_MALLOC	*= undef
 
-USE_THREADS	*= undef
+USE_5005THREADS	*= undef
 
-.IF "$(USE_THREADS)" == "define"
+.IF "$(USE_5005THREADS)" == "define"
 USE_ITHREADS	!= undef
 .ENDIF
 
@@ -246,7 +246,7 @@ USE_OBJECT	*= undef
 USE_ITHREADS	*= undef
 USE_IMP_SYS	*= undef
 
-.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
+.IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT	+= -DPERL_IMPLICIT_CONTEXT
 .ENDIF
 
@@ -264,7 +264,7 @@ PROCESSOR_ARCHITECTURE *= x86
 
 .IF "$(USE_OBJECT)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
-.ELIF "$(USE_THREADS)" == "define"
+.ELIF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 .ELIF "$(USE_MULTI)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
@@ -272,6 +272,10 @@ ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)
 .ENDIF
 
+.IF "$(USE_OBJECT)" == "define"
+ARCHNAME	= $(ARCHNAME)-thread
+.ENDIF
+
 # Visual Studio 98 specific
 .IF "$(CCTYPE)" == "MSVC60"
 
@@ -644,7 +648,7 @@ WIN32_SRC	=		\
 		.\win32.c	\
 		.\win32sck.c
 
-.IF "$(USE_THREADS)" == "define"
+.IF "$(USE_5005THREADS)" == "define"
 WIN32_SRC	+= .\win32thread.c 
 .ENDIF
 
@@ -843,7 +847,9 @@ CFG_VARS	=					\
 		static_ext=$(STATIC_EXT)	~	\
 		dynamic_ext=$(DYNAMIC_EXT)	~	\
 		nonxs_ext=$(NONXS_EXT)		~	\
-		usethreads=$(USE_THREADS)	~	\
+		use5005threads=$(USE_5005THREADS)	~	\
+		useithreads=$(USE_ITHREADS)	~	\
+		usethreads=$(USE_5005THREADS)	~	\
 		usemultiplicity=$(USE_MULTI)	~	\
 		LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)		~	\
 		optimize=$(OPTIMIZE)