[Gnash-commit] /srv/bzr/gnash/trunk r11795: put dejagnu test under disable-testsuite. Add sysroot option, for now an alias to --with-top-level.

[Rob Savoye]

------------------------------------------------------------
revno: 11795
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 14:18:43 -0700
message:
  put dejagnu test under disable-testsuite. Add sysroot option, for now an 
alias to --with-top-level.
modified:
  Makefile.am
  configure.ac

=== modified file 'Makefile.am'
--- a/Makefile.am       2010-01-01 17:48:26 +0000
+++ b/Makefile.am       2010-01-22 21:18:43 +0000
@@ -82,7 +82,10 @@
        autogen.sh \
        config.rpath \
        macros/incllist macros/libslist \
-       ChangeLog-0.8.0 ChangeLog-0.8.1 ChangeLog-0.8.2 ChangeLog-0.8.3 \
+       ChangeLog-0.8.0 \
+       ChangeLog-0.8.1 \
+       ChangeLog-0.8.2 \
+       ChangeLog-0.8.3 \
        ChangeLog-0.8.4 \
        packaging/deb.am \
        packaging/snapshot.am \

=== modified file 'configure.ac'
--- a/configure.ac      2010-01-14 23:48:59 +0000
+++ b/configure.ac      2010-01-22 21:18:43 +0000
@@ -197,12 +197,21 @@
 dnl like pentium->geode, which can use the same compiler, but have
 dnl different development libraries.
 
+dnl I want to depreciate this option for the new sysroot name to be
+dnl consistant with other tools. This will be left for a while as 
+dnl a transistion.
 AC_ARG_WITH(top_level,
   AC_HELP_STRING([--with-top-level],
   [top level directory for cross compiling files]),
   with_top_level=${withval} ;
   cross_compiling=yes)
 
+AC_ARG_WITH(sysroot,
+  AC_HELP_STRING([--sysroot],
+  [system root directory for cross compiling]),
+  with_top_level=${withval} ;
+  cross_compiling=yes)
+
 soldir=/tmp
 AC_ARG_WITH(soldir,
  AC_HELP_STRING([--with-soldir],
@@ -1708,7 +1717,9 @@
  GIF_LIBS=${UNGIF_LIBS}
  GIF_CFLAGS=${UNGIF_CFLAGS}
 fi
-GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
+if test x"$testsuite" = x"yes"; then
+  GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
+fi
 
 GNASH_PKG_FIND(speex, [speex.h], [speex audio codec], speex_decode_int)
 AM_CONDITIONAL(HAVE_SPEEX, [ test x$has_speex = xyes ])
@@ -3340,17 +3351,18 @@
   echo "                 or .rpm users: yum install gettext" >&4
 fi
 
-if test x"${DEJAGNU}" != x""; then
-  echo "        DEJAGNU's runtest is $DEJAGNU"
-else
-  echo "        WARNING: You need the dejagnu package installed to get a 
summary" >&4
-  echo "                 report after running ''make check''" >&4
-  echo "                 Install it from http://www.gnu.org/software/dejagnu/"; 
>&4
-  echo "                 or .deb users: apt-get install dejagnu" >&4
-  echo "                 or .rpm users: yum install dejagnu" >&4
+if test x"$testsuite" = x"yes"; then
+  if test x"${DEJAGNU}" != x""; then
+    echo "        DEJAGNU's runtest is $DEJAGNU"
+  else
+    echo "        WARNING: You need the dejagnu package installed to get a 
summary" >&4
+    echo "                 report after running ''make check''" >&4
+    echo "                 Install it from 
http://www.gnu.org/software/dejagnu/"; >&4
+    echo "                 or .deb users: apt-get install dejagnu" >&4
+    echo "                 or .rpm users: yum install dejagnu" >&4
+  fi
 fi
 
-
 dnl Access Linux Platform
 if test x"${build_alp}" = xyes; then
   if test x"${ALP_CFLAGS}" != x; then