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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Sandro Santilli <strk>  06/11/02 17:08:18

Modified files:
        .              : ChangeLog configure.ac 
        macros         : kde.m4 

Log message:
                * configure.ac, macros/kde.m4: cleanups and verbosity for       
                  klash dependency handling.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.50&r2=1.1412.2.51
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.186.2.12&r2=1.186.2.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.20.2.2&r2=1.20.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.50
retrieving revision 1.1412.2.51
diff -u -b -r1.1412.2.50 -r1.1412.2.51
--- ChangeLog   2 Nov 2006 16:00:36 -0000       1.1412.2.50
+++ ChangeLog   2 Nov 2006 17:08:17 -0000       1.1412.2.51
@@ -1,5 +1,10 @@
 2006-11-02 Sandro Santilli <address@hidden>
 
+       * configure.ac, macros/kde.m4: cleanups and verbosity for
+         klash dependency handling.
+
+2006-11-02 Sandro Santilli <address@hidden>
+
        * configure.ac: another typo.
 
 2006-11-02 Sandro Santilli <address@hidden>

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.186.2.12
retrieving revision 1.186.2.13
diff -u -b -r1.186.2.12 -r1.186.2.13
--- configure.ac        2 Nov 2006 16:00:36 -0000       1.186.2.12
+++ configure.ac        2 Nov 2006 17:08:18 -0000       1.186.2.13
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.186.2.12 2006/11/02 16:00:36 strk Exp $
+dnl $Id: configure.ac,v 1.186.2.13 2006/11/02 17:08:18 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.2)
@@ -467,31 +467,38 @@
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(short)
 
-if test x"$plugin" = xyes -a x$klash = xyes; then
-  KDE_SET_PREFIX
-  AM_KDE_WITH_NLS
-  AC_PATH_KDE
-  KDE_USE_QT(3)
-else 
-  if test x"$gui" = xkde; then
+dnl # NO plugin ? NO klash !
+if test x"$plugin" = xno; then
+  echo "WARNING: plugin disabled, klash disabled accordingly"
+  klash=no
+fi
+
+dnl # Check KDE if kde gui or klash were requested
+if test x"$gui" = xkde -o x$klash = xyes; then
     KDE_SET_PREFIX
     AM_KDE_WITH_NLS
     AC_PATH_KDE
     KDE_USE_QT(3)
-  fi
 fi
 
-dnl If we have KDE, try to build
 if test x$have_kde = xyes; then
-  AM_CONDITIONAL(KLASH, [test x"$plugin" = xyes -a x"$klash" = xyes])
   KDE_CFLAGS="$all_includes -I$kde_includes/kio"
   KDE_LIBS="$KDE_LDFLAGS $LIB_KDEUI $LIB_KDECORE $LIB_KDEPRINT $QT_LDFLAGS 
$kde_int_qt"
 else
-  AM_CONDITIONAL(KLASH, [test x$have_kde = xyes])
   KDE_CFLAGS=""
   KDE_LIBS=""
 fi
 
+dnl # NO kde ? NO klash !
+if test x$have_kde != xyes; then
+  if test x$klash = xyes; then
+    echo "WARNING: No KDE development package installed, disabling klash"
+    klash=no
+  fi
+fi
+
+AM_CONDITIONAL(KLASH, [test x$klash = xyes])
+
 AC_SUBST(KDE_CFLAGS)
 AC_SUBST(KDE_LIBS)
 if test x$renderer = xopengl; then

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- macros/kde.m4       2 Nov 2006 00:09:57 -0000       1.20.2.2
+++ macros/kde.m4       2 Nov 2006 17:08:18 -0000       1.20.2.3
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl $Id: kde.m4,v 1.20.2.2 2006/11/02 00:09:57 rsavoye Exp $
+dnl $Id: kde.m4,v 1.20.2.3 2006/11/02 17:08:18 strk Exp $
 
 dnl ------------------------------------------------------------------------
 dnl Find a file (or one of more files in a list of dirs)
@@ -389,6 +389,7 @@
 AC_DEFUN([KDE_MISSING_PROG_ERROR],
 [
     AC_MSG_NOTICE([$1 not found])
+    AC_MSG_NOTICE([WARNING: klash disabled due to this])
     klash=no
 ])