[win32] various tweaks to build support (NOTE: meant for 5.004_57)

[p5sagit/p5-mst-13.2.git] / win32 / config_H.vc

diff --git a/win32/config_H.vc b/win32/config_H.vc
index 552d74d..42578ba 100644 (file)
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -47,7 +47,7 @@
  *     where library files may be held under a private library, for
  *     instance.
  */
-#define ARCHNAME "MSWin32"             /**/
+#define ARCHNAME "MSWin32-x86-thread"          /**/
 
 /* BIN:
  *     This symbol holds the path of the bin directory where the package will
@@ -352,7 +352,7 @@
  *     This symbol, if defined, indicates that the getlogin routine is
  *     available to get the login name.
  */
-/*#define HAS_GETLOGIN         /**/
+#define HAS_GETLOGIN           /**/
 
 /* HAS_GETPGRP2:
  *     This symbol, if defined, indicates that the getpgrp2() (as in DG/UX)
@@ -1466,9 +1466,8 @@
  *     This symbol contains the ~name expanded version of ARCHLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\lib"                /**/
-#define ARCHLIB_EXP (win32PerlLibPath())       /**/
-#define APPLLIB_EXP (win32SiteLibPath())       /**/
+#define ARCHLIB "c:\\perl\\lib\\MSWin32-x86-thread"            /**/
+#define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))        /**/
 
 /* BINCOMPAT3:
  *     This symbol, if defined, indicates that Perl 5.004 should be
@@ -1715,7 +1714,7 @@
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define PRIVLIB "c:\\perl\\lib"                /**/
-#define PRIVLIB_EXP "c:\\perl\\lib"            /**/
+#define PRIVLIB_EXP (win32_perllib_path(NULL)) /**/
 
 /* SH_PATH:
  *     This symbol contains the full pathname to the shell used on this
@@ -1771,7 +1770,7 @@
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define SITEARCH "c:\\perl\\lib\\site"         /**/
-#define SITEARCH_EXP "c:\\perl\\lib\\site"             /**/
+#define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))        /**/
 
 /* SITELIB:
  *     This symbol contains the name of the private library for this package.
@@ -1787,7 +1786,7 @@
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define SITELIB "c:\\perl\\lib\\site"          /**/
-#define SITELIB_EXP "c:\\perl\\lib\\site"              /**/
+#define SITELIB_EXP (win32_perllib_path("site",NULL))  /**/
 
 /* STARTPERL:
  *     This variable contains the string to put in front of a perl