[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1920-g7ba8195

[Bastiaan Jacques]

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  7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99 (commit)
       via  338e470a020c092af294c37be09dbeeed7f4ee0d (commit)
      from  b0cd0dfcf12b94c56d7b60127c7f900c5f62c122 (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=7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99


commit 7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Apr 23 23:21:16 2014 +0200

    Revert "During all these years the include-search was fundamentally 
broken... Now we use the prefix-includedir instead of hard-coded /usr/include."
    
    This reverts commit c378be2a6801c4f1db8b9b6b60a7e035c22e993f.
    
    Reverting on the theory that it will fix jemalloc detection.

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index b460bea..0840ef2 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -1,6 +1,6 @@
 dnl  
 dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-dnl  2011, 2014 Free Software Foundation, Inc.
+dnl  2011 Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ dnl   - always run AC_CHECK_HEADERS and AC_CHECK_LIB so that 
config.h end
 dnl     up with correct information about what's available and what not
 dnl     and every provided info is verified before acceptance.
 dnl
-dnl   - Document the interface of the macro!
+dnl   - Document the interface of the macro !!
 dnl
 
 AC_DEFUN([GNASH_PKG_INCLUDES],
@@ -94,9 +94,9 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_$1_incl}" = x; then
     AC_CHECK_HEADER($2, [ac_cv_path_$1_incl=""; found_$1_incl="yes"], [
-      AC_CHECK_HEADER($1/$2, [eval ac_cv_path_$1_incl="-I${includedir}/$1"; 
found_$1_incl="yes"], [
-        AC_CHECK_HEADER($name/$2, [eval 
ac_cv_path_$1_incl="-I${includedir}/$name"; found_$1_incl="yes"], [
-          AC_CHECK_HEADER($2, [eval ac_cv_path_$1_incl="-I${includedir}/$2"; 
found_$1_incl="yes"], [
+      AC_CHECK_HEADER($1/$2, [ac_cv_path_$1_incl="-I/usr/include/$1"; 
found_$1_incl="yes"], [
+        AC_CHECK_HEADER($name/$2, [ac_cv_path_$1_incl="-I/usr/include/$name"; 
found_$1_incl="yes"], [
+          AC_CHECK_HEADER($2, [ac_cv_path_$1_incl="-I/usr/include/$2"; 
found_$1_incl="yes"], [
           if test x"${ac_cv_path_$1_incl}" = x; then
             for i in $incllist; do
               if test -f $i/$name; then

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


commit 338e470a020c092af294c37be09dbeeed7f4ee0d
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Apr 23 21:58:43 2014 +0200

    DSOEXPORT CookiesIn.

diff --git a/libbase/NetworkAdapter.h b/libbase/NetworkAdapter.h
index 5e83afb..61ebf6a 100644
--- a/libbase/NetworkAdapter.h
+++ b/libbase/NetworkAdapter.h
@@ -108,7 +108,7 @@ public:
 private:
     /// \brief
     /// Variable to pass cookiefile path from command line to curl.
-    static std::string CookiesIn;
+    static DSOEXPORT std::string CookiesIn;
 
     static const ReservedNames& reservedNames();
 

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

Summary of changes:
 libbase/NetworkAdapter.h |    2 +-
 macros/gnashpkgtool.m4   |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash