[Libreoffice-commits] .: configure.in

[Robert Nagy]

 configure.in |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 3a148bfe6fab8707597ce135759e5d5466115466
Author: Robert Nagy <robert at openbsd.org>
Date:   Mon Mar 21 19:22:11 2011 +0100

    openbsd build fixes
    
    - check for the correct kde and qt libraries
    - rework the gnu cp check logic so that it works with older
    versions of fileutils too

diff --git a/configure.in b/configure.in
index 312ee96..ca71f26 100755
--- a/configure.in
+++ b/configure.in
@@ -5862,17 +5862,17 @@ fi
 AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
 if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
    AC_MSG_RESULT([yes])
-else
- if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
+elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
     AC_MSG_RESULT([yes])
-   else
-      if test "$_os" = "Darwin"; then
-         GNUCP=''
-         AC_MSG_RESULT([no gnucp found - using the system's cp command])
-      else
-         AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
-      fi
-   fi
+elif $GNUCP --version 2>/dev/null | grep "fileutils" >/dev/null 2>/dev/null; then
+    AC_MSG_RESULT([yes])
+else
+    if test "$_os" = "Darwin"; then
+        GNUCP=''
+        AC_MSG_RESULT([no gnucp found - using the system's cp command])
+    else
+        AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
+    fi
 fi
 
 AC_SUBST(GNUPATCH)
@@ -6706,9 +6706,15 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
 
     dnl What to test
     qt_test_include="qstyle.h"
-    qt_test_library="libqt-mt.so"
     kde_test_include="kapp.h"
-    kde_test_library="libDCOP.so"
+
+    if test "$_os" != "OpenBSD"; then
+        qt_test_library="libqt-mt.so"
+        kde_test_library="libDCOP.so"
+    else
+        qt_test_library="libqt-mt.so*"
+        kde_test_library="libDCOP.so*"
+    fi
 
     dnl Check for Qt3 headers
     AC_MSG_CHECKING([for Qt3 headers])