[Gnash-commit] gnash configure.ac ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/22 19:36:50

Modified files:
        .              : configure.ac ChangeLog 

Log message:
                * configure.ac: Group --disable-klash and --enable-plugin
                together. Reverse the test to run KDE tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.178&r2=1.179
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1348&r2=1.1349

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- configure.ac        22 Oct 2006 19:09:15 -0000      1.178
+++ configure.ac        22 Oct 2006 19:36:50 -0000      1.179
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.178 2006/10/22 19:09:15 nihilus Exp $
+dnl $Id: configure.ac,v 1.179 2006/10/22 19:36:50 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -58,16 +58,6 @@
 
 AC_DISABLE_STATIC dnl Disable building static libs.
 
-dnl Add KFLASH support, if specified.
-AC_ARG_ENABLE(klash, AC_HELP_STRING([--disble-klash], [Disable support for 
Konqueror plugin]),
-[case "${enableval}" in
-  yes) klash=yes ;;
-  no)  klash=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-klash option]) ;;
-esac],klash=yes)
-
-AM_CONDITIONAL(KLASH, test x$klash = xyes)
-
 AC_ARG_ENABLE(fork, AC_HELP_STRING([--disable-fork],[Use a thread instead 
forking the standalone player.]),
 [case "${enableval}" in
   yes) fork=yes ;;
@@ -362,6 +352,16 @@
 )
 AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
 
+dnl Add KFLASH support, if specified.
+AC_ARG_ENABLE(klash, AC_HELP_STRING([--disble-klash], [Disable support for 
Konqueror plugin]),
+[case "${enableval}" in
+  yes) klash=yes ;;
+  no)  klash=no ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-klash option]) ;;
+esac],klash=yes)
+
+AM_CONDITIONAL(KLASH, test x$klash = xyes)
+
 GNASH_PATH_FIREFOX
 AC_PATH_XTRA
 AC_CHECK_HEADERS(dejagnu.h)
@@ -495,13 +495,13 @@
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(short)
 
-if test x"$gui" = xkde; then
+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"$plugin" = xyes -a x$klash = xyes; then
+  if test x"$gui" = xkde; then
        KDE_SET_PREFIX
        AM_KDE_WITH_NLS
        AC_PATH_KDE

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1348
retrieving revision 1.1349
diff -u -b -r1.1348 -r1.1349
--- ChangeLog   22 Oct 2006 19:09:15 -0000      1.1348
+++ ChangeLog   22 Oct 2006 19:36:50 -0000      1.1349
@@ -11,6 +11,9 @@
 
 2006-10-22  Rob Savoye  <address@hidden>
 
+       * configure.ac: Group --disable-klash and --enable-plugin
+       together. Reverse the test to run KDE tests.
+       
        * gui/Makefile.am: Don't link with -no-undefined to reduce
        dependancy problems.
        * plugin/Makefile.am, klash/Makefile.am: Don't link with