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

[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  b3010e9d2fdb0192f2124521f6242c95ac302849 (commit)
       via  ab9153d1475f22a2f6efa7a4ce85c1d55cc06be8 (commit)
      from  579bbbedb5151c9dc87433e1fef37c5c22e3a2fa (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=b3010e9d2fdb0192f2124521f6242c95ac302849


commit b3010e9d2fdb0192f2124521f6242c95ac302849
Merge: ab9153d 579bbbe
Author: Sandro Santilli <address@hidden>
Date:   Mon Nov 8 22:30:14 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash
    
    Conflicts:
        macros/boost.m4


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


commit ab9153d1475f22a2f6efa7a4ce85c1d55cc06be8
Author: Sandro Santilli <address@hidden>
Date:   Mon Nov 8 22:27:37 2010 +0100

    underscore seems to work better for program_option (boost)

diff --git a/macros/boost.m4 b/macros/boost.m4
index 88d96eb..9901c61 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -36,7 +36,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp 
multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp 
program_options/options_description.hpp"
   dnl this is a list of *required* libraries. If any of these are missing, this
   dnl test will return a failure, and Gnash won't build.
-  boost_libs="thread program-options"
+  boost_libs="thread program_options"
 
   dnl this is a list of *recommended* libraries. If any of these are missing, 
this
   dnl test will return a warning, and Gnash will build, but testing won't work.

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

Summary of changes:
 macros/boost.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash