mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tolerate pkg-config on MacOSX when building mozilla, and allow to overide

Browse Source 
Change-Id: Ia1c47ccda6c1fd94e8f4b1b6e6c1650abf791c74
This commit is contained in:
Norbert Thiebaud
2012-08-22 03:51:09 -05:00
parent cf415295e7
commit 9a20a1e1a9
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.in
View File

@@ -1085,6 +1085,11 @@ AC_ARG_ENABLE(liblangtag,
implementation.]), implementation.]),
) )
AC_ARG_ENABLE(bogus-pkg-config,
AS_HELP_STRING([--enable-bogis-pkg-config],
[MACOSX only: on MacOSX pkg-config can cause trouble. by default if one is found in the PATH, an error is issued. This flag turn that error into a warning.]),
)
dnl =================================================================== dnl ===================================================================
dnl Optional Packages (--with/without-) dnl Optional Packages (--with/without-)
dnl =================================================================== dnl ===================================================================
@@ -4413,7 +4418,16 @@ if test $_os = Darwin -a "$enable_mozilla" = no; then
if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then
AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please remove or hide $PKG_CONFIG]) AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please remove or hide $PKG_CONFIG])
else else
AC_MSG_ERROR([yes, from unknown origin. This *will* break the build. Please remove or hide $PKG_CONFIG]) if test "$enable_mozilla" = "yes"; then
AC_MSG_RESULT([yes, from unkown origin])
add_warning "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it"
else
if test "$enable_bogus_pkg_config" = "yes"; then
AC_MSG_RESULT([yes, user-approved from unkown origin.])
else
AC_MSG_ERROR([yes, from unknown origin. This *will* break the build. Please remove or hide $PKG_CONFIG])
fi
fi
fi fi
else else
AC_MSG_RESULT([no, good]) AC_MSG_RESULT([no, good])