[Gnash-commit] [SCM] Gnash branch, master, updated. 723b0af80ad87f03dea02204c6fcfb154d3a9e7b

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


commit 723b0af80ad87f03dea02204c6fcfb154d3a9e7b
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 4 15:51:31 2010 +0100

    Implement yes/no/auto semantic for kde4 gui. Default to auto.

diff --git a/configure.ac b/configure.ac
index fcc1e08..45eb3ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,8 +665,8 @@ AC_ARG_ENABLE(gui,
   else if test x"${haiku}" = xyes; then
     build_haiku=yes;
   else
-    build_kde4=yes;
-    build_gtk=yes;
+    build_kde4=auto
+    build_gtk=yes
   fi
   fi]
 )
@@ -1765,6 +1765,24 @@ fi
 dnl TODO: add checks for all other GUIs
 
 
+if test x"${build_kde4}" != xno -o x"${build_qtopia4}" != xno; then
+ GNASH_PATH_QT4
+fi
+
+if test x"${build_kde4}" != xno; then
+  GNASH_PATH_KDE4
+fi
+
+if test x"${build_kde4}" = xauto; then
+  if test x"${has_qt4}" = xyes -a x"${has_kde4}" = xyes; then
+     build_kde4=yes
+  else
+     build_kde4=no
+  fi
+fi
+
+
+
 dnl -----------------------------------------------------------
 dnl Try to ignore stupid dependencies
 dnl -----------------------------------------------------------
@@ -2320,14 +2338,6 @@ if test x"${build_kde3}" = xyes; then
   GNASH_PATH_KDE3
 fi
 
-if test x"${build_kde4}" != xno -o x"${build_qtopia4}" != xno; then
- GNASH_PATH_QT4
-fi
-
-if test x"${build_kde4}" = xyes; then
-  GNASH_PATH_KDE4
-fi
-
 dnl Qtopia is a desktop environment for embedded devices.
 dnl GNASH_PATH_QTOPIA3
 dnl GNASH_PATH_QTOPIA4
@@ -3090,7 +3100,7 @@ if test x$build_kde4 = xyes; then
       echo "        ERROR: No KDE 4.x development package installed!" >&3
       echo "               To disable the KDE 4.x gui," >&3
       echo "               reconfigure using --enable-gui=<list-of-guis>" >&3
-      echo "               and omit "kde" from the list." >&3
+      echo "               and omit "kde4" from the list." >&3
       echo "               When the option --enable-gui=... is omitted," >&3
       echo "               the default is the same of --enable-gui=kde,gtk" >&3
       echo "               To be able to build the kde 4.x gui," >&3

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

Summary of changes:
 configure.ac |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash