projects
/
OSXPackageBuilder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add HTTPS inspection support
[OSXPackageBuilder.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
35f7b43
..
2f00841
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-5,7
+5,7
@@
# Purpose : Build the privoxy binary, documentation and config files
# for the chosen target environment
#
# Purpose : Build the privoxy binary, documentation and config files
# for the chosen target environment
#
-# Copyright : Written by and Copyright (C) 2001-20
12
the
+# Copyright : Written by and Copyright (C) 2001-20
21
the
# Privoxy team. http://www.privoxy.org/
#
# This program is free software; you can redistribute it
# Privoxy team. http://www.privoxy.org/
#
# This program is free software; you can redistribute it
@@
-28,14
+28,15
@@
# USA
#
# Modification : If you modify this file please consider whether your
# 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
#
#
#
# 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
current | lion | snowleopardx64 | snowleopard | snowleopardi386 | leopardupwards | leopard | leopardi386 | leopardppc | tiger | tigeri386 | tigerppc | panther [-pcre]
"
exit 1
fi
exit 1
fi
@@
-43,19
+44,27
@@
fi
# load common settings
#
. ./common.sh $1
# load common settings
#
. ./common.sh $1
+#echo "${XCODE_PATH}"
+#echo ${SYSROOT}
#
# must have Xcode
#
if [ -z ${XCODE_PATH} ]; then
#
# must have Xcode
#
if [ -z ${XCODE_PATH} ]; then
- echo "Error:
this release of Mac OS X not supporte
d."
+ echo "Error:
Xcode is not foun
d."
exit 1
fi
#
exit 1
fi
#
-#
use default 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
#
# check if privoxy group and user exist?
#
# check if privoxy group and user exist?
@@
-77,9
+86,10
@@
fi
echo ""
echo "Notice: configuring the privoxy software."
cd ../${SOURCE_DIR}
echo ""
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}
+autoheader
+autoconf
+
+/usr/bin/env CFLAGS="-O2 -mdynamic-no-pic ${CFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
#
# clean, then make privoxy
#
# clean, then make privoxy