Skip to content

Commit

Permalink
* added "static-pcre" to the list of supported regex options in the M…
Browse files Browse the repository at this point in the history
…akefile.
  • Loading branch information
willy tarreau committed Dec 18, 2005
1 parent d0fb465 commit 4373b96
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -9,6 +9,7 @@ ChangeLog :
be displayed even in quiet mode.
- display an alert when a listener has no address, invalid or no port, or when
there are no enabled listeners upon startup.
- added "static-pcre" to the list of supported regex options in the Makefile.

2005/10/09 : 1.2.7rc (1.1.33rc)
- second batch of socklen_t changes.
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Expand Up @@ -17,9 +17,11 @@ CPU = generic
#CPU = i686
#CPU = ultrasparc

# By default, we use libc's regex.
# By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
# references seem broken using libc ! Use pcre instead.
REGEX=libc
#REGEX=pcre
#REGEX=static-pcre

# tools options
CC = gcc
Expand Down Expand Up @@ -70,6 +72,10 @@ LIBS.libc=
COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre

# options for static libpcre
COPTS.static-pcre=-DUSE_PCRE -I$(PCREDIR)/include
LIBS.static-pcre=-L$(PCREDIR)/lib -Wl,-Bstatic -lpcreposix -lpcre -Wl,-Bdynamic

# you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
#DEBUG = -g -DDEBUG_MEMORY
DEBUG = -g
Expand Down

0 comments on commit 4373b96

Please sign in to comment.