[Gnash-commit] gnash ./ChangeLog macros/sdl.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/21 16:08:40

Modified files:
        .              : ChangeLog 
        macros         : sdl.m4 

Log message:
        * macros/sdl.m4: Store the compilation flags so the compilation
        tests works on ppc-linux.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.27 gnash/ChangeLog:1.28
--- gnash/ChangeLog:1.27        Fri Jan 20 19:25:16 2006
+++ gnash/ChangeLog     Sat Jan 21 16:08:40 2006
@@ -1,5 +1,13 @@
+2006-01-21  Rob Savoye  <address@hidden>
+
+       * macros/sdl.m4: Store the compilation flags so the compilation
+       tests works on ppc-linux.
+
 2006-01-20  Rob Savoye  <address@hidden>
 
+       * backend/Makefile.am: Make the OGL and SDL support a library so
+       it can also be used by the plugin.
+       * libbase/Makefile.am: Add SDL_MIXER_CFLAGS to the include paths.
        * macros/sdl.m4: Correct typo so --with-sdl_mixer-lib actually
        works. Add /usr/bin/X11 to the default search path for
        sdl-config.
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.2 gnash/macros/sdl.m4:1.3
--- gnash/macros/sdl.m4:1.2     Fri Jan 20 19:25:17 2006
+++ gnash/macros/sdl.m4 Sat Jan 21 16:08:40 2006
@@ -47,13 +47,15 @@
     sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 
's/\([[0-9]]*\).\([[0-9]]*\).\(--with-sdl_mixer-libs=[[0-9]]*\)/\2/'`
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     if test "x$enable_sdltest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
+      ac_save_CXXFLAGS="$CXXFLAGS"
       ac_save_LIBS="$LIBS"
       CFLAGS="$CFLAGS $SDL_CFLAGS"
+      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
       LIBS="$LIBS $SDL_LIBS"
 dnl
 dnl Now check if the installed SDL is sufficiently new. (Also sanity
@@ -119,6 +121,7 @@
 
 ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
        CFLAGS="$ac_save_CFLAGS"
+       CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
@@ -138,6 +141,7 @@
        else
           echo "*** Could not run SDL test program, checking why..."
           CFLAGS="$CFLAGS $SDL_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
           LIBS="$LIBS $SDL_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
@@ -149,7 +153,7 @@
 #define main K_and_R_C_main
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually 
means"
-          echo "*** that the run-time linker is not finding SDL or finding the 
wrong"o
+          echo "*** that the run-time linker is not finding SDL or finding the 
wrong"
           echo "*** version of SDL. If it is not finding SDL, you'll need to 
set your"
           echo "*** LD_LIBRARY_PATH environment variable, or edit 
/etc/ld.so.conf to point"
           echo "*** to the installed location  Also, make sure you have run 
ldconfig if that"
@@ -162,6 +166,7 @@
           echo "*** or that you have moved SDL since it was installed. In the 
latter case, you"
           echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
           CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
           LIBS="$ac_save_LIBS"
        fi
      fi
@@ -174,7 +179,6 @@
   rm -f conf.sdltest
 ])
 
-
 AC_DEFUN([AM_PATH_SDL_MIXER],
 [
   dnl Lool for the header