From: Ian Silvester <iansilvester@fastmail.fm>
Date: Thu, 29 Mar 2012 00:55:53 +0000 (+0000)
Subject: An external PCRE library set can now be optionally compiled against and bundled with... 
X-Git-Url: http://www.privoxy.org/gitweb/configuration.html?p=OSXPackageBuilder.git;a=commitdiff_plain;h=9fe43e030e106aa3bfb25c5c3d58a8cbd86d452b

An external PCRE library set can now be optionally compiled against and bundled with Privoxy
---

diff --git a/build.sh b/build.sh
index 0a47551..7fb015f 100755
--- a/build.sh
+++ b/build.sh
@@ -34,8 +34,8 @@
 #
 # must provide target
 #
-if [ $# -eq 0 -o $# -gt 1 ]; then
-  echo "Usage: $0 lion | snowleopard64 | snowleopard | leopardupwards | leopard | tiger | panther"
+if [ $# -eq 0 -o $# -gt 2 ]; then
+  echo "Usage: $0 lion | snowleopard64 | snowleopard | leopardupwards | leopard | tiger | panther  [-pcre]"
   exit 1
 fi
 
@@ -53,9 +53,13 @@ if [ -z ${XCODE_PATH} ]; then
 fi
 
 #
-# use default options
+# set configure options
 #
 OPTS=${OPTS}
+if [ "$2" == "-pcre" ]; then
+	CFLAGS="${CFLAGS} -I/usr/local/include/"
+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+fi
 
 #
 # check if privoxy group and user exist?
@@ -79,7 +83,7 @@ echo "Notice: configuring the privoxy software."
 cd ../${SOURCE_DIR}
 /usr/bin/autoheader
 /usr/bin/autoconf
-/usr/bin/env CFLAGS="${CFLAGS} -I/usr/local/include/ ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} -L/usr/local/lib ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
+/usr/bin/env CFLAGS="${CFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
 
 #
 # clean, then make privoxy
diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index e9856b2..f7c48a0 100755
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -108,6 +108,18 @@ echo "Copy the manpage from the '${SOURCE_DIR}' directory"
 echo ""
 cp -v ../${SOURCE_DIR}/privoxy.1 pkg\ content/usr/local/share/man/man1
 
+# Optionally copy the PCRE libraries
+if [ "$1" == "-pcre" ]; then
+	echo ""
+	echo ""
+	echo "Copy the external PCRE libraries"
+	echo ""
+	mkdir pkg\ content/usr/local/lib
+	cp -v /usr/local/lib/libpcre* pkg\ content/usr/local/lib
+	mkdir pkg\ content/usr/local/lib/pkgconfig
+	cp -v /usr/local/lib/pkgconfig/libpcre* pkg\ content/usr/local/lib/pkgconfig
+fi
+
 # Remove CVS administration files
 echo ""
 echo ""