[quake3-commits] r1669 - trunk

[DONOTREPLY at icculus.org]

Author: tma
Date: 2009-10-15 09:11:49 -0400 (Thu, 15 Oct 2009)
New Revision: 1669

Modified:
   trunk/Makefile
Log:
* Quieten pkg-config and sdl-config tests down, portably

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-10-15 11:36:51 UTC (rev 1668)
+++ trunk/Makefile	2009-10-15 13:11:49 UTC (rev 1669)
@@ -177,11 +177,13 @@
 LIBSDIR=$(MOUNT_DIR)/libs
 TEMPDIR=/tmp
 
+bin_path=$(shell which $(1) 2> /dev/null)
+
 # We won't need this if we only build the server
 ifneq ($(BUILD_CLIENT),0)
   # set PKG_CONFIG_PATH to influence this, e.g.
   # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
-  ifeq ($(shell which pkg-config > /dev/null; echo $$?),0)
+  ifneq ($(call bin_path, pkg-config),)
     CURL_CFLAGS=$(shell pkg-config --silence-errors --cflags libcurl)
     CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
     OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
@@ -192,7 +194,7 @@
   endif
   # Use sdl-config if all else fails
   ifeq ($(SDL_CFLAGS),)
-    ifeq ($(shell which sdl-config > /dev/null; echo $$?),0)
+    ifneq ($(call bin_path, sdl-config),)
       SDL_CFLAGS=$(shell sdl-config --cflags)
       SDL_LIBS=$(shell sdl-config --libs)
     endif
@@ -441,7 +443,7 @@
 
   # Some MinGW installations define CC to cc, but don't actually provide cc,
   # so explicitly use gcc instead (which is the only option anyway)
-  ifeq ($(shell which $(CC) > /dev/null; echo $$?),1)
+  ifeq ($(call bin_path, $(CC)),)
     CC=gcc
   endif