[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1510-g5f3dd9b

[Rob Savoye]

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  5f3dd9bd93da55fc09536c7a9fbc77cbd58a41d5 (commit)
      from  225758f0efd1a95e415e22e193fa558ce367cb1a (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=5f3dd9bd93da55fc09536c7a9fbc77cbd58a41d5


commit 5f3dd9bd93da55fc09536c7a9fbc77cbd58a41d5
Author: Rob Savoye <address@hidden>
Date:   Sun Sep 2 12:50:12 2012 -0600

    set top level correctly so later tests use the correct prefix path. For bug 
#37142

diff --git a/configure.ac b/configure.ac
index 79e796d..94b53ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,8 +244,16 @@ AC_ARG_WITH(sysroot,
   cross_compiling=yes)
 
 if test x"${cross_compiling}" != x; then
-  if test ! -d ${with_top_level}/usr; then
-    AC_MSG_ERROR([Specified sysroot \"${with_top_level}\" doesn't exist!])
+  dnl Check if /usr isn't part of the specified path
+  if test -d ${with_top_level}/usr; then
+    with_top_level=${withval}/usr
+  else 
+    dnl Check if the specified path supplies /usr
+    if test -d ${with_top_level}/include; then
+      with_top_level=${withval}
+    else
+      AC_MSG_ERROR([Specified sysroot \"${with_top_level}\" doesn't exist!])
+    fi
   fi
 fi
 

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

Summary of changes:
 configure.ac |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash