[Gnash-commit] gnash ChangeLog macros/kde.m4

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/05/26 18:17:32

Modified files:
        .              : ChangeLog 
        macros         : kde.m4 

Log message:
        Check if we actually need the kde subdirectory of the
                KDE prefix we got from kde-config.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3366&r2=1.3367
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3366
retrieving revision 1.3367
diff -u -b -r1.3366 -r1.3367
--- ChangeLog   26 May 2007 17:08:47 -0000      1.3366
+++ ChangeLog   26 May 2007 18:17:31 -0000      1.3367
@@ -27,6 +27,8 @@
        in case SetWindow is never called (for "hidden" flash movies).
        * gui/gnash.cpp: If the plugin attempts to create a 0x0 pixels window
        don't try to create a rendering GUI.
+       * macros/kde.m4: Check if we actually need the kde subdirectory of the
+       KDE prefix we got from kde-config.
 
 2007-05-26 Ann Barcomb <address@hidden>
 

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/kde.m4       8 Apr 2007 23:06:17 -0000       1.29
+++ macros/kde.m4       26 May 2007 18:17:32 -0000      1.30
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: kde.m4,v 1.29 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: kde.m4,v 1.30 2007/05/26 18:17:32 bjacques Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -37,8 +37,16 @@
     if test "x$KDE_CONFIG" != "x" ; then
       if test "x$KDE_CFLAGS" = "x" ; then
         kde_prefix=`$KDE_CONFIG --prefix`
+
+        if test -f ${kde_prefix}/include/kapp.h ; then
+          ac_cv_path_kde_incl="-I${kde_prefix}/include 
-I${kde_prefix}/include/kio"
+        else
+         if test -f ${kde_prefix}/include/kde/kapp.h; then
         ac_cv_path_kde_incl="-I${kde_prefix}/include/kde 
-I${kde_prefix}/include/kde/kio"
       fi
+        fi
+
+      fi
     else
       AC_MSG_RESULT(no)
     fi