[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac |
Date: |
Thu, 26 Jul 2007 04:05:51 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/26 04:05:51
Modified files:
. : ChangeLog configure.ac
Log message:
* configure.ac: set the BUILD_<gui> conditionals *after* giving
kde
gui a chance to be picked back as a dependency of 'klash'.
This fixes a buil bug when klash is enabled by only gtk gui is
selected.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3830&r2=1.3831
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.367&r2=1.368
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3830
retrieving revision 1.3831
diff -u -b -r1.3830 -r1.3831
--- ChangeLog 26 Jul 2007 03:41:16 -0000 1.3830
+++ ChangeLog 26 Jul 2007 04:05:50 -0000 1.3831
@@ -1,5 +1,9 @@
2007-07-25 Sandro Santilli <address@hidden>
+ * configure.ac: set the BUILD_<gui> conditionals *after* giving kde
+ gui a chance to be picked back as a dependency of 'klash'.
+ This fixes a buil bug when klash is enabled by only gtk gui is
+ selected.
* lots of files : fixed Copyright info (delete spurious empty line,
add year 2007).
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- configure.ac 24 Jul 2007 22:55:26 -0000 1.367
+++ configure.ac 26 Jul 2007 04:05:50 -0000 1.368
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.367 2007/07/24 22:55:26 strk Exp $
+dnl $Id: configure.ac,v 1.368 2007/07/26 04:05:50 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -593,15 +593,6 @@
fi
fi
-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 ])
-AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
-AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
-AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
-AM_CONDITIONAL(BUILD_AQUA_GUI, [ test x$build_aqua = xyes ])
-AM_CONDITIONAL(BUILD_RISCOS_GUI, [ test x$build_riscos = xyes ])
-
AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes ])
AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg = xyes ])
AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x$build_cairo = xyes ])
@@ -961,12 +952,23 @@
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 ])
+AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
+AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
+AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
+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
- [Gnash-commit] gnash ChangeLog configure.ac, (continued)
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/03
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/18
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/19
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/19
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/19
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/23
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/23
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/23
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/23
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/24
- [Gnash-commit] gnash ChangeLog configure.ac,
Sandro Santilli <=
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/26
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/26
- [Gnash-commit] gnash ChangeLog configure.ac, Markus Gothe, 2007/07/27
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/28
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/28
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/28
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/28
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/28
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/29
- [Gnash-commit] gnash ChangeLog configure.ac, Sandro Santilli, 2007/07/29