aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-08-11 07:56:38 +0200
committerSebastian Hahn <sebastian@torproject.org>2011-08-11 07:56:38 +0200
commitcd44145c5b1f8f49f6ddd2c9a2d5aaa5c6ef85db (patch)
tree48398f251be0a8b2db1c44a800b9b0debffa541b
parent5da9f722f27c0df9e90a59318ea8182743ab0e44 (diff)
parent92bea30e28f62ea4c5d335420e2a328ff64598bc (diff)
downloadtor-cd44145c5b1f8f49f6ddd2c9a2d5aaa5c6ef85db.tar
tor-cd44145c5b1f8f49f6ddd2c9a2d5aaa5c6ef85db.tar.gz
Merge branch 'bug3643'
-rw-r--r--changes/bug36434
-rw-r--r--configure.in9
2 files changed, 13 insertions, 0 deletions
diff --git a/changes/bug3643 b/changes/bug3643
new file mode 100644
index 000000000..86bd920ca
--- /dev/null
+++ b/changes/bug3643
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Selectively disable deprecation warnings on OS X because Lion started
+ deprecating the shipped copy of openssl. Fixes bug 3643.
+
diff --git a/configure.in b/configure.in
index 0a018628d..643718355 100644
--- a/configure.in
+++ b/configure.in
@@ -1123,6 +1123,15 @@ else
enable_gcc_warnings_advisory=no
fi
+# OS X Lion started deprecating the system openssl. Let's just disable
+# all deprecation warnings on OS X.
+case "$host_os" in
+
+ darwin*)
+ CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+ ;;
+esac
+
# Add some more warnings which we use in development but not in the
# released versions. (Some relevant gcc versions can't handle these.)
if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then