From 68ebcaf54e6f2a5e5540154a76cd4ad2f7b228df Mon Sep 17 00:00:00 2001 From: avolkov Date: Sat, 24 Oct 2009 21:53:05 +0000 Subject: [PATCH] Don't try using pkgconfig to detect libs on Mac OSX; pkgconfig is not there git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3246 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/config_proginfo_host | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index 0d35e0140..6e0466c2b 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -129,8 +129,15 @@ case "$HOST_SYSTEM" in ;; esac LIB_openal_VERSION="" -LIB_openal_DETECT="try_pkgconfig_lib openal openal" -LIB_openal_DEPEND_DETECT_BIN="pkgconfig" +case "$HOST_SYSTEM" in + Darwin) + ## Apple does not ship pkg-config on Mac OSX + ;; + *) + LIB_openal_DETECT="try_pkgconfig_lib openal openal" + LIB_openal_DEPEND_DETECT_BIN="pkgconfig" + ;; +esac ### OpenGL ### @@ -200,6 +207,9 @@ case "$HOST_SYSTEM" in ARMV5|WINSCW|GCCE) LIB_vorbisfile_DETECT="false" ;; + Darwin) + ## Apple does not ship pkg-config on Mac OSX + ;; *) LIB_vorbisfile_DETECT="try_pkgconfig_lib vorbisfile vorbisfile" LIB_vorbisfile_DEPEND_DETECT_BIN="pkgconfig" @@ -264,6 +274,9 @@ case "$HOST_SYSTEM" in ARMV5|WINSCW|GCCE) LIB_zlib_DETECT="true" ;; + Darwin) + ## Apple does not ship pkg-config on Mac OSX + ;; *) LIB_zlib_DETECT="try_pkgconfig_lib zlib zlib" LIB_zlib_DEPEND_DETECT_BIN="pkgconfig"