[Gnash-commit] [SCM] Gnash branch, master, updated. a6212be7c5c28468a797c29fe6b69c52304423d8

[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  a6212be7c5c28468a797c29fe6b69c52304423d8 (commit)
      from  723b0af80ad87f03dea02204c6fcfb154d3a9e7b (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=a6212be7c5c28468a797c29fe6b69c52304423d8


commit a6212be7c5c28468a797c29fe6b69c52304423d8
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 4 16:43:58 2010 +0100

    Implement yes/no/auto for kde3, default to auto

diff --git a/configure.ac b/configure.ac
index 45eb3ab..932b530 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,6 +665,7 @@ AC_ARG_ENABLE(gui,
   else if test x"${haiku}" = xyes; then
     build_haiku=yes;
   else
+    build_kde3=auto
     build_kde4=auto
     build_gtk=yes
   fi
@@ -1762,7 +1763,6 @@ if test x$build_gtk = xyes -o $build_alp = xyes; then
       GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
    fi
 fi
-dnl TODO: add checks for all other GUIs
 
 
 if test x"${build_kde4}" != xno -o x"${build_qtopia4}" != xno; then
@@ -1781,7 +1781,24 @@ if test x"${build_kde4}" = xauto; then
   fi
 fi
 
+if test x"${build_kde3}" != xno -o x"${build_qtopia3}" != xno; then
+ GNASH_PATH_QT3
+fi
+
+if test x"${build_kde3}" != xno; then
+  GNASH_PATH_KDE3
+fi
+
+
+if test x"${build_kde3}" = xauto; then
+  if test x"${has_qt3}" = xyes -a x"${has_kde3}" = xyes; then
+     build_kde3=yes
+  else
+     build_kde3=no
+  fi
+fi
 
+dnl TODO: add checks for all other GUIs
 
 dnl -----------------------------------------------------------
 dnl Try to ignore stupid dependencies
@@ -2330,14 +2347,6 @@ fi
 
 AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
 
-if test x"${build_kde3}" != xno -o x"${build_qtopia3}" != xno; then
- GNASH_PATH_QT3
-fi
-
-if test x"${build_kde3}" = xyes; then
-  GNASH_PATH_KDE3
-fi
-
 dnl Qtopia is a desktop environment for embedded devices.
 dnl GNASH_PATH_QTOPIA3
 dnl GNASH_PATH_QTOPIA4

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

Summary of changes:
 configure.ac |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Gnash