From 0105de5aeed6816adc5383c14db47a909308be09 Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Sat, 10 May 2008 18:51:02 +0000
Subject: * Fix a bunch of compile warnings * Only call pkg-config if it exists
 * Remove cl_consoleHistory from README

git-svn-id: svn://svn.icculus.org/quake3/trunk@1342 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 Makefile | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7a8d932..f1005e3 100644
--- a/Makefile
+++ b/Makefile
@@ -160,13 +160,15 @@ TEMPDIR=/tmp
 
 # set PKG_CONFIG_PATH to influence this, e.g.
 # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
-CURL_CFLAGS=$(shell pkg-config --cflags libcurl)
-CURL_LIBS=$(shell pkg-config --libs libcurl)
-OPENAL_CFLAGS=$(shell pkg-config --cflags openal)
-OPENAL_LIBS=$(shell pkg-config --libs openal)
-# FIXME: introduce CLIENT_CFLAGS
-SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
-SDL_LIBS=$(shell pkg-config --libs sdl)
+ifeq ($(shell which pkg-config > /dev/null; echo $$?),0)
+  CURL_CFLAGS=$(shell pkg-config --cflags libcurl)
+  CURL_LIBS=$(shell pkg-config --libs libcurl)
+  OPENAL_CFLAGS=$(shell pkg-config --cflags openal)
+  OPENAL_LIBS=$(shell pkg-config --libs openal)
+  # FIXME: introduce CLIENT_CFLAGS
+  SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
+  SDL_LIBS=$(shell pkg-config --libs sdl)
+endif
 
 # version info
 VERSION=1.35
@@ -383,9 +385,9 @@ else # ifeq darwin
 
 ifeq ($(PLATFORM),mingw32)
 
-ifndef WINDRES
-WINDRES=windres
-endif
+  ifndef WINDRES
+    WINDRES=windres
+  endif
 
   ARCH=x86
 
-- 
cgit v1.2.3