summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Mencken <dougmencken@gmail.com>2014-06-28 15:32:27 -0400
committerFridrich Štrba <fridrich.strba@bluewin.ch>2014-06-30 14:56:12 +0200
commit2682d4ef23c104996f56b2fd2cc2c9b8a5fa695e (patch)
tree882c59a985d7685884c491c16780ea94503e1031
parent25bcbe8a00206319fc8260cb08873d5dd7002418 (diff)
Revert "use bundled (non-system) versions of libxml2 and libxslt for OS X <10.6"
This reverts commit e5934962bd55970c54b399351559e90d02b75b6b. It never worked on 10.5 (but worked for >10.5) actually due to xsltproc and make's "Circular dependency dropped" issues. Change-Id: I8770d99a86deb5276bf28dc38da8a5165426e1ef Reviewed-on: https://gerrit.libreoffice.org/9958 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--configure.ac6
1 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index c20101d3675e..557dbe3ec939 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7880,11 +7880,7 @@ if test "$with_system_libxml" = "auto"; then
with_system_libxml="$with_system_libs"
;;
*)
- if test "$_os" = "Darwin" -a $MAC_OS_X_VERSION_MAX_ALLOWED -lt 1060; then
- with_system_libxml=no
- else
- with_system_libxml=yes
- fi
+ with_system_libxml=yes
;;
esac
fi