Explicitly disable dynamic pcre when the user does not use the -pcre option
authorIan Silvester <iansilvester@fastmail.fm>
Mon, 7 Jan 2013 23:23:01 +0000 (23:23 +0000)
committerIan Silvester <iansilvester@fastmail.fm>
Mon, 7 Jan 2013 23:23:01 +0000 (23:23 +0000)
build.sh

index 028c44d..dd2d58c 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -54,12 +54,14 @@ if [ -z ${XCODE_PATH} ]; then
 fi
 
 #
-# set configure options
+# set configure options; include the appropriate user/group as discerned by common.sh and set pcre to dynamic (libpcre) or static (bundled)
 #
-OPTS=${OPTS}
 if [ "$2" == "-pcre" ]; then
        CFLAGS="${CFLAGS} -I/usr/local/include/"
        LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+       OPTS=${OPTS}
+else
+       OPTS="${OPTS} --disable-dynamic-pcre"
 fi
 
 #
@@ -84,6 +86,7 @@ echo "Notice: configuring the privoxy software."
 cd ../${SOURCE_DIR}
 /usr/bin/autoheader
 /usr/bin/autoconf
+
 /usr/bin/env CFLAGS="${CFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
 
 #