[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 37e7b423ee4ce2baca1ed933c1e8965a1687555a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 2 14:17:11 2011 +0300

    Move PKG_PROG_PKG_CONFIG earlier, and don't duplicate it

diff --git a/configure.in b/configure.in
index f1131a7..2eca92c 100755
--- a/configure.in
+++ b/configure.in
@@ -2407,6 +2407,13 @@ AC_SUBST(MSPDB_PATH)
 AC_SUBST(USE_MINGW)
 AC_SUBST(SHOWINCLUDES_PREFIX)
 
+dnl ===================================================================
+dnl Check for pkg-config
+dnl ===================================================================
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+    PKG_PROG_PKG_CONFIG
+fi
+
 if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
 
    # If you use CC=/path/to/compiler/foo-gcc or even CC="ccache
@@ -2416,7 +2423,6 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
    AC_CHECK_TOOL(AR,ar)
    AC_CHECK_TOOL(NM,nm)
    AC_CHECK_TOOL(OBJDUMP,objdump)
-   AC_PATH_TOOL(PKG_CONFIG,pkg-config)
    AC_CHECK_TOOL(RANLIB,ranlib)
    AC_CHECK_TOOL(STRIP,strip)
    if test "$_os" = "WINNT"; then
@@ -4031,16 +4037,6 @@ fi
 AC_SUBST(GPERF)
 
 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" -o "$WITH_MINGW" = "yes"; then
-    PKG_PROG_PKG_CONFIG
-fi
-
-dnl ===================================================================
 dnl Check for building stax
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the stax])