FS-353: add PKG_CONFIG_PATH for keg only curl from homebrew on mac

This commit is contained in:
Michael Jerris 2014-03-20 17:40:21 -04:00
parent 03132e3fd5
commit d1045b12e1
1 changed files with 6 additions and 1 deletions

View File

@ -602,7 +602,6 @@ case "$host" in
APR_ADDTO([PLATFORM_CORE_LDFLAGS], [--framework CoreFoundation]) APR_ADDTO([PLATFORM_CORE_LDFLAGS], [--framework CoreFoundation])
fi fi
APR_ADDTO([PLATFORM_CORE_LIBS], [-ldl]) APR_ADDTO([PLATFORM_CORE_LIBS], [-ldl])
path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig
;; ;;
*-solaris2*) *-solaris2*)
if test "${enable_64}" = "yes"; then if test "${enable_64}" = "yes"; then
@ -1069,6 +1068,12 @@ AC_SUBST(GETG729)
GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh" GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
AC_SUBST(GETSOUNDS) AC_SUBST(GETSOUNDS)
case $host in
*-darwin*)
path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig
;;
esac
PKG_CHECK_MODULES([CURL], [libcurl >= 7.26]) PKG_CHECK_MODULES([CURL], [libcurl >= 7.26])
PKG_CHECK_MODULES([PCRE], [libpcre >= 7.8]) PKG_CHECK_MODULES([PCRE], [libpcre >= 7.8])
PKG_CHECK_MODULES([SPEEX], [speex >= 1.2rc1 speexdsp >= 1.2rc1]) PKG_CHECK_MODULES([SPEEX], [speex >= 1.2rc1 speexdsp >= 1.2rc1])