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

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/06/12 19:08:07

Modified files:
        .              : ChangeLog configure.ac 
        macros         : gettext.m4 

Log message:
        * configure.ac:
        * macros/gettext.m4:
          Applying bjacques' https://savannah.gnu.org/patch/?6538
          Fix strict shell parse errors when variables are null.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6913&r2=1.6914
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.543&r2=1.544
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gettext.m4?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6913
retrieving revision 1.6914
diff -u -b -r1.6913 -r1.6914
--- ChangeLog   12 Jun 2008 13:17:54 -0000      1.6913
+++ ChangeLog   12 Jun 2008 19:08:06 -0000      1.6914
@@ -1,3 +1,10 @@
+2008-06-12 Russ Nelson <address@hidden>
+
+       * configure.ac:
+       * macros/gettext.m4:
+         Applying bjacques' https://savannah.gnu.org/patch/?6538
+          Fix strict shell parse errors when variables are null.
+
 2008-06-12 Sandro Santilli <address@hidden>
 
        * server/parser/edit_text_character_def.cpp: fix regression making

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -b -r1.543 -r1.544
--- configure.ac        9 Jun 2008 20:53:47 -0000       1.543
+++ configure.ac        12 Jun 2008 19:08:07 -0000      1.544
@@ -1578,9 +1578,11 @@
 AM_CONDITIONAL(HAVE_QTOPIA, [test x$has_qtopia = xyes])
 AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
 AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
-AM_CONDITIONAL(HAVE_QTOPIA_2, [test "$gnash_qtopia_version " -eq 2])
-AM_CONDITIONAL(HAVE_QTOPIA_3, [test "$gnash_qtopia_version " -eq 3])
-AM_CONDITIONAL(HAVE_QTOPIA_4, [test "$gnash_qtopia_version " -eq 4])
+
+AM_CONDITIONAL(HAVE_QTOPIA_2, [test x"$gnash_qtopia_version" = x2])
+AM_CONDITIONAL(HAVE_QTOPIA_3, [test x"$gnash_qtopia_version" = x3])
+AM_CONDITIONAL(HAVE_QTOPIA_4, [test x"$gnash_qtopia_version" = x4])
+
 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])

Index: macros/gettext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gettext.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/gettext.m4   1 Feb 2008 01:30:30 -0000       1.2
+++ macros/gettext.m4   12 Jun 2008 19:08:07 -0000      1.3
@@ -344,7 +344,7 @@
 
   dnl For backward compatibility. Some Makefiles may be using this. OpenBSD
   dnl appears to use $LTLIBINTL instead of "$LIBINTL".
-  if test x$LTLIBINTL != x; then
+  if test x"$LTLIBINTL" != x; then
     INTLLIBS="$LIBINTL $LTLIBINTL"
   else
     INTLLIBS="$LIBINTL"