[Gnash-commit] [SCM] Gnash branch, master, updated. d8dbdaf804b5f64f7452003d269f9099fd626440

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  d8dbdaf804b5f64f7452003d269f9099fd626440 (commit)
       via  8130f3a33368e58fe65e9e5f56ed35e983b3d209 (commit)
      from  bfa00dee0eb79cb74e197e78c73a062bdd7eb1ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=d8dbdaf804b5f64f7452003d269f9099fd626440


commit d8dbdaf804b5f64f7452003d269f9099fd626440
Merge: 8130f3a bfa00de
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 23:35:08 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=8130f3a33368e58fe65e9e5f56ed35e983b3d209


commit 8130f3a33368e58fe65e9e5f56ed35e983b3d209
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 23:34:08 2010 +0100

    Implement yes/no/auto for "dump" gui. Defaults to auto (builds if AGG 
renderer is available). Fix silent failure at building it, now will bail out at 
configure time if you asked for dump and not for agg.

diff --git a/configure.ac b/configure.ac
index 417fae3..10dd37d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -667,6 +667,7 @@ AC_ARG_ENABLE(gui,
   else
     build_kde4=auto
     build_gtk=yes
+    build_dump=auto
   fi
   fi]
 )
@@ -1800,6 +1801,19 @@ if test x"${build_kde3}" = xauto; then
   fi
 fi
 
+dnl Check possibility to build DUMP gui, if requested
+if test x"${build_dump}" != xno; then
+  if test x"${build_agg}" = xyes; then
+    build_dump=yes
+  else
+    if test x"${build_dump}" = xyes; then
+      dnl SHOULD we just check at the end of file instead ?
+      AC_MSG_ERROR(dump GUI cannot be built without AGG renderer);
+    fi
+    build_dump=no
+  fi
+fi
+
 dnl TODO: add checks for all other GUIs
 
 dnl -----------------------------------------------------------
diff --git a/gui/dump/dump.am b/gui/dump/dump.am
index 8db3d0b..dc362d1 100644
--- a/gui/dump/dump.am
+++ b/gui/dump/dump.am
@@ -19,12 +19,10 @@
 # Build the DUMP gui
 #
 if BUILD_DUMP_GUI
-if BUILD_AGG_RENDERER
 bin_PROGRAMS += dump-gnash
 dump_gnash_SOURCES = $(GUI_SRCS) dump/gui_dump.cpp dump/dump.cpp dump/dump.h
 dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
        $(AM_CPPFLAGS) $(DUMP_CFLAGS) $(AGG_CFLAGS)
 dump_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS) 
 dump_gnash_LDADD = $(GNASH_LIBS) $(DUMP_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
-endif                          # BUILD_AGG_RENDERER
 endif                          # BUILD_DUMP_GUI

-----------------------------------------------------------------------

Summary of changes:
 configure.ac     |   14 ++++++++++++++
 gui/dump/dump.am |    2 --
 2 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash