From 992be8f5f7fe1dafb93e3cf06610a20724e1696f Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Tue, 8 Jun 2004 20:17:04 +0000
Subject: [PATCH] fix compilation on IRIX

---
 client_examples/Makefile.am | 5 +++--
 configure.ac                | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client_examples/Makefile.am b/client_examples/Makefile.am
index 83750ab..0e814af 100644
--- a/client_examples/Makefile.am
+++ b/client_examples/Makefile.am
@@ -13,9 +13,10 @@ endif
 if HAVE_LIBSDL
 SDLVIEWER=SDLvncviewer
 
-SDLvncviewer_CFLAGS=`sdl-config --cflags`
+SDLvncviewer_CFLAGS=$(SDL_CFLAGS)
 
-SDLvncviewer_LDFLAGS=`sdl-config --libs`
+# thanks to autoconf, this looks ugly
+SDLvncviewer_LDADD=$(LDADD) $(SDL_LIBS)
 endif
 
 noinst_PROGRAMS=ppmtest $(SDLVIEWER) $(FFMPEG_CLIENT)
diff --git a/configure.ac b/configure.ac
index 48c8423..ff0da8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,11 +93,15 @@ AM_CONDITIONAL(HAVE_LIBJPEG, test ! -z "$HAVE_JPEGLIB_H")
 if test -z "$with_sdl"; then
 	if sdl-config --version >/dev/null 2>&1; then
 		with_sdl=yes
+		SDL_CFLAGS=`sdl-config --cflags`
+		SDL_LIBS=`sdl-config --libs`
 	else
 		with_sdl=no
 	fi
 fi
 AM_CONDITIONAL(HAVE_LIBSDL, test "x$with_sdl" = "xyes")
+AC_SUBST(SDL_CFLAGS)
+AC_SUBST(SDL_LIBS)
 
 # Checks for header files.
 AC_HEADER_STDC