From c3f9302fd88848faaec72d8dc232221511533c8c Mon Sep 17 00:00:00 2001 From: jongfoster Date: Sat, 6 Apr 2002 20:38:01 +0000 Subject: [PATCH] Renaming VC++ versions of config.h --- acconfig.h | 5 ++++- pcre/vc_dftables.dsp | 20 +++++++++---------- config.h.win => vc_config_pthreads.h | 15 +++++++------- ...win32threads.win => vc_config_winthreads.h | 16 +++++++-------- 4 files changed, 29 insertions(+), 27 deletions(-) rename config.h.win => vc_config_pthreads.h (98%) mode change 100755 => 100644 rename config.h.win32threads.win => vc_config_winthreads.h (98%) diff --git a/acconfig.h b/acconfig.h index 20661322..d06eb107 100644 --- a/acconfig.h +++ b/acconfig.h @@ -37,6 +37,9 @@ * * Revisions : * $Log: acconfig.h,v $ + * Revision 1.24 2002/04/04 00:36:36 gliptak + * always use pcre for matching + * * Revision 1.23 2002/04/03 22:28:03 gliptak * Removed references to gnu_regex * @@ -413,7 +416,7 @@ * the error messages understandable, by bailing out now. */ #ifdef _MSC_VER -#error For MS VC++, please use config.h.win or config.h.win32threads.win. You can usually do this by selecting the "Build", "Clean" menu option. +#error For MS VC++, please use vc_config_winthreads.h or vc_config_pthreads.h. You can usually do this by selecting the "Build", "Clean" menu option. #endif /* def _MSC_VER */ #endif /* CONFIG_H_INCLUDED */ diff --git a/pcre/vc_dftables.dsp b/pcre/vc_dftables.dsp index a02add5b..3a579a6b 100755 --- a/pcre/vc_dftables.dsp +++ b/pcre/vc_dftables.dsp @@ -166,14 +166,14 @@ PostBuild_Cmds=$(OutDir)\vc_dftables.exe >$(OutDir)\..\chartables.c # PROP Default_Filter "" # Begin Source File -SOURCE=..\config.h.win +SOURCE=..\vc_config_pthreads.h !IF "$(CFG)" == "vc_dftables - Win32 Release" # PROP Ignore_Default_Tool 1 -# Begin Custom Build - Copying config.h.win +# Begin Custom Build - Copying vc_config_pthreads.h WkspDir=. -InputPath=..\config.h.win +InputPath=..\vc_config_pthreads.h "$(WkspDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" "$(WkspDir)\..\config.h" @@ -183,9 +183,9 @@ InputPath=..\config.h.win !ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug" # PROP Ignore_Default_Tool 1 -# Begin Custom Build - Copying config.h.win +# Begin Custom Build - Copying vc_config_pthreads.h WkspDir=. -InputPath=..\config.h.win +InputPath=..\vc_config_pthreads.h "$(WkspDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" "$(WkspDir)\..\config.h" @@ -207,7 +207,7 @@ InputPath=..\config.h.win # End Source File # Begin Source File -SOURCE=..\config.h.win32threads.win +SOURCE=..\vc_config_winthreads.h !IF "$(CFG)" == "vc_dftables - Win32 Release" @@ -222,9 +222,9 @@ SOURCE=..\config.h.win32threads.win !ELSEIF "$(CFG)" == "vc_dftables - Win32 Debug with Win32 threads" # PROP Ignore_Default_Tool 1 -# Begin Custom Build - Copying config.h.win32threads.win +# Begin Custom Build - Copying vc_config_winthreads.h WkspDir=. -InputPath=..\config.h.win32threads.win +InputPath=..\vc_config_winthreads.h "$(WkspDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" "$(WkspDir)\..\config.h" @@ -234,9 +234,9 @@ InputPath=..\config.h.win32threads.win !ELSEIF "$(CFG)" == "vc_dftables - Win32 Release with Win32 threads" # PROP Ignore_Default_Tool 1 -# Begin Custom Build - Copying config.h.win32threads.win +# Begin Custom Build - Copying vc_config_winthreads.h WkspDir=. -InputPath=..\config.h.win32threads.win +InputPath=..\vc_config_winthreads.h "$(WkspDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" "$(WkspDir)\..\config.h" diff --git a/config.h.win b/vc_config_pthreads.h old mode 100755 new mode 100644 similarity index 98% rename from config.h.win rename to vc_config_pthreads.h index c872bb5e..b70c9284 --- a/config.h.win +++ b/vc_config_pthreads.h @@ -37,9 +37,6 @@ * * Revisions : * $Log: config.h.win,v $ - * Revision 1.21 2002/04/04 00:36:36 gliptak - * always use pcre for matching - * * Revision 1.20 2002/04/03 22:28:03 gliptak * Removed references to gnu_regex * @@ -214,6 +211,13 @@ */ #define CODE_STATUS "beta" +/* + * Regular expression matching for URLs. (Highly recommended). + * If neither of these are defined then you can ony use prefix matching. + * Don't bother to change this here! Use configure instead. + */ +#define REGEX_PCRE 1 + /* * Should pcre be statically built in instead of linkling with libpcre? * (This is determined by configure depending on the availiability of @@ -301,11 +305,6 @@ */ #define FEATURE_KILL_POPUPS 1 -/* - * Use PNG instead of GIF for built-in images - */ -/* #undef FEATURE_NO_GIFS */ - /* * Use POSIX threads instead of native threads. */ diff --git a/config.h.win32threads.win b/vc_config_winthreads.h similarity index 98% rename from config.h.win32threads.win rename to vc_config_winthreads.h index 9d2abb79..6be09c36 100644 --- a/config.h.win32threads.win +++ b/vc_config_winthreads.h @@ -37,9 +37,6 @@ * * Revisions : * $Log: config.h.win32threads.win,v $ - * Revision 1.15 2002/04/04 00:36:36 gliptak - * always use pcre for matching - * * Revision 1.14 2002/03/26 22:29:54 swa * we have a new homepage! * @@ -211,6 +208,14 @@ */ #define CODE_STATUS "beta" +/* + * Regular expression matching for URLs. (Highly recommended). + * If neither of these are defined then you can ony use prefix matching. + * Don't bother to change this here! Use configure instead. + */ +/* #define REGEX_GNU 1 */ +#define REGEX_PCRE 1 + /* * Should pcre be statically built in instead of linkling with libpcre? * (This is determined by configure depending on the availiability of @@ -298,11 +303,6 @@ */ #define FEATURE_KILL_POPUPS 1 -/* - * Use PNG instead of GIF for built-in images - */ -/* #undef FEATURE_NO_GIFS */ - /* * Use POSIX threads instead of native threads. */ -- 2.39.2