[Gnash-commit] [SCM] Gnash branch, master, updated. 0744e871cc5a3827871b419c20ecd768edc1c439

[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  0744e871cc5a3827871b419c20ecd768edc1c439 (commit)
       via  fc62c589fe81eb775517beeb9ecc5ceea2392e3e (commit)
      from  55f2cc3d7add35bc707bcaba8c5cb4ed29592209 (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=0744e871cc5a3827871b419c20ecd768edc1c439


commit 0744e871cc5a3827871b419c20ecd768edc1c439
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 4 22:30:47 2010 +0100

    Don't set has_kde4 if headers are not found too

diff --git a/macros/kde4.m4 b/macros/kde4.m4
index 4e55d20..4caffcf 100644
--- a/macros/kde4.m4
+++ b/macros/kde4.m4
@@ -216,17 +216,14 @@ AC_DEFUN([GNASH_PATH_KDE4],
     else
       KDE4_CFLAGS=""
     fi
-  else
-    KDE4_CFLAGS=""
-  fi
-
-  if test x"${ac_cv_path_kde4_lib}" != x; then
-    KDE4_LIBS="${ac_cv_path_kde4_lib}"
-    AC_DEFINE(HAVE_KDE4, 1,[Have KDE 4.x installed])
-    has_kde4=yes
-  else
-    KDE4_LIBS=""
-    has_kde4=no
+    if test x"${ac_cv_path_kde4_lib}" != x; then
+      KDE4_LIBS="${ac_cv_path_kde4_lib}"
+      AC_DEFINE(HAVE_KDE4, 1,[Have KDE 4.x installed])
+      has_kde4=yes
+    else
+      KDE4_LIBS=""
+      has_kde4=no
+    fi
   fi
 
   AC_SUBST(KLASH_PLUGIN)

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


commit fc62c589fe81eb775517beeb9ecc5ceea2392e3e
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 4 22:30:24 2010 +0100

    update informations about disabling kde4 gui

diff --git a/configure.ac b/configure.ac
index 58ce70a..9c2c59d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3108,11 +3108,11 @@ 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 "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 "               and omit "kde4" from the list" >&3
+      echo "               or avoid --enable-gui=... as a whole." >&3
       echo "               To be able to build the kde 4.x gui," >&3
-      echo "               install version 4.x of the KDE development 
environment from http://kde.org"; >&3
+      echo "               install version 4.x of the KDE development 
environment" >&3
+      echo "               from http://kde.org"; >&3
       echo "               or .deb users: apt-get install kdelibs5-dev" >&3
       echo "               or .rpm users: yum install kdelibs-devel." >&3
   fi

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

Summary of changes:
 configure.ac   |    8 ++++----
 macros/kde4.m4 |   19 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Gnash