Commit 992be8f5 authored by dscho's avatar dscho

fix compilation on IRIX

parent 1afc2a04
...@@ -13,9 +13,10 @@ endif ...@@ -13,9 +13,10 @@ endif
if HAVE_LIBSDL if HAVE_LIBSDL
SDLVIEWER=SDLvncviewer 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 endif
noinst_PROGRAMS=ppmtest $(SDLVIEWER) $(FFMPEG_CLIENT) noinst_PROGRAMS=ppmtest $(SDLVIEWER) $(FFMPEG_CLIENT)
......
...@@ -93,11 +93,15 @@ AM_CONDITIONAL(HAVE_LIBJPEG, test ! -z "$HAVE_JPEGLIB_H") ...@@ -93,11 +93,15 @@ AM_CONDITIONAL(HAVE_LIBJPEG, test ! -z "$HAVE_JPEGLIB_H")
if test -z "$with_sdl"; then if test -z "$with_sdl"; then
if sdl-config --version >/dev/null 2>&1; then if sdl-config --version >/dev/null 2>&1; then
with_sdl=yes with_sdl=yes
SDL_CFLAGS=`sdl-config --cflags`
SDL_LIBS=`sdl-config --libs`
else else
with_sdl=no with_sdl=no
fi fi
fi fi
AM_CONDITIONAL(HAVE_LIBSDL, test "x$with_sdl" = "xyes") AM_CONDITIONAL(HAVE_LIBSDL, test "x$with_sdl" = "xyes")
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment