CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/23 19:51:14
Modified files:
. : ChangeLog configure.ac
Log message:
* configure.ac: make sure $add_renderer contain
well-defined values (not arbitrary ones). This is
to make sure RENDERER_LIBS is always meaningful.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3795&r2=1.3796
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.364&r2=1.365
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3795
retrieving revision 1.3796
diff -u -b -r1.3795 -r1.3796
--- ChangeLog 23 Jul 2007 18:22:33 -0000 1.3795
+++ ChangeLog 23 Jul 2007 19:51:14 -0000 1.3796
@@ -1,5 +1,11 @@
2007-07-23 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac: make sure $add_renderer contain
+ well-defined values (not arbitrary ones). This is
+ to make sure RENDERER_LIBS is always meaningful.
+
+2007-07-23 Sandro Santilli <[EMAIL PROTECTED]>
+
* plugin/klash/Makefile.am: define GNASHBINDIR.
* configure.ac: don't define RENDERER_AGG *before* the build_agg
variable it is based on has a chance to change value.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -b -r1.364 -r1.365
--- configure.ac 23 Jul 2007 17:40:09 -0000 1.364
+++ configure.ac 23 Jul 2007 19:51:14 -0000 1.365
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.364 2007/07/23 17:40:09 strk Exp $
+dnl $Id: configure.ac,v 1.365 2007/07/23 19:51:14 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -294,7 +294,7 @@
dnl addgui="gtk,kde"
fi
-add_renderer=none
+add_renderer=
build_ogl=no
build_agg=no
build_cairo=no
@@ -309,17 +309,21 @@
[case "${val}" in
ogl|OGL|gl|GL|opengl|OPENGL|OpenGL)
build_ogl=yes
+ add_renderer="ogl"
;;
agg|AGG|Agg)
build_agg=yes
+ add_renderer="agg"
;;
cairo|CAIRO|Cairo)
build_cairo=yes
+ add_renderer="cairo"
;;
all|ALL|All)
build_ogl=yes
build_agg=yes
build_cairo=yes
+ add_renderer="ogl,agg,cairo"
;;
*) AC_MSG_ERROR([invalid renderer ${enableval} given (accept:
ogl,agg,cairo)])
;;
@@ -331,7 +335,7 @@
done
)
-if test x$add_renderer = xnone; then
+if test x$add_renderer = x; then
build_ogl=yes
build_agg=yes
dnl add_renderer="ogl,agg"
@@ -549,7 +553,7 @@
AC_MSG_NOTICE([Defaulting to GTK as the GUI, use --enable-gui= to change])
fi
dnl If statically linking, and no renderer is specified, force opengl
- if test x$add_renderer = xnone; then
+ if test x$add_renderer = x; then
build_agg=no
build_ogl=yes
add_renderer=ogl
@@ -565,7 +569,7 @@
AC_MSG_NOTICE([Defaulting to GTK as the GUI, use --enable-gui= to
change])
fi
dnl If not dynamic loading, and no renderer is specified, force opengl
- if test x$add_renderer = xnone; then
+ if test x$add_renderer = x; then
build_agg=no
build_ogl=yes
add_renderer=ogl
@@ -580,7 +584,7 @@
AC_MSG_NOTICE([Defaulting to GTK and KDE as the GUIs, use --enable-gui=
to change])
fi
dnl If dynamically loading and no renderer is specified, force opengl and
agg
- if test x$add_renderer = xnone; then
+ if test x$add_renderer = x; then
build_ogl=yes
build_agg=yes
add_renderer="ogl,agg"
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
