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

[Benjamin Wolsey]

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  f0c647497124ca2595138033fa3f2f4cb1ce500f (commit)
      from  b6a84cbdeb180b44f97533d814074f7238835689 (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=f0c647497124ca2595138033fa3f2f4cb1ce500f


commit f0c647497124ca2595138033fa3f2f4cb1ce500f
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Nov 8 08:32:19 2010 +0100

    Use more standard variable in configure.

diff --git a/configure.ac b/configure.ac
index 664cf97..3125fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2176,26 +2176,29 @@ GNASH_PKG_FIND(fontconfig, [fontconfig/fontconfig.h], 
[fontconfig library], FcFo
 if test x$cross_compiling = xno; then
   AC_PATH_MING
 fi
-AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x && test $MING_VERSION_CODE 
-ge 00040000 ])
+
+makeswf_installed=[test "$MAKESWF" != x && test $MING_VERSION_CODE -ge 
00040000 ]
+
+AM_CONDITIONAL(ENABLE_MING, $makeswf_installed)
 
 AM_CONDITIONAL(MING_VERSION_0_4,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040000  ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040000  ])
 AM_CONDITIONAL(MAKESWF_SUPPORTS_PREBUILT_CLIPS,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040002  ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040002  ])
 AM_CONDITIONAL(MING_SUPPORTS_INIT_ACTIONS,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040004  ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040004  ])
 AM_CONDITIONAL(MING_SUPPORTS_REPLACE_TAG,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040005 ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040005 ])
 AM_CONDITIONAL(MING_SUPPORTS_SWFBUTTON_ADD_CHARACTER,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040005 ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040005 ])
 AM_CONDITIONAL(MING_SUPPORTS_STREAMING_SOUND,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040006 ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040006 ])
 AM_CONDITIONAL(MING_SUPPORTS_SWFBUTTON_SET_DEPTH,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040006 ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040006 ])
 AM_CONDITIONAL(MING_VERSION_0_4_3,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040300 ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040300 ])
 AM_CONDITIONAL(MING_VERSION_0_4_4,
-        [ ENABLE_MING && test $MING_VERSION_CODE -ge 00040400 ])
+        [ ${makeswf_installed} && test $MING_VERSION_CODE -ge 00040400 ])
 
 if test x$cross_compiling = xno; then
   AC_ARG_WITH([swfdec_testsuite],

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

Summary of changes:
 configure.ac |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash