configure.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit acf038dde9114a2e48d18e16511efdb85684d2f9
Author: Stephan Bergmann <[email protected]>
Date: Tue Aug 21 22:38:11 2012 +0200
Mac OS X --enable-mozilla does require pkg-config
Change-Id: I304c615bda490879efb3532e5beb16b674d14bee
diff --git a/configure.in b/configure.in
index 5954209..65a7325 100644
--- a/configure.in
+++ b/configure.in
@@ -4396,9 +4396,10 @@ AC_SUBST(WINDRES)
dnl ===================================================================
dnl pkg-config checks on Mac OS X
+dnl (but --enable-mozilla /does/ require a carefully crafted pkg-config)
dnl ===================================================================
-if test $_os = Darwin; then
+if test $_os = Darwin -a "$enable_mozilla" = no; 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
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
