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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/11/29 05:15:10

Modified files:
        .              : configure.ac 
        macros         : curl.m4 

Log message:
        This ought to work...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.448&r2=1.449
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -b -r1.448 -r1.449
--- configure.ac        29 Nov 2007 04:54:03 -0000      1.448
+++ configure.ac        29 Nov 2007 05:15:10 -0000      1.449
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.448 2007/11/29 04:54:03 nihilus Exp $
+dnl $Id: configure.ac,v 1.449 2007/11/29 05:15:10 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 x"${archiver}" != x -a "${archiver}" -eq 1; then
+if test x"${archiver}" != x && 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 x"${gnash_qt_version}" != x -a 
"${gnash_qt_version}" -eq 2])
-AM_CONDITIONAL(HAVE_QT_3, [test x"${gnash_qt_version}" != x -a 
"${gnash_qt_version}" -eq 3])
-AM_CONDITIONAL(HAVE_QT_4, [test x"${gnash_qt_version}" != x -a 
"${gnash_qt_version}" -eq 4])
+AM_CONDITIONAL(HAVE_QT_2, [test x"${gnash_qt_version}" != x && test 
"${gnash_qt_version}" -eq 2])
+AM_CONDITIONAL(HAVE_QT_3, [test x"${gnash_qt_version}" != x && test 
"${gnash_qt_version}" -eq 3])
+AM_CONDITIONAL(HAVE_QT_4, [test x"${gnash_qt_version}" != x && 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: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/curl.m4      29 Nov 2007 04:55:03 -0000      1.23
+++ macros/curl.m4      29 Nov 2007 05:15:10 -0000      1.24
@@ -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.23 2007/11/29 04:55:03 nihilus Exp $
+dnl $Id: curl.m4,v 1.24 2007/11/29 05:15:10 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_CURL],
 [
@@ -32,10 +32,10 @@
 
   curlconfig=""
   AC_PATH_PROG(curlconfig, curl-config, ,[${pathlist}])
-  if test x"${curlconfig}" != "x" ; then
+  if test x"${curlconfig}" != x ; then
     AC_MSG_CHECKING([for RTMP support])
     rtmp="`${curlconfig} --protocols|grep -c RTMP`"
-    if test x"${rtmp}" != x -a "${rtmp} " -eq 0; then
+    if test x"${rtmp}" != x && test "${rtmp}" -eq 0; then
        AC_MSG_RESULT([none])
            rtmp=no
     else