diff options
| author | Sascha Schumann <sas@php.net> | 1999-11-13 16:51:33 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-11-13 16:51:33 +0000 |
| commit | bcb2214e9951b271d073314870bf09a6a87435f5 (patch) | |
| tree | b3a1540deb25e4480d62c57854ba092479191e28 /main | |
| parent | c166a6fb835c5b43a782da141c1543e8a1878229 (diff) | |
| download | php-git-bcb2214e9951b271d073314870bf09a6a87435f5.tar.gz | |
Improve regex library selection. It lets user specify whether they want
system, apache, or php's regex library by using the --with-regex option.
"php" is the default; if you use --with-apache in combination with
Apache 1.3.x, the default is "apache".
Diffstat (limited to 'main')
| -rw-r--r-- | main/php.h | 4 | ||||
| -rw-r--r-- | main/php_regex.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h index a778c5dff6..b0dd5cb7b4 100644 --- a/main/php.h +++ b/main/php.h @@ -203,6 +203,10 @@ extern char *strerror(int); #define UNBLOCK_INTERRUPTIONS unblock_alarms #endif +#if REGEX == 1 || REGEX == 0 +#include "regex/regex_extra.h" +#endif + #if HAVE_PWD_H # if WIN32||WINNT #include "win32/pwd.h" diff --git a/main/php_regex.h b/main/php_regex.h index 46618379af..91cbd994c4 100644 --- a/main/php_regex.h +++ b/main/php_regex.h @@ -1,7 +1,7 @@ #ifndef _PHP_REGEX_H #define _PHP_REGEX_H -#if REGEX +#if REGEX == 1 #include "regex/regex.h" #ifndef _REGEX_H #define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ @@ -18,7 +18,7 @@ #ifndef _H_REGEX #define _H_REGEX 1 /* This one is for AIX */ #endif -#else +#elif REGEX == 0 #include <regex.h> #endif |