X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=build.sh;h=9644b473cc6b415ffa874bfba9a5ae9edd68b16d;hb=a0b4fc0e8c97b17fc577332c9153799334a0d763;hp=028c44d13037ddf6ef805dbc804ee8141206b378;hpb=0163f12f3046263bac5543fffa0e85b7166944e1;p=OSXPackageBuilder.git diff --git a/build.sh b/build.sh index 028c44d..9644b47 100755 --- a/build.sh +++ b/build.sh @@ -36,7 +36,7 @@ # must provide target # if [ $# -eq 0 -o $# -gt 2 ]; then - echo "Usage: $0 lion | snowleopard64 | snowleopard | leopardupwards | leopard | tiger | panther [-pcre]" + echo "Usage: $0 lion | snowleopardx64 | snowleopard | snowleopardi386 | leopardupwards | leopard | leopardi386 | leopardppc | tiger | panther [-pcre]" exit 1 fi @@ -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} #