* added "static-pcre" to the list of supported regex options in the Makefile.

diff --git a/CHANGELOG b/CHANGELOG
index 288a68797c5ed3119cf1a300da753d0f98aca055..887b19cb9904a8e1219bf1c9c1e78acfd5c2a4eb 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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.

diff --git a/Makefile b/Makefile
index c7139f7a630d9e870bb021e4506163e660a8122c..038170c284a30c3c9b2dd00bf44dae98ad42e8e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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