[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac macros/kde.m4
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac macros/kde.m4 |
Date: |
Sun, 22 Oct 2006 10:55:05 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/22 10:55:05
Modified files:
. : ChangeLog configure.ac
macros : kde.m4
Log message:
* configure.ac: Don't look for KDE if not --enable-plugin.
Wrong amount of args to 'test'. AC_DEFINE(KLASH...)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1339&r2=1.1340
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.173&r2=1.174
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.16&r2=1.17
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -b -r1.1339 -r1.1340
--- ChangeLog 22 Oct 2006 01:56:30 -0000 1.1339
+++ ChangeLog 22 Oct 2006 10:55:04 -0000 1.1340
@@ -1,3 +1,8 @@
+2006-10-22 Markus Gothe <address@hidden>
+
+ * configure.ac: Don't look for KDE if not --enable-plugin.
+ Wrong amount of args to 'test'. AC_DEFINE(KLASH...).
+
2006-10-21 Rob Savoye <address@hidden>
* gnash/NEWS: Update with new fetures.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- configure.ac 21 Oct 2006 16:37:03 -0000 1.173
+++ configure.ac 22 Oct 2006 10:55:04 -0000 1.174
@@ -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.173 2006/10/21 16:37:03 rsavoye Exp $
+dnl $Id: configure.ac,v 1.174 2006/10/22 10:55:04 nihilus Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.1-cvs)
@@ -66,6 +66,8 @@
*) 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 ;;
@@ -496,14 +498,26 @@
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(long long)
-if test x"$plugin" = xyes -o x$gui = xkde -o x$klash = xyes; then
+if test x"$gui" = xkde; 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
KDE_SET_PREFIX
AM_KDE_WITH_NLS
AC_PATH_KDE
KDE_USE_QT(3)
+ fi
fi
+
dnl If we have KDE, try to build
-AM_CONDITIONAL(KLASH, test x$kde = xyes -a x"$plugin" = xyes -a x"$klash" =
xyes)
+if test x$kde = xyes; then
+ AM_CONDITIONAL(KLASH, [test x"$plugin" = xyes -a x"$klash" = xyes])
+else
+ AM_CONDITIONAL(KLASH, [test x$kde = xyes])
+fi
if test x$renderer = xopengl; then
GNASH_PATH_OPENGL
@@ -531,7 +545,7 @@
AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
dnl these conditionals were moved out of kde.m4
-AM_CONDITIONAL(HAS_KDE, test x$kde = xyes)
+AM_CONDITIONAL(HAS_KDE, [test x$kde = xyes])
# used to disable x11-specific stuff on special platforms
AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test
"$kde_use_qt_mac" = "no")
AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/kde.m4 17 Oct 2006 16:46:16 -0000 1.16
+++ macros/kde.m4 22 Oct 2006 10:55:05 -0000 1.17
@@ -35,6 +35,8 @@
dnl
dnl
+dnl $Id: kde.m4,v 1.17 2006/10/22 10:55:05 nihilus Exp $
+
# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
dnl Set ac_x_includes and/or ac_x_libraries.
- [Gnash-commit] gnash ChangeLog configure.ac macros/kde.m4,
Markus Gothe <=