Re: [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1899-gae13895

[Bastiaan Jacques]

Hi Markus,

I backed out the commit below below because it broke detection of
system-installed jemalloc libraries on the buildslaves. See e.g.
http://gnashdev.org:8010/builders/fedora19-linux-i386/builds/242/steps/configure/logs/stdio

If I understand the autoconf docs correctly, $includedir is the
directory into which headers are to be installed, and not necessarily
the system include directory.
http://www.gnu.org/software/autoconf/manual/standards.html#Directory-Variables

Bastiaan

On Mon, 21 Apr 2014, Markus Gothe wrote:

> commit c378be2a6801c4f1db8b9b6b60a7e035c22e993f
> Author: Markus Gothe <address@hidden>
> Date:   Mon Apr 21 22:15:04 2014 +0200
>
>    During all these years the include-search was fundamentally broken... Now we 
> use the prefix-includedir instead of hard-coded /usr/include.
>
> diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
> index 0840ef2..b460bea 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
> @@ -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, [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"], [
> +      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"], [
>           if test x"${ac_cv_path_$1_incl}" = x; then
>             for i in $incllist; do
>               if test -f $i/$name; then
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> configure.ac           |    2 +-
> gui/gnash.cpp          |    4 ++--
> libbase/IOChannel.h    |    1 +
> macros/gnashpkgtool.m4 |   10 +++++-----
> 4 files changed, 9 insertions(+), 8 deletions(-)
>
>
> hooks/post-receive
> --
> Gnash
>
> _______________________________________________
> Gnash-commit mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/gnash-commit