X-Git-Url: http://www.privoxy.org/gitweb/trouble.html?a=blobdiff_plain;f=build.sh;h=2b0b72ecc23ee98633e3bc53071d1f3e8a2a3312;hb=15ccf08b75bbde74949262ded789e696d4146a9b;hp=7fb015fce445d182f4d701851e1c63dfce66bb18;hpb=9fe43e030e106aa3bfb25c5c3d58a8cbd86d452b;p=OSXPackageBuilder.git

diff --git a/build.sh b/build.sh
index 7fb015f..2b0b72e 100755
--- a/build.sh
+++ b/build.sh
@@ -28,14 +28,15 @@
 #                USA
 #
 # Modification : If you modify this file please consider whether your 
-#                changes ought to be passed back to the macsetup module.
+#                changes ought to be passed back to the OSXPackageBuilder
+#                module.
 #
 
 #
 # 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 | tigeri386 | tigerppc | panther  [-pcre]"
   exit 1
 fi
 
@@ -48,17 +49,19 @@ fi
 # must have Xcode
 #
 if [ -z ${XCODE_PATH} ]; then
-  echo "Error: this release of Mac OS X not supported."
+  echo "Error: Xcode is not found."
   exit 1
 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
 
 #
@@ -81,8 +84,9 @@ fi
 echo ""
 echo "Notice: configuring the privoxy software."
 cd ../${SOURCE_DIR}
-/usr/bin/autoheader
-/usr/bin/autoconf
+autoheader
+autoconf
+
 /usr/bin/env CFLAGS="${CFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
 
 #