CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 07/07/28 01:59:15
Modified files:
. : configure.ac
Log message:
Same as above, but this one relly fixed it
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.373&r2=1.374
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -b -r1.373 -r1.374
--- configure.ac 28 Jul 2007 01:40:41 -0000 1.373
+++ configure.ac 28 Jul 2007 01:59:15 -0000 1.374
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.373 2007/07/28 01:40:41 nihilus Exp $
+dnl $Id: configure.ac,v 1.374 2007/07/28 01:59:15 nihilus Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -956,8 +956,22 @@
klash=no
fi
+dnl # NO kde ? NO klash !
+if test x$has_kde != xyes; then
+ if test x$klash = xyes; then
+ echo "WARNING: No KDE development package installed, disabling klash"
+ klash=no
+ fi
+fi
+if test x$has_qt != xyes; then
+ if test x$klash = xyes; then
+ echo "WARNING: No QT development package installed, disabling klash"
+ klash=no
+ 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
+if test x$build_kde = xyes -o x"$klash" = xyes -o x"$plugin" = xno; then
kde=yes
qt=yes
build_kde=yes
@@ -977,21 +991,6 @@
AM_CONDITIONAL(BUILD_AQUA_GUI, [ test x$build_aqua = xyes ])
AM_CONDITIONAL(BUILD_RISCOS_GUI, [ test x$build_riscos = xyes ])
-
-dnl # NO kde ? NO klash !
-if test x$has_kde != xyes; then
- if test x$klash = xyes; then
- echo "WARNING: No KDE development package installed, disabling klash"
- fi
- klash=no
-fi
-if test x$has_qt != xyes; then
- if test x$klash = xyes; then
- echo "WARNING: No QT development package installed, disabling klash"
- fi
- klash=no
-fi
-
AM_CONDITIONAL(KLASH, [test x$klash = xyes])
AC_SUBST(KDE_CFLAGS)
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
