[Libreoffice-commits] .: configure.in

Thomas Klausner tklausner at kemper.freedesktop.org
Wed Oct 13 07:42:09 PDT 2010


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

New commits:
commit 3c41bbe4f50b038c4305d9615aa123e3b79a48a8
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Sun Oct 10 18:07:07 2010 +0200

    NetBSD does not provide a pkg-config file for openssl in its base.
    
    Handle it the same way as Darwin.

diff --git a/configure.in b/configure.in
index bffc999..10bd44c 100644
--- a/configure.in
+++ b/configure.in
@@ -5222,7 +5222,7 @@ fi
 dnl ===================================================================
 dnl Check for system openssl
 dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
+if test "$_os" = "Darwin" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
 AC_MSG_CHECKING([which libssl to use])
@@ -5231,7 +5231,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
     AC_MSG_RESULT([external])
     # Mac OS builds should get out without extra stuff is the Mac porters'
     # wish. And pkg-config is although Xcode ships a .pc for openssl
-    if test "$_os" = "Darwin"; then
+    if test "$_os" = "Darwin" -o "$_os" = "NetBSD" ; then
         OPENSSL_CFLAGS=
         OPENSSL_LIBS="-lssl -lcrypto"
     else


More information about the Libreoffice-commits mailing list