CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/29 03:55:52
Modified files:
. : ChangeLog configure.ac
Log message:
* configure.ac: re-introduce the $add_gui variable, so that a
vanilla
configuration still tries to build gtk and kde guis; don't
make fb
renderer and cairo gui incompatible (other guis might be
requested,
we'd need a better test to check that at least one compatible
with
cairo is there)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3855&r2=1.3856
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.378&r2=1.379
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3855
retrieving revision 1.3856
diff -u -b -r1.3855 -r1.3856
--- ChangeLog 29 Jul 2007 03:39:15 -0000 1.3855
+++ ChangeLog 29 Jul 2007 03:55:52 -0000 1.3856
@@ -1,5 +1,13 @@
2007-07-28 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac: re-introduce the $add_gui variable, so that a vanilla
+ configuration still tries to build gtk and kde guis; don't make fb
+ renderer and cairo gui incompatible (other guis might be requested,
+ we'd need a better test to check that at least one compatible with
+ cairo is there)
+
+2007-07-28 Sandro Santilli <[EMAIL PROTECTED]>
+
* configure.ac: don't miss to set add_renderer when no
--enable-renderer is given, and only abort complaining if NO
GUI supporting opengl is built while also requesting to build opengl
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -b -r1.378 -r1.379
--- configure.ac 29 Jul 2007 03:39:15 -0000 1.378
+++ configure.ac 29 Jul 2007 03:55:52 -0000 1.379
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.378 2007/07/29 03:39:15 strk Exp $
+dnl $Id: configure.ac,v 1.379 2007/07/29 03:55:52 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -229,6 +229,7 @@
*) AC_MSG_ERROR([bad value ${enableval} for --disable-klash option]) ;;
esac],klash=yes)
+add_gui=
build_fb=no
build_fltk=no
build_kde=no
@@ -310,6 +311,12 @@
done
)
+if test x$add_gui = x; then
+ build_gtk=yes
+ build_kde=yes
+ add_gui="gtk,kde"
+fi
+
add_renderer=
build_ogl=no
build_agg=no
@@ -360,7 +367,7 @@
if test x$build_ogl = xyes; then
dnl if test x$build_fb = xyes -o x$build_fltk = xyes; then
if test x$build_gtk != xyes -a x$build_fltk != xyes -a x$build_kde != xyes;
then
- AC_MSG_ERROR([OpenGL renderer is not supported by the this gui. Try using
AGG ( --enable-renderer=AGG ).]);
+ AC_MSG_ERROR([OpenGL renderer needs one of gtk,fltk or kde guis. Try
enabling any of them ( --enable-gui=gtk|kde|fltk ) or using AGG (
--enable-renderer=AGG ).]);
fi
AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
fi
@@ -1079,9 +1086,9 @@
dnl CAIRO_CFLAGS=`echo ${CAIRO_CFLAGS} | sed -e 's/ *//'`
dnl CAIRO_CFLAGS="${CAIRO_CFLAGS} ${CAIRO_CFLAGS}/cairo"
dnl fi
- if test x$build_fb = xyes; then
- AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
- fi
+dnl if test x$build_fb = xyes; then
+dnl AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
+dnl fi
AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
fi
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
