[quake3-commits] r1540 - trunk

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2009-05-05 14:19:34 -0400 (Tue, 05 May 2009)
New Revision: 1540

Modified:
   trunk/Makefile
Log:
fall back to sdl-config if SDL_CFLAGS are empty

works around buggy Solaris installations where pkg-config is
installed but can't find the SDL config file

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-05-05 18:19:29 UTC (rev 1539)
+++ trunk/Makefile	2009-05-05 18:19:34 UTC (rev 1540)
@@ -187,7 +187,9 @@
   # FIXME: introduce CLIENT_CFLAGS
   SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
   SDL_LIBS=$(shell pkg-config --libs sdl)
-else
+endif
+# Use sdl-config if all else fails
+ifeq ($(SDL_CFLAGS),)
   ifeq ($(shell which sdl-config > /dev/null; echo $$?),0)
     SDL_CFLAGS=$(shell sdl-config --cflags)
     SDL_LIBS=$(shell sdl-config --libs)