[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 2eb39893df0fa008da0f863caa65d8aea7eb107b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 16 20:59:41 2012 +0300

    Having a pkg-config on the Mac *will* break the build, so error out
    
    Change-Id: I2393b893766acd9f630100c7b4ef1e15360f80b4

diff --git a/configure.in b/configure.in
index 1e96a4e..9e7760e 100644
--- a/configure.in
+++ b/configure.in
@@ -4296,14 +4296,12 @@ if test $_os = Darwin; then
     AC_MSG_CHECKING([for bogus pkg-config])
     if test -n "$PKG_CONFIG"; then
         if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then
-            AC_MSG_RESULT([yes, from Mono])
+            AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please remove or hide $PKG_CONFIG])
         else
-            AC_MSG_RESULT([yes, from unknown origin])
+            AC_MSG_ERROR([yes, from unknown origin. This *will* break the build. Please remove or hide $PKG_CONFIG])
         fi
-        AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG])
-        echo "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it" >>warn
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no, good])
     fi
 fi