From: Travis Cross Date: Thu, 20 Mar 2014 20:12:23 +0000 (+0000) Subject: Add curl auto PKG_CONFIG_PATH handling for OS X X-Git-Tag: v1.5.12~351 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b1278a37af92a2b578ebe884db071bcd266b732;p=thirdparty%2Ffreeswitch.git Add curl auto PKG_CONFIG_PATH handling for OS X FS-353 --- diff --git a/configure.ac b/configure.ac index c7fc433064..fb101c29e7 100644 --- a/configure.ac +++ b/configure.ac @@ -560,6 +560,15 @@ ESL_LDFLAGS= PLATFORM_CORE_LDFLAGS= PLATFORM_CORE_LIBS= +path_remove () { + echo "$1" | sed 's/:/\n/g' | grep -Fxv "$2" | tr '\n' ':' | sed 's/:$/\n/' +} +path_push_unique () { + x="$(eval echo \$$1)" + x="$(path_remove "$x" "$2")" + eval $1="$2:$x" +} + # tweak platform specific flags case "$host" in *darwin13.*|*darwin12.*|*darwin11.*) @@ -593,6 +602,7 @@ case "$host" in APR_ADDTO([PLATFORM_CORE_LDFLAGS], [--framework CoreFoundation]) fi APR_ADDTO([PLATFORM_CORE_LIBS], [-ldl]) + path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig ;; *-solaris2*) if test "${enable_64}" = "yes"; then