diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:16:59 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:16:59 +0000 |
commit | 0ce21d3d7057b6cdd6df8a369c9077127decd72c (patch) | |
tree | 571ae5fd79eb33272a93025f9a75314cc3db6f5a /config_office | |
parent | 5a6b506cfeec8464cdf2f9de7e9ff00685edb318 (diff) |
INTEGRATION: CWS sb83 (1.2.248); FILE MERGED
2008/02/04 10:40:30 sb 1.2.248.1: #i84200# introduced PKG_CHECK_MODULES_MACHACK to use system-provided specific bins instead of (MacPorts provided) pkg-check for libxml2/libxslt
Diffstat (limited to 'config_office')
-rw-r--r-- | config_office/acinclude.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config_office/acinclude.m4 b/config_office/acinclude.m4 index a42a0f1ce830..71f01544d11b 100644 --- a/config_office/acinclude.m4 +++ b/config_office/acinclude.m4 @@ -118,3 +118,21 @@ esac AC_LANG_POP(C) ]) dnl end AC_DEFUN + +dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra +dnl argument between the first and second, denoting a program to call instead of +dnl pkg-config on Mac OS X (aka Darwin): +AC_DEFUN([PKG_CHECK_MODULES_MACHACK], +[if test "$_os" = "Darwin"; then + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$2 --cflags` + AC_MSG_RESULT($$1_CFLAGS) + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$2 --libs` + AC_MSG_RESULT($$1_LIBS) + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + PKG_CHECK_MODULES($1, $3, $4, $5, $6) + fi +]) |