[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1948-g0ef9b8c |
|
Date: |
Fri, 25 Apr 2014 19:05:07 +0000 |
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 0ef9b8c06701adc3a3d40f3427751d3327e5b02f (commit)
via 5f49d9273b20ba741c170c606ab4644a6cb3e193 (commit)
via 008c1382efa19dfcb18228753b0a55a8ccb4cf67 (commit)
via 18e90e5f7fc38fde88c3c5a7fab3ae41643f71aa (commit)
from 44813771e5cc77a2338f1c371e0e0588320c28ff (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=0ef9b8c06701adc3a3d40f3427751d3327e5b02f
commit 0ef9b8c06701adc3a3d40f3427751d3327e5b02f
Author: Bastiaan Jacques <address@hidden>
Date: Fri Apr 25 19:05:49 2014 +0200
Revert "Fix 7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99 correctly, by invoking
AC_LIB_WITH_FINAL_PREFIX to evaluate the prefix."
This reverts commit 836ab6b3b2b10eb25a785ae3cf3a6521bca9f416.
diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 9de3791..0840ef2 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -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],
@@ -91,21 +91,17 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
fi
fi
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- ])
-
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($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
found_$1_incl="yes"
- if test x"$i" != x"${additional_includedir}"; then
+ if test x"$i" != x"/usr/include"; then
ac_cv_path_$1_incl="-I$i"
else
ac_cv_path_$1_incl=""
@@ -139,7 +135,7 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
dnl do this automatically. AC_CHECK_HEADERS (not the final S) would do
it.
AC_DEFINE([HAVE_]UPHEADER, 1, [Define if you have the $2 header])
AC_MSG_RESULT(${ac_cv_path_$1_incl})
- if test x"${ac_cv_path_$1_incl}" != x -a x"${ac_cv_path_$1_incl}" !=
x"-I${additional_includedir}"; then
+ if test x"${ac_cv_path_$1_incl}" != x -a x"${ac_cv_path_$1_incl}" !=
x"-I/usr/include"; then
UP[]_CFLAGS="${ac_cv_path_$1_incl}"
else
UP[]_CFLAGS=""
http://git.savannah.gnu.org/cgit//commit/?id=5f49d9273b20ba741c170c606ab4644a6cb3e193
commit 5f49d9273b20ba741c170c606ab4644a6cb3e193
Author: Bastiaan Jacques <address@hidden>
Date: Fri Apr 25 19:05:48 2014 +0200
Revert "Fix 7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99 correctly, by invoking
AC_LIB_WITH_FINAL_PREFIX to evaluate the prefix."
This reverts commit a04874512ef26ad5af891a1657328bbb404256a7.
diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 818d6f2..9de3791 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -91,9 +91,9 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
fi
fi
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- ])
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ ])
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_$1_incl}" = x; then
@@ -221,10 +221,6 @@ if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = "xyes";
then
if test x"${ac_manual}" != xyes -a x"${ac_cv_path_$1_lib}" = x; then
ac_manual=yes
fi
-
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_libdir=\"$libdir\"
- ])
if test x"${ac_cv_path_$1_lib}" = x; then
ac_save_LIBS=$LIBS
@@ -232,7 +228,7 @@ if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = "xyes";
then
for i in $libslist; do
if test -f $i/lib$1.a -o -f $i/lib$1.${shlibext}; then
if test -f "$i/lib$1.a" -o -f "$i/lib$1.${shlibext}"; then
- if test ! x"$i" = x"${additional_libdir}"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_$1_lib="-L$i -l$1 $5"
else
ac_cv_path_$1_lib="-l$1 $5"
@@ -241,7 +237,7 @@ if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = "xyes";
then
fi
else
if test -f "$i/lib$name.a" -o -f "$i/lib$name.${shlibext}"; then
- if test ! x"$i" = x"${additional_libdir}"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_$1_lib="-L$i -l$name $5"
else
ac_cv_path_$1_lib="-l$name $5"
http://git.savannah.gnu.org/cgit//commit/?id=008c1382efa19dfcb18228753b0a55a8ccb4cf67
commit 008c1382efa19dfcb18228753b0a55a8ccb4cf67
Author: Bastiaan Jacques <address@hidden>
Date: Fri Apr 25 19:05:47 2014 +0200
Revert "Fix 7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99 correctly, by invoking
AC_LIB_WITH_FINAL_PREFIX to evaluate the prefix."
This reverts commit 51fe4e913e8be4220ef76d5f912c23a20c76db2f.
diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 6bbab11..818d6f2 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -235,7 +235,7 @@ if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = "xyes";
then
if test ! x"$i" = x"${additional_libdir}"; then
ac_cv_path_$1_lib="-L$i -l$1 $5"
else
- ac_cv_path_$1_lib="-L${additional_libdir} -l$1 $5"
+ ac_cv_path_$1_lib="-l$1 $5"
fi
break
fi
@@ -244,7 +244,7 @@ if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = "xyes";
then
if test ! x"$i" = x"${additional_libdir}"; then
ac_cv_path_$1_lib="-L$i -l$name $5"
else
- ac_cv_path_$1_lib="-L${additional_libdir} -l$name $5"
+ ac_cv_path_$1_lib="-l$name $5"
fi
break
fi
http://git.savannah.gnu.org/cgit//commit/?id=18e90e5f7fc38fde88c3c5a7fab3ae41643f71aa
commit 18e90e5f7fc38fde88c3c5a7fab3ae41643f71aa
Author: Bastiaan Jacques <address@hidden>
Date: Fri Apr 25 19:05:46 2014 +0200
Revert "Prefer prefix but also have a absolute path to avoid confusion."
This reverts commit 9a1578ffcd44c0178a6cdd3aa0970d6c2238e3cd.
diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index c5c6dcb..6bbab11 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
@@ -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(${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"], [
+ 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"], [
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="-I${additional_includedir}"
+ ac_cv_path_$1_incl=""
fi
break
else
-----------------------------------------------------------------------
Summary of changes:
macros/gnashpkgtool.m4 | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1948-g0ef9b8c,
Bastiaan Jacques <=