[Libreoffice-commits] .: configure.in

[Sebastian Spaeth]

 configure.in |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 7d7408d0417ec24199c895c7eb0896f5bd93f37c
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Dec 10 15:49:18 2010 +0100

    Check for pkg-config before we use it and on all platforms
    
    Previously, we would skip that check only on Windows but use the Check
    for Packages macros anyway, so we required that also on Windows. Move
    to the front, no need to check for its existence *after* we already
    used it.
    
    Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

diff --git a/configure.in b/configure.in
index 7facaff..7d1b48f 100755
--- a/configure.in
+++ b/configure.in
@@ -1331,6 +1331,9 @@ if test -z "$GNUTAR"; then
 fi
 AC_SUBST(GNUTAR)
 
+# Do we have pkg-config?
+PKG_PROG_PKG_CONFIG
+
 dnl ===================================================================
 dnl Checks for --with-local-solenv invocation
 dnl TODO: Is this still required?
@@ -3918,16 +3921,6 @@ else
 fi
 
 dnl ===================================================================
-dnl Check for pkg-config
-dnl # Note that if there is a possibility the first call to
-dnl # PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-dnl ===================================================================
-if test "$_os" != "WINNT"; then
-    PKG_PROG_PKG_CONFIG
-fi
-
-dnl ===================================================================
 dnl Check for building stax
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the stax])