From: Steve Hay Date: Thu, 21 Jul 2005 16:50:27 +0000 (+0000) Subject: Make the canned config.h files used on Win32 more minimal X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d64224560bf29cbbdc5245117235a9787cb49f58;p=p5sagit%2Fp5-mst-13.2.git Make the canned config.h files used on Win32 more minimal These are used in their unedited form to build miniperl, so should represent a minimal configuration The plan is to use miniperl's "-V" output in makedef.pl, so it is important that it doesn't include any of the optional things in the makefiles that the user might have chosen to disable (The actual config.h used to build perl itself is, of course, an edited version of these canned configs produced by using miniperl to run config_h.PL so these changes won't affect perl itself) p4raw-id: //depot/perl@25208 --- diff --git a/win32/config_H.bc b/win32/config_H.bc index cf2848d..4436391 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -951,7 +951,7 @@ * 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\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -960,7 +960,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86-multi-thread" /**/ +#define ARCHNAME "MSWin32-x86" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -982,8 +982,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ /* INTSIZE: * This symbol contains the value of sizeof(int) so that the C @@ -3424,7 +3424,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3558,7 +3558,7 @@ * should be used when available. */ #ifndef USE_LARGE_FILES -#define USE_LARGE_FILES /**/ +/*#define USE_LARGE_FILES /**/ #endif /* USE_LONG_DOUBLE: @@ -3582,7 +3582,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -#define MULTIPLICITY /**/ +/*#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3591,7 +3591,7 @@ * used in a fully backward compatible manner. */ #ifndef USE_PERLIO -#define USE_PERLIO /**/ +/*#define USE_PERLIO /**/ #endif /* USE_SOCKS: @@ -3620,7 +3620,7 @@ * This is extremely experimental. */ /*#define USE_5005THREADS /**/ -#define USE_ITHREADS /**/ +/*#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif diff --git a/win32/config_H.gc b/win32/config_H.gc index 2ed4ea5..0ee53d2 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -951,7 +951,7 @@ * 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\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -960,7 +960,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86-multi-thread" /**/ +#define ARCHNAME "MSWin32-x86" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -982,8 +982,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ /* INTSIZE: * This symbol contains the value of sizeof(int) so that the C @@ -3424,7 +3424,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3558,7 +3558,7 @@ * should be used when available. */ #ifndef USE_LARGE_FILES -#define USE_LARGE_FILES /**/ +/*#define USE_LARGE_FILES /**/ #endif /* USE_LONG_DOUBLE: @@ -3582,7 +3582,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -#define MULTIPLICITY /**/ +/*#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3591,7 +3591,7 @@ * used in a fully backward compatible manner. */ #ifndef USE_PERLIO -#define USE_PERLIO /**/ +/*#define USE_PERLIO /**/ #endif /* USE_SOCKS: @@ -3620,7 +3620,7 @@ * This is extremely experimental. */ /*#define USE_5005THREADS /**/ -#define USE_ITHREADS /**/ +/*#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif diff --git a/win32/config_H.vc b/win32/config_H.vc index 319fdfd..ac555bf 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -951,7 +951,7 @@ * 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\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -960,7 +960,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86-multi-thread" /**/ +#define ARCHNAME "MSWin32-x86" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -982,8 +982,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ /* INTSIZE: * This symbol contains the value of sizeof(int) so that the C @@ -3424,7 +3424,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3558,7 +3558,7 @@ * should be used when available. */ #ifndef USE_LARGE_FILES -#define USE_LARGE_FILES /**/ +/*#define USE_LARGE_FILES /**/ #endif /* USE_LONG_DOUBLE: @@ -3582,7 +3582,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -#define MULTIPLICITY /**/ +/*#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3591,7 +3591,7 @@ * used in a fully backward compatible manner. */ #ifndef USE_PERLIO -#define USE_PERLIO /**/ +/*#define USE_PERLIO /**/ #endif /* USE_SOCKS: @@ -3620,7 +3620,7 @@ * This is extremely experimental. */ /*#define USE_5005THREADS /**/ -#define USE_ITHREADS /**/ +/*#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif diff --git a/win32/config_H.vc64 b/win32/config_H.vc64 index 69033c3..f612edb 100644 --- a/win32/config_H.vc64 +++ b/win32/config_H.vc64 @@ -951,7 +951,7 @@ * 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\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -960,7 +960,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86-multi-thread" /**/ +#define ARCHNAME "MSWin32-x86" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -982,8 +982,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.9.3\\bin\\MSWin32-x86" /**/ /* INTSIZE: * This symbol contains the value of sizeof(int) so that the C @@ -3424,7 +3424,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.9.3\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3558,7 +3558,7 @@ * should be used when available. */ #ifndef USE_LARGE_FILES -#define USE_LARGE_FILES /**/ +/*#define USE_LARGE_FILES /**/ #endif /* USE_LONG_DOUBLE: @@ -3582,7 +3582,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -#define MULTIPLICITY /**/ +/*#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3591,7 +3591,7 @@ * used in a fully backward compatible manner. */ #ifndef USE_PERLIO -#define USE_PERLIO /**/ +/*#define USE_PERLIO /**/ #endif /* USE_SOCKS: @@ -3620,7 +3620,7 @@ * This is extremely experimental. */ /*#define USE_5005THREADS /**/ -#define USE_ITHREADS /**/ +/*#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif