gnash-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_fi

From: Bastiaan Jacques
Subject: Re: [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1936-ga048745
Date: Fri, 25 Apr 2014 20:40:47 +0200 (CEST)
User-agent: Alpine 2.00 (DEB 1167 2008-08-23) 
The latest iteration of this patch caused a number of problems, on some
platforms:

- It broke detection of (the absence of) tslib on a number of platforms,
  see e.g.
http://gnashdev.org:8010/builders/rawhide-linux-i386/builds/294/steps/make_all/logs/stdio
- It broke detection of libva.

A possible hint can be gleaned from configure output, which now has a
remarkably high frequency of /usr/local/include.

I have it in mind to revert gnashpkgtool.m4 to the last known working
version.

Bastiaan

On Thu, 24 Apr 2014, Markus Gothe wrote:


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  a04874512ef26ad5af891a1657328bbb404256a7 (commit)
      via  836ab6b3b2b10eb25a785ae3cf3a6521bca9f416 (commit)
     from  e71eea13cbdaa7991c2883f971280f6dfdbee208 (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=a04874512ef26ad5af891a1657328bbb404256a7


commit a04874512ef26ad5af891a1657328bbb404256a7
Author: Markus Gothe <address@hidden>
Date:   Thu Apr 24 21:04:54 2014 +0200

   Fix 7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99 correctly, by invoking 
AC_LIB_WITH_FINAL_PREFIX to evaluate the prefix.

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 9de3791..818d6f2 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,6 +221,10 @@ 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
@@ -228,7 +232,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"/usr/lib" -a ! x"$i" = x"/usr/lib64"; 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$1 $5"
@@ -237,7 +241,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"/usr/lib" -a ! x"$i" = x"/usr/lib64"; 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$name $5"

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


commit 836ab6b3b2b10eb25a785ae3cf3a6521bca9f416
Author: Markus Gothe <address@hidden>
Date:   Thu Apr 24 20:57:02 2014 +0200

   Fix 7ba819567cb89f3df3e38a7f6a8b4c9374bfcc99 correctly, by invoking 
AC_LIB_WITH_FINAL_PREFIX to evaluate the prefix.

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 0840ef2..9de3791 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,17 +91,21 @@ 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/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, [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
                found_$1_incl="yes"
-                if test x"$i" != x"/usr/include"; then
+                if test x"$i" != x"${additional_includedir}"; then
                  ac_cv_path_$1_incl="-I$i"
                else
                  ac_cv_path_$1_incl=""
@@ -135,7 +139,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/usr/include"; then
+      if test x"${ac_cv_path_$1_incl}" != x -a x"${ac_cv_path_$1_incl}" != 
x"-I${additional_includedir}"; then
        UP[]_CFLAGS="${ac_cv_path_$1_incl}"
      else
        UP[]_CFLAGS=""

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

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


hooks/post-receive
--
Gnash

_______________________________________________
Gnash-commit mailing list
address@hidden
https://lists.gnu.org/mailman/listinfo/gnash-commit
reply via email to
[Prev in Thread] Current Thread [Next in Thread]