[Gnash-commit] gnash ./ChangeLog libbase/Makefile.am macros/sd...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/20 19:25:17

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am 
        macros         : sdl.m4 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.26 gnash/ChangeLog:1.27
--- gnash/ChangeLog:1.26        Thu Jan 19 23:50:11 2006
+++ gnash/ChangeLog     Fri Jan 20 19:25:16 2006
@@ -1,3 +1,11 @@
+2006-01-20  Rob Savoye  <address@hidden>
+
+       * macros/sdl.m4: Correct typo so --with-sdl_mixer-lib actually
+       works. Add /usr/bin/X11 to the default search path for
+       sdl-config.
+       * server/styles.cpp: Print a better error message when a bad
+       gradient value is read before aborting.
+
 2006-01-19  Rob Savoye  <address@hidden>
 
        * utilities/Makefile.am: Link with AM_LDFLAGS.
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.6 gnash/libbase/Makefile.am:1.7
--- gnash/libbase/Makefile.am:1.6       Thu Jan 19 23:50:11 2006
+++ gnash/libbase/Makefile.am   Fri Jan 20 19:25:17 2006
@@ -19,7 +19,7 @@
 
 AUTOMAKE_OPTIONS = 
 
-AM_CXXFLAGS = $(SDL_CFLAGS) $(INCLUDES)
+AM_CXXFLAGS = $(SDL_CFLAGS) $(SDL_MIXER_CFLAGS) $(INCLUDES)
 AM_CPPFLAGS = -Wall
 # AM_LDFLAGS = $(OPENGL_LIBS) $(GLU_LIBS) $(SDL_LIBS)
 
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.1 gnash/macros/sdl.m4:1.2
--- gnash/macros/sdl.m4:1.1     Tue Dec 20 21:02:51 2005
+++ gnash/macros/sdl.m4 Fri Jan 20 19:25:17 2006
@@ -33,7 +33,7 @@
   fi
 
   AC_REQUIRE([AC_CANONICAL_TARGET])
-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+  PATH="$prefix/bin:$prefix/usr/bin:/usr/bin/X11:$PATH"
   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
@@ -47,7 +47,7 @@
     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]]*\).\([[0-9]]*\)/\2/'`
+           sed 
's/\([[0-9]]*\).\([[0-9]]*\).\(--with-sdl_mixer-libs=[[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
@@ -149,7 +149,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"
+          echo "*** that the run-time linker is not finding SDL or finding the 
wrong"o
           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"
@@ -224,13 +224,11 @@
   AC_ARG_WITH(sdl_mixer_lib, [  --with-sdl_mixer-lib    directory where 
sdl_mixer library is], with_sdl_mixer_lib=${withval})
   AC_MSG_CHECKING([for sdl_mixer library])
   AC_CACHE_VAL(ac_cv_path_sdl_mixer_lib,[
-  if test x"${with_sdl_mixer_lib}" != x ; then
-    if test -f ${with_sdl_mixer_lib}/libSDL_mixer.a ; then
-      ac_cv_path_sdl_mixer_lib=`(cd ${with_sdl_mixer_lib}; pwd)`
-    elif test -f ${with_sdl_mixer_lib}/libSDL_mixer.a -o -f 
${with_sdl_mixer_lib}/libSDL_mixer.so; then
-      ac_cv_path_sdl_mixer_lib=`(cd ${with_sdl_mixer_incl}; pwd)`
+  if test x"${with_sdl_mixer_libs}" != x ; then
+    if test -f ${with_sdl_mixer_libs}/libSDL_mixer.a -o -f 
${with_sdl_mixer_libs}/libSDL_mixer.so; then
+      ac_cv_path_sdl_mixer_lib=`(cd ${with_sdl_mixer_libs}; pwd)`
     else
-      AC_MSG_ERROR([${with_sdl_mixer_lib} directory doesn't contain 
libsdl_mixer.a])
+      AC_MSG_ERROR([${with_sdl_mixer_libs} directory doesn't contain 
libsdl_mixer.a])
     fi
   fi
   ])