CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/29 16:18:17
Modified files:
. : ChangeLog configure.ac
Log message:
Patch #20616 by Nick Warne <[EMAIL PROTECTED]>:
* configure.ac: don't rely on has_kde *before* it is attempted
to be
set.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3860&r2=1.3861
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.379&r2=1.380
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3860
retrieving revision 1.3861
diff -u -b -r1.3860 -r1.3861
--- ChangeLog 29 Jul 2007 14:09:39 -0000 1.3860
+++ ChangeLog 29 Jul 2007 16:18:16 -0000 1.3861
@@ -1,3 +1,8 @@
+2007-07-29 Nick Warne <[EMAIL PROTECTED]>
+
+ * configure.ac: don't rely on has_kde *before* it is attempted to be
+ set.
+
2007-07-29 Ivor Blockley <[EMAIL PROTECTED]>
* server/array.{cpp,h}: implement remaining array.sort(..) functionality
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -b -r1.379 -r1.380
--- configure.ac 29 Jul 2007 03:55:52 -0000 1.379
+++ configure.ac 29 Jul 2007 16:18:17 -0000 1.380
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.379 2007/07/29 03:55:52 strk Exp $
+dnl $Id: configure.ac,v 1.380 2007/07/29 16:18:17 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -920,6 +920,17 @@
klash=no
fi
+dnl # Check KDE if kde gui or klash were requested
+if test x$build_kde = xyes -o x"$klash" = xyes -o x"$plugin" = xno; then
+ kde=yes
+ qt=yes
+ build_kde=yes
+ GNASH_PATH_KDE
+ GNASH_PATH_QT
+fi
+AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
+AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
+
dnl # NO kde ? NO klash !
if test x$has_kde != xyes; then
if test x$klash = xyes; then
@@ -934,17 +945,6 @@
fi
fi
-dnl # Check KDE if kde gui or klash were requested
-if test x$build_kde = xyes -o x"$klash" = xyes -o x"$plugin" = xno; then
- kde=yes
- qt=yes
- build_kde=yes
- GNASH_PATH_KDE
- GNASH_PATH_QT
-fi
-AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
-AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
-
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
AM_CONDITIONAL(BUILD_KDE_GUI, [ test x$build_kde = xyes ])
dnl AM_CONDITIONAL(BUILD_QT_GUI, [ test x$build_qt = xyes ])
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
