[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-66-g17d5a9b

[Gabriele Giacone]

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  17d5a9b3f3776dfe10e3c88b41f458adff81e6fc (commit)
      from  98f6344583343f17d9b6acea9ac3f1bf46ea6765 (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=17d5a9b3f3776dfe10e3c88b41f458adff81e6fc


commit 17d5a9b3f3776dfe10e3c88b41f458adff81e6fc
Author: Gabriele Giacone <address@hidden>
Date:   Tue Feb 15 03:17:43 2011 +0100

    lib64/ on debian amd64 is just a link. When provided, with_kde4_* configure 
options are full path

diff --git a/macros/kde4.m4 b/macros/kde4.m4
index 2825877..8b16768 100644
--- a/macros/kde4.m4
+++ b/macros/kde4.m4
@@ -192,31 +192,23 @@ AC_DEFUN([GNASH_PATH_KDE4],
     fi
 
     if test x"${with_kde4_plugindir}" != x ; then 
-      if test -d ${with_kde4_plugindir}/lib64; then
-        KDE4_PLUGINDIR="${with_kde4_plugindir}/lib64/kde4"
-      else
-        KDE4_PLUGINDIR="${with_kde4_plugindir}/lib/kde4"
-      fi
+      KDE4_PLUGINDIR="${with_kde4_plugindir}"
     else
-      if test -d ${KDE4_PREFIX}/lib64; then
+      if test -d ${KDE4_PREFIX}/lib64 -a ! -h ${KDE4_PREFIX}/lib64; then
         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
       else
         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
       fi
     fi
     if test x"${with_kde4_servicesdir}" != x ; then 
-      KDE4_SERVICESDIR="${with_kde4_servicesdir}/share/kde4/services"
+      KDE4_SERVICESDIR="${with_kde4_servicesdir}"
     else
       KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
     fi
-    if test x"${KDE4_CONFIGDIR}" != x ; then 
-      KDE4_CONFIGDIR="${KDE4_CONFIGDIR}/share/kde4/config"
-    else
+    if test x"${KDE4_CONFIGDIR}" = x ; then 
       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
     fi
-    if test x"${KDE4_APPSDATADIR}" != x ; then 
-      KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/kde4/apps/klash"
-    else
+    if test x"${KDE4_APPSDATADIR}" = x ; then 
       KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
     fi
 

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

Summary of changes:
 macros/kde4.m4 |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash