[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1943-g7c95e14

[Markus Gothe]

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  7c95e14a25790540d827e926d0a0a67a156b6e56 (commit)
       via  9a1578ffcd44c0178a6cdd3aa0970d6c2238e3cd (commit)
      from  42895e7a94c4425f70e03d6b712543144a9c2a7c (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=7c95e14a25790540d827e926d0a0a67a156b6e56


commit 7c95e14a25790540d827e926d0a0a67a156b6e56
Merge: 9a1578f 42895e7
Author: Markus Gothe <address@hidden>
Date:   Fri Apr 25 00:22:30 2014 +0200

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


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


commit 9a1578ffcd44c0178a6cdd3aa0970d6c2238e3cd
Author: Markus Gothe <address@hidden>
Date:   Fri Apr 25 00:21:57 2014 +0200

    Prefer prefix but also have a absolute path to avoid confusion.

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 6bbab11..c5c6dcb 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 Free Software Foundation, Inc.
+dnl  2011, 2014 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
@@ -97,10 +97,10 @@ 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, 
[ac_cv_path_$1_incl="-I${additional_includedir}/$1"; found_$1_incl="yes"], [
-        AC_CHECK_HEADER($name/$2, 
[ac_cv_path_$1_incl="-I${additional_includedir}/$name"; found_$1_incl="yes"], [
-          AC_CHECK_HEADER($2, 
[ac_cv_path_$1_incl="-I${additional_includedir}/$2"; found_$1_incl="yes"], [
+    AC_CHECK_HEADER(${additional_includedir}/$2, [ac_cv_path_$1_incl=""; 
found_$1_incl="yes"], [
+      AC_CHECK_HEADER(${additional_includedir}/$1/$2, 
[ac_cv_path_$1_incl="-I${additional_includedir}/$1"; found_$1_incl="yes"], [
+        AC_CHECK_HEADER(${additional_includedir}/$name/$2, 
[ac_cv_path_$1_incl="-I${additional_includedir}/$name"; found_$1_incl="yes"], [
+          AC_CHECK_HEADER(${additional_includedir}/$2, 
[ac_cv_path_$1_incl="-I${additional_includedir}/$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
@@ -108,7 +108,7 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
                 if test x"$i" != x"${additional_includedir}"; then
                   ac_cv_path_$1_incl="-I$i"
                 else
-                  ac_cv_path_$1_incl=""
+                  ac_cv_path_$1_incl="-I${additional_includedir}"
                 fi
                 break
               else

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

Summary of changes:
 macros/gnashpkgtool.m4 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash