[Gnash-commit] [SCM] Gnash branch, master, updated. 9b8a477507c7be04734990c92daa96f2c968e594

[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  9b8a477507c7be04734990c92daa96f2c968e594 (commit)
      from  54ff144a1bf3fa9acb393cef6ace337905d9edeb (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=9b8a477507c7be04734990c92daa96f2c968e594


commit 9b8a477507c7be04734990c92daa96f2c968e594
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 11 00:37:57 2010 +0100

    Make sure PLUGINS_INSTALL_POLICY is set before GNASH_PATH_KDE* are called. 
Should fix distcheck (bug #31845)

diff --git a/configure.ac b/configure.ac
index c1a85eb..79fea4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1684,6 +1684,21 @@ if test x"${has_ssl}" = x"yes"; then
 fi
 
 dnl -----------------------------------------------------------
+dnl Set the general plugins install policy here
+dnl (NOTE: before GNASH_PATH_FIREFOX and GNASH_PATH_KDE*)
+dnl -----------------------------------------------------------
+
+AC_ARG_WITH(plugins-install,
+  AC_HELP_STRING([--with-plugins-install=system|user|prefix], [Policy for 
plugins install. Default: user.]),
+       [case "${withval}" in
+         user) PLUGINS_INSTALL_POLICY=user ;;
+         system) PLUGINS_INSTALL_POLICY=system ;;
+         prefix) PLUGINS_INSTALL_POLICY=prefix ;;
+         *)  AC_MSG_ERROR([bad value ${withval} for --with-plugins-install]) ;;
+        esac 
+       ], PLUGINS_INSTALL_POLICY=user) 
+
+dnl -----------------------------------------------------------
 dnl   Verify dependencies for requested GUIs are met, and
 dnl   disable build of the GUIS for which deps are NOT met
 dnl ------------------------------------------------------------
@@ -1971,19 +1986,6 @@ if test x$plugins = xno; then
   build_kparts4=no
 fi
 
-dnl
-dnl Set the general plugins install policy here
-dnl
-AC_ARG_WITH(plugins-install,
-  AC_HELP_STRING([--with-plugins-install=system|user|prefix], [Policy for 
plugins install. Default: user.]),
-       [case "${withval}" in
-         user) PLUGINS_INSTALL_POLICY=user ;;
-         system) PLUGINS_INSTALL_POLICY=system ;;
-         prefix) PLUGINS_INSTALL_POLICY=prefix ;;
-         *)  AC_MSG_ERROR([bad value ${withval} for --with-plugins-install]) ;;
-        esac 
-       ], PLUGINS_INSTALL_POLICY=user) 
-
 
 GNASH_PATH_FIREFOX
 

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

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


hooks/post-receive
-- 
Gnash