From 9571208ef1d4d3fdf217d554f52aaa728be0a2a3 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Tue, 4 Jan 2005 02:28:23 +0000
Subject: [PATCH] Check for new SDL_image and SDL_ttf labels. (Thanks Shard!)

---
 src/tuxpaint.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 31b91c0f3..5e584999c 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -234,6 +234,7 @@ extern char* g_win32_getlocale(void);
 #endif
 
 #include "SDL_image.h"
+#ifndef _SDL_IMAGE_H
 #ifndef _IMG_h
 #error "---------------------------------------------------"
 #error "If you installed SDL_image from a package, be sure"
@@ -241,8 +242,10 @@ extern char* g_win32_getlocale(void);
 #error "(e.g., 'libsdl-image1.2-devel.rpm')"
 #error "---------------------------------------------------"
 #endif
+#endif
 
 #include "SDL_ttf.h"
+#ifndef _SDL_TTF_h
 #ifndef _SDLttf_h
 #error "---------------------------------------------------"
 #error "If you installed SDL_ttf from a package, be sure"
@@ -250,6 +253,7 @@ extern char* g_win32_getlocale(void);
 #error "(e.g., 'libsdl-ttf1.2-devel.rpm')"
 #error "---------------------------------------------------"
 #endif
+#endif
 
 #ifndef NOSOUND
 #include "SDL_mixer.h"