[Gnash-commit] /srv/bzr/gnash/trunk r9979: configure.ac: Properly test for windows. Disable MIT-SHM by default.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 9979
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Fri 2008-10-10 17:35:46 +0200
message:
  configure.ac: Properly test for windows. Disable MIT-SHM by default.
  gui: Fix compilation for MIT-SHM enabled GTK build.
modified:
  configure.ac
  gui/gtk_glue_agg.cpp
  gui/gtk_glue_agg.h
    ------------------------------------------------------------
    revno: 9946.1.7
    committer: Bastiaan Jacques <address@hidden>
    branch nick: gst-release
    timestamp: Fri 2008-10-10 17:19:16 +0200
    message:
      Merge trunk. Fix mit-shm configuration (disabled by default) and fix 
compilation.
    added:
      libmedia/README
      testsuite/media/mono44.mp2
      testsuite/media/stereo8.mp3
      testsuite/misc-ming.all/EmbeddedSoundTest-Runner.cpp
      testsuite/misc-ming.all/EmbeddedSoundTest.c
    modified:
      configure.ac
      gui/Player.cpp
      gui/gtk_glue_agg.cpp
      gui/gtk_glue_agg.h
      libcore/character.cpp
      libcore/matrix.cpp
      libcore/namedStrings.cpp
      libcore/namedStrings.h
      libcore/swf/tag_loaders.cpp
      libmedia/MediaHandler.h
      libmedia/NullSoundHandler.h
      libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
      libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
      libmedia/ffmpeg/MediaHandlerFfmpeg.h
      libmedia/ffmpeg/sound_handler_sdl.cpp
      libmedia/ffmpeg/sound_handler_sdl.h
      libmedia/sound_handler.h
      testsuite/MovieTester.cpp
      testsuite/misc-ming.all/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2008-10-08 10:34:10 +0000
+++ b/configure.ac      2008-10-10 15:19:16 +0000
@@ -701,14 +701,14 @@
 dnl --------------------------------------------------------
 
 AC_ARG_ENABLE(mit-shm,
-  AC_HELP_STRING([--disable-mit-shm], [Disable support for the MIT-SHM X 
extension]),
+  AC_HELP_STRING([--enable-mit-shm], [Enable support for the MIT-SHM X 
extension]),
 [case "${enableval}" in
   yes) xmitshm=yes ;;
   no)  xmitshm=no ;;
   *)   AC_MSG_ERROR([bad value ${enableval} for --enable-mit-shm option]) ;;
-esac],xmitshm=yes)
+esac],xmitshm=no)
 dnl as windows doesn't run X11, don't enable this extension there.
-if test "x${xmitshm}" = "xyes" -a "x${windows}" = "xno"; then
+if test "x${xmitshm}" = "xyes" -a "x${windows}" != "xyes"; then
        AC_DEFINE(ENABLE_MIT_SHM, [1], [Use MIT-SHM X extension if available])
 fi
 

=== modified file 'gui/gtk_glue_agg.cpp'
--- a/gui/gtk_glue_agg.cpp      2008-08-18 23:53:04 +0000
+++ b/gui/gtk_glue_agg.cpp      2008-10-10 15:19:16 +0000
@@ -58,6 +58,7 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
+#include <gdk/gdkx.h>
 #include <gdk/gdkprivate.h>
 #endif
 

=== modified file 'gui/gtk_glue_agg.h'
--- a/gui/gtk_glue_agg.h        2008-09-03 11:47:05 +0000
+++ b/gui/gtk_glue_agg.h        2008-10-10 15:19:16 +0000
@@ -30,6 +30,7 @@
 // see http://www.xfree86.org/current/mit-shm.html
 // currently has some problems, see https://savannah.gnu.org/bugs/?20301
 #ifdef ENABLE_MIT_SHM
+#include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
 #endif