[Freeciv-Dev] Re: (PR#2450) SDL client

["Per I. Mathisen via RT" <rt@xxxxxxxxxxxxxx>]

This patch fixes some issues with the previous patch
  - LIBS is _permanently_ redefined
  - CFLAGS and CPPFLAGS are not expanded with sdl data, which meant paths
    from sdl-config were not used for finding SDL_ttf and SDL_image

This solved first part of compile problems of SDL client on BeOS.

  - Per

Index: m4/sdl-client.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/sdl-client.m4,v
retrieving revision 1.1
diff -u -r1.1 sdl-client.m4
--- m4/sdl-client.m4    30 Nov 2002 21:24:56 -0000      1.1
+++ m4/sdl-client.m4    1 Dec 2002 17:50:18 -0000
@@ -8,7 +8,12 @@
   if test "$client" = sdl || test "$client" = yes ; then
     AM_PATH_SDL([1.1.4], [sdl_found="yes"], [sdl_found="no"])
     if test "$sdl_found" = yes; then
-      LIBS="$SDL_LIBS"
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      ac_save_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+      CFLAGS="$CFLAGS $SDL_CFLAGS"
+      LIBS="$LIBS $SDL_LIBS"
       AC_CHECK_LIB([SDL_image], [IMG_Load],
                    [sdl_image_found="yes"], [sdl_image_found="no"])
       if test "$sdl_image_found" = "yes"; then
@@ -37,6 +42,9 @@
       elif test "$client" = "sdl"; then
         AC_MSG_ERROR([specified client 'sdl' not configurable (SDL_image is 
needed)])
       fi
+      CPPFLAGS="$ac_save_CPPFLAGS"
+      CFLAGS="$ac_save_CFLAGS"
+      LIBS="$ac_save_LIBS"
     fi
 
     if test "$found_client" = yes; then