X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=build.sh;h=dd2d58cccd1f34a1eda7e7166d0286b7203cfe58;hb=00989eaa5e735d62408383ad63e03e95dd49d251;hp=028c44d13037ddf6ef805dbc804ee8141206b378;hpb=030221d958b74b3e1d13e0cc9d4d23018f951c8d;p=OSXPackageBuilder.git diff --git a/build.sh b/build.sh index 028c44d..dd2d58c 100755 --- 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} #