[Gnash-commit] [SCM] Gnash branch, master, updated. 027f27df8b3dc04e51f5af8d54a9c8fe35c42373

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  027f27df8b3dc04e51f5af8d54a9c8fe35c42373 (commit)
       via  3def4785bb9a89be1fe61c239a40994171d74a15 (commit)
      from  1ada75853b271dfa90b91a9bbf4e3df383d36695 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=027f27df8b3dc04e51f5af8d54a9c8fe35c42373


commit 027f27df8b3dc04e51f5af8d54a9c8fe35c42373
Author: Sandro Santilli <address@hidden>
Date:   Fri Dec 10 15:47:57 2010 +0100

    Implement auto/yes/no for SDL gui. Defaults to auto. Builds if SDL libs are 
found.

diff --git a/configure.ac b/configure.ac
index 8a3b65a..c1a85eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,6 +649,7 @@ AC_ARG_ENABLE(gui,
   done],
   [ dnl Run the following code if no --enable-gui is given
   build_fb=auto
+  build_sdl=auto
   if test x"${openbsd_os}" = x"openbsd"; then
     build_kde3=yes;
     build_gtk=yes;
@@ -806,6 +807,25 @@ fi
 MEDIA_CONFIG="${media_list}"
 AC_SUBST(MEDIA_CONFIG)
 
+dnl -----------------------------------------------------
+dnl Check for SDL and decide about auto gui accordingly.
+dnl Need be done after build_sound_sdl and build_sdl are
+dnl initialized and before they are checked for yes/no
+dnl -----------------------------------------------------
+
+if test x$build_sdl != xno -o x$build_sound_sdl = xyes; then
+  GNASH_PATH_SDL
+fi
+
+if test x"${build_sdl}" = xauto; then
+  if test xyes = x"${has_sdl}"; then
+    build_sdl=yes
+  else
+    AC_MSG_NOTICE([sdl GUI won't be built (no sdl development files found)])
+    build_sdl=no
+  fi
+fi
+
 
 dnl -------------------------------
 dnl Renderer Selection
@@ -2384,10 +2404,6 @@ AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
 dnl currently unused
 dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
 
-if test x$build_sdl = xyes -o x$build_sound_sdl = xyes; then
-  GNASH_PATH_SDL
-fi
-
 dnl Qtopia is a desktop environment for embedded devices.
 dnl GNASH_PATH_QTOPIA3
 dnl GNASH_PATH_QTOPIA4

http://git.savannah.gnu.org/cgit//commit/?id=3def4785bb9a89be1fe61c239a40994171d74a15


commit 3def4785bb9a89be1fe61c239a40994171d74a15
Author: Sandro Santilli <address@hidden>
Date:   Fri Dec 10 14:58:25 2010 +0100

    Remove unused HAVE_SDL conditional

diff --git a/configure.ac b/configure.ac
index 7f8de8a..8a3b65a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2388,8 +2388,6 @@ if test x$build_sdl = xyes -o x$build_sound_sdl = xyes; 
then
   GNASH_PATH_SDL
 fi
 
-AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
-
 dnl Qtopia is a desktop environment for embedded devices.
 dnl GNASH_PATH_QTOPIA3
 dnl GNASH_PATH_QTOPIA4

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash