[Libreoffice-commits] core.git: configure.ac

[Douglas Mencken]

 configure.ac |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 9b6c462b54aa1a5a5c73647c2c6d9568c2b039a5
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sat Jun 28 15:32:27 2014 -0400

    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 at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index c20101d..557dbe3 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