[Libreoffice-commits] .: 2 commits - configure.in

[Caolán McNamara]

 configure.in |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 652ff366bd106f94960917930a976c883367ba16
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 30 13:08:50 2011 +0100

    set default system-zlib/jpeg on some platforms

diff --git a/configure.in b/configure.in
index 1a20fdc..7975445 100755
--- a/configure.in
+++ b/configure.in
@@ -3865,24 +3865,9 @@ AC_SUBST(SYSTEM_STDLIBS)
 dnl ===================================================================
 dnl Check for system zlib
 dnl ===================================================================
-if test "$with_system_zlib" != "no"; then
-   if test "$_os" = "Darwin"; then
-     with_system_zlib=yes
-   elif test "$_os" = "Linux"; then
-     with_system_zlib=yes
-   elif test "$_os" = "FreeBSD"; then
-     with_system_zlib=yes
-   elif test "$_os" = "DragonFly"; then
-     with_system_zlib=yes
-   elif test "$_os" = "NetBSD"; then
-     with_system_zlib=yes
-   elif test "$_os" = "OpenBSD"; then
-     with_system_zlib=yes
-   fi
-fi
-
 AC_MSG_CHECKING([which zlib to use])
-if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
+if test -n "$with_system_zlib" -o -n "$with_system_libs" -o \
+	"$_os" != "WINNT" && \
     test "$with_system_zlib" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_ZLIB=YES
@@ -3901,7 +3886,8 @@ dnl ===================================================================
 dnl Check for system jpeg
 dnl ===================================================================
 AC_MSG_CHECKING([which jpeg to use])
-if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
+if test -n "$with_system_jpeg" -o -n "$with_system_libs" -o \
+        "$_os" = "Linux" && \
     test "$with_system_jpeg" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_JPEG=YES
commit 9399817c1464f82cbf3a6b944c7896dcb294fda2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 29 16:40:32 2011 +0100

    default to system zlib on contemporary unices

diff --git a/configure.in b/configure.in
index 8b7f6b9..1a20fdc 100755
--- a/configure.in
+++ b/configure.in
@@ -3865,9 +3865,22 @@ AC_SUBST(SYSTEM_STDLIBS)
 dnl ===================================================================
 dnl Check for system zlib
 dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
-   with_system_zlib=yes
+if test "$with_system_zlib" != "no"; then
+   if test "$_os" = "Darwin"; then
+     with_system_zlib=yes
+   elif test "$_os" = "Linux"; then
+     with_system_zlib=yes
+   elif test "$_os" = "FreeBSD"; then
+     with_system_zlib=yes
+   elif test "$_os" = "DragonFly"; then
+     with_system_zlib=yes
+   elif test "$_os" = "NetBSD"; then
+     with_system_zlib=yes
+   elif test "$_os" = "OpenBSD"; then
+     with_system_zlib=yes
+   fi
 fi
+
 AC_MSG_CHECKING([which zlib to use])
 if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
     test "$with_system_zlib" != "no"; then