[Gnash-commit] gnash configure.ac ChangeLog macros/curl.m4 mac...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/11/29 00:40:21

Modified files:
        .              : configure.ac ChangeLog 
        macros         : curl.m4 qt.m4 qtopia.m4 

Log message:
        Fixed 'test -eq' for bourne shell, must have an empty space.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.446&r2=1.447
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5006&r2=1.5007
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/qt.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/qtopia.m4?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -b -r1.446 -r1.447
--- configure.ac        29 Nov 2007 00:25:06 -0000      1.446
+++ configure.ac        29 Nov 2007 00:40:20 -0000      1.447
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.446 2007/11/29 00:25:06 nihilus Exp $
+dnl $Id: configure.ac,v 1.447 2007/11/29 00:40:20 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -662,7 +662,7 @@
 rm -f .tmp
 dnl is there any good way to report what we found here?
 AC_MSG_RESULT()
-if test "${archiver}" -eq 1; then
+if test "${archiver} " -eq 1; then
 dnl   if test "$enable_shared" = no; then
 dnl     AR="libtool -static"
 dnl   else
@@ -1131,9 +1131,9 @@
 AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
 AM_CONDITIONAL(HAVE_QTOPIA, [test x$has_qtopia = xyes])
 
-AM_CONDITIONAL(HAVE_QT_2, [test "${gnash_qt_version}" -eq 2])
-AM_CONDITIONAL(HAVE_QT_3, [test "${gnash_qt_version}" -eq 3])
-AM_CONDITIONAL(HAVE_QT_4, [test "${gnash_qt_version}" -eq 4])
+AM_CONDITIONAL(HAVE_QT_2, [test "${gnash_qt_version} " -eq 2])
+AM_CONDITIONAL(HAVE_QT_3, [test "${gnash_qt_version} " -eq 3])
+AM_CONDITIONAL(HAVE_QT_4, [test "${gnash_qt_version} " -eq 4])
 
 dnl Need GLIB for both GTK and GST
 if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5006
retrieving revision 1.5007
diff -u -b -r1.5006 -r1.5007
--- ChangeLog   29 Nov 2007 00:25:07 -0000      1.5006
+++ ChangeLog   29 Nov 2007 00:40:20 -0000      1.5007
@@ -30,7 +30,8 @@
          installed by default and pkg-config is unaware of it.
        * macros/qtopia.m4: Clean up.
        * macros/agg.m4: --libs-only-L cannot have worked ever.
-       * configure.ac: Fixed 'test -eq'.
+       * configure.ac, macros/curl.m4, macros/qt.m4, macros/qtopia.m4: 
+         Fixed 'test -eq'.
 
 2007-11-28 Sandro Santilli <address@hidden>
 

Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/curl.m4      24 Nov 2007 16:47:10 -0000      1.21
+++ macros/curl.m4      29 Nov 2007 00:40:21 -0000      1.22
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: curl.m4,v 1.21 2007/11/24 16:47:10 rsavoye Exp $
+dnl $Id: curl.m4,v 1.22 2007/11/29 00:40:21 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_CURL],
 [
@@ -35,7 +35,7 @@
   if test x"${curlconfig}" != "x" ; then
     AC_MSG_CHECKING([for RTMP support])
     rtmp="`${curlconfig} --protocols|grep -c RTMP`"
-    if test $rtmp -eq 0; then
+    if test "${rtmp} " -eq 0; then
        AC_MSG_RESULT([none])
            rtmp=no
     else

Index: macros/qt.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/qt.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/qt.m4        28 Nov 2007 22:28:53 -0000      1.1
+++ macros/qt.m4        29 Nov 2007 00:40:21 -0000      1.2
@@ -77,7 +77,7 @@
       for j in $QTDIR `ls -dr $i/qt[[0-9]] 2>/dev/null`; do
         if test -f $j/include/qobject.h; then
           gnash_qt_topdir="$j"
-         if test $gnash_qt_version -eq 0; then
+         if test "${gnash_qt_version} " -eq 0; then
             gnash_qt_version=2
          fi
           ac_cv_path_qt_incl="-I$j/include"
@@ -85,7 +85,7 @@
        else
           if test -f $j/Qt/qobject.h; then
           gnash_qt_topdir="$j"
-         if test $gnash_qt_version -eq 0; then
+         if test "${gnash_qt_version} " -eq 0; then
             gnash_qt_version=4
          fi
           ac_cv_path_qt_incl="-I$j/Qt"

Index: macros/qtopia.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/qtopia.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/qtopia.m4    29 Nov 2007 00:02:22 -0000      1.3
+++ macros/qtopia.m4    29 Nov 2007 00:40:21 -0000      1.4
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: qtopia.m4,v 1.3 2007/11/29 00:02:22 nihilus Exp $
+dnl $Id: qtopia.m4,v 1.4 2007/11/29 00:40:21 nihilus Exp $
 
 dnl address@hidden pts/8> QtCore  QtSvg Qtnetwork QtXml 
 dnl QtCore: Command not found.
@@ -88,7 +88,7 @@
   dnl this a sanity check for Qtopia 2
   AC_MSG_CHECKING([Sanity checking the Qtopia header installation])
   qt_headers="qmainwindow.h qmenubar.h qpopupmenu.h qapplication.h"
-  if test $gnash_qtopia_version -eq 2; then
+  if test "${gnash_qtopia_version} " -eq 2; then
     if test x"${ac_cv_path_qtopia_incl}" != x; then
       for i in $qt_headers; do
         if ! test -f  ${gnash_qtopia_topdir}/include/$i; then
@@ -101,7 +101,7 @@
   
   dnl this a sanity check for Qtopia 4
   qt_headers="QtXml QtGui QtCore"
-  if test $gnash_qtopia_version -eq 4; then
+  if test "${gnash_qtopia_version} " -eq 4; then
     if test x"${ac_cv_path_qtopia_incl}" != x; then
       for i in $qt_headers; do
         if ! test -d ${gnash_qtopia_topdir}/qtopiacore/target/include/$i; then
@@ -146,7 +146,7 @@
   AC_MSG_CHECKING([Sanity checking the Qtopia installation])
   dnl this a sanity check for Qtopia 2
   qt_libs="libqt libqtopia libqpe"
-  if test $gnash_qtopia_version -eq 2; then
+  if test "${gnash_qtopia_version} " -eq 2; then
     AC_DEFINE([GNASH_QTOPIA_VERSION], 2, [The Qtopia version])
     if test x"${ac_cv_path_qtopia_lib}" != x; then
       for i in $qt_libs; do
@@ -160,7 +160,7 @@
   
   dnl this a sanity check for Qtopia 4
   qt_libs="libqtopia libqtopiabase"
-  if test $gnash_qtopia_version -eq 4; then
+  if test "${gnash_qtopia_version} " -eq 4; then
     AC_DEFINE([GNASH_QTOPIA_VERSION], 4, [The Qtopia version])
     gnash_qtopia_version=`dirname ${gnash_qtopia_topdir}`
     if test x"${ac_cv_path_qtopia_lib}" != x; then