[Gnash-commit] gnash/macros boost.m4 freetype.m4 gtk2.m4 gtkgl...

[Markus Gothe]

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

Modified files:
        macros         : boost.m4 freetype.m4 gtk2.m4 gtkglext.m4 

Log message:
        As Rob pointed out on the commit-list: avoid var=`expr` use 
        var="`expr`".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/freetype.m4?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- boost.m4    24 Nov 2007 16:47:10 -0000      1.71
+++ boost.m4    29 Nov 2007 05:36:01 -0000      1.72
@@ -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: boost.m4,v 1.71 2007/11/24 16:47:10 rsavoye Exp $
+dnl $Id: boost.m4,v 1.72 2007/11/29 05:36:01 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -50,13 +50,13 @@
   AC_ARG_WITH(boost_incl, AC_HELP_STRING([--with-boost-incl], [directory where 
boost headers are]), with_boost_incl=${withval})
   if test x"${with_boost_incl}" != x ; then
     gnash_boost_topdir="`(cd ${with_boost_incl}; pwd)`"
-    gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:.*boost-::'`
+    gnash_boost_version="`echo ${gnash_boost_topdir} | sed -e 's:.*boost-::'`"
     newlist=${gnash_boost_topdir}
   fi
 
   dnl munge the GCC version number, which Boost uses to label it's libraries.
   if test x"${GXX}" = xyes; then
-       gcc_version=`${CXX} --version | head -1 | cut -d ' ' -f 3 | cut -d '.' 
-f 1-2 | tr -d '.'`
+       gcc_version="`${CXX} --version | head -1 | cut -d ' ' -f 3 | cut -d '.' 
-f 1-2 | tr -d '.'`"
   fi
 
   if test x"${gnash_boost_topdir}" = x; then
@@ -66,7 +66,7 @@
     if test x$cross_compiling = xno; then
       if test x"$PKG_CONFIG" != x; then
         AC_MSG_CHECKING([for the Boost Version])
-        $PKG_CONFIG --exists boost && gnash_boost_version=`$PKG_CONFIG 
--modversion boost | cut -d "." -f 1 | awk '{print $'0'".0"}'`
+        $PKG_CONFIG --exists boost && gnash_boost_version="`$PKG_CONFIG 
--modversion boost | cut -d "." -f 1 | awk '{print $'0'".0"}'`"
         AC_MSG_RESULT(${gnash_boost_version})
       fi
     fi
@@ -74,7 +74,7 @@
 
   AC_MSG_CHECKING([for boost header])
   for i in $newlist; do
-    dirs=`ls -dr $i/boost* 2>/dev/null`
+    dirs="`ls -dr $i/boost* 2>/dev/null`"
     if test -n "${dirs}"; then
       gnash_boost_topdir="`(cd ${dirs}; pwd)`"
       gnash_boost_subdir="`dirname ${gnash_boost_topdir}`"
@@ -127,11 +127,11 @@
         missing_libs=""
       fi
       for j in ${boost_libs}; do
-        dirs=`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 
2>/dev/null`
+        dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 
2>/dev/null`"
         if test -n "${dirs}"; then
-          libname=`echo ${dirs} | sed -e 's:\..*$::' -e 's:^.*/lib::'`
+          libname="`echo ${dirs} | sed -e 's:\..*$::' -e 's:^.*/lib::'`"
           if test x$dirname = x; then
-            dirname=`echo ${dirs} | sed -e 's:/libboost.*$::'`
+            dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
            if test x"${dirname}" != "x/usr/lib"; then
              ac_cv_path_boost_lib="-L${dirname}"
             fi
@@ -143,9 +143,9 @@
       done
     done
     for j in ${extra_boost_libs}; do
-      dirs=`ls -dr ${dirname}/libboost_${j}*.${shlibext} 
${dirname}/libboost_${j}*.a 2>/dev/null`
+      dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} 
${dirname}/libboost_${j}*.a 2>/dev/null`"
       if test -n "${dirs}"; then
-        libname=`echo ${dirs} | sed -e 's:\..*$::' -e 's:^.*/lib::'`
+        libname="`echo ${dirs} | sed -e 's:\..*$::' -e 's:^.*/lib::'`"
         ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
       else
         extra_missing_libs="${extra_missing_libs} $j"

Index: freetype.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/freetype.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- freetype.m4 28 Nov 2007 23:51:47 -0000      1.7
+++ freetype.m4 29 Nov 2007 05:36:01 -0000      1.8
@@ -30,7 +30,7 @@
 
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_freetype_incl}" = x; then
-      $PKG_CONFIG --exists freetype2 && ac_cv_path_freetype_incl=`$PKG_CONFIG 
--cflags freetype2`
+      $PKG_CONFIG --exists freetype2 && ac_cv_path_freetype_incl="`$PKG_CONFIG 
--cflags freetype2`"
     fi
   fi
 
@@ -83,7 +83,7 @@
   dnl Look for the library
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_freetype_lib}" = x; then
-      $PKG_CONFIG --exists freetype2 && ac_cv_path_freetype_lib=`$PKG_CONFIG 
--libs freetype2`
+      $PKG_CONFIG --exists freetype2 && ac_cv_path_freetype_lib="`$PKG_CONFIG 
--libs freetype2`"
     fi
   fi
 
@@ -132,7 +132,7 @@
   dnl default (unless fontconfig is removed after building gnash, for 
instance).
   AC_PATH_PROG(FC_MATCH, fc-match, ,[${pathlist}])
   if test x"$FC_MATCH" != x; then
-    DEFAULT_FONT=`$FC_MATCH -v 'Sans' | grep '^.file:' | sed 
's/\(.*\"\)\(.*\)\(\".*\)/\2/g'`
+    DEFAULT_FONT="`$FC_MATCH -v 'Sans' | grep '^.file:' | sed 
's/\(.*\"\)\(.*\)\(\".*\)/\2/g'`"
   fi
 
   dnl Hard-coded last resort, which is only likely to work

Index: gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gtk2.m4     24 Nov 2007 16:47:10 -0000      1.45
+++ gtk2.m4     29 Nov 2007 05:36:01 -0000      1.46
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: gtk2.m4,v 1.45 2007/11/24 16:47:10 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.46 2007/11/29 05:36:01 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_GTK2],
 [
@@ -34,8 +34,8 @@
 
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_incl}" = x; then
-      $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_incl=`$PKG_CONFIG 
--cflags gtk+-2.0`
-      $PKG_CONFIG --exists gtk+-2.0 && gnash_gtk2_version=`$PKG_CONFIG 
--modversion gtk+-2.0`
+      $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_incl="`$PKG_CONFIG 
--cflags gtk+-2.0`"
+      $PKG_CONFIG --exists gtk+-2.0 && gnash_gtk2_version="`$PKG_CONFIG 
--modversion gtk+-2.0`"
     fi
   fi
 
@@ -50,8 +50,8 @@
     for i in $incllist; do
       for j in `ls -dr $i/gtk-[[2-9]].[[0-9]] 2>/dev/null`; do
         if test -f $j/gtk/gtk.h; then
-          gnash_gtk2_topdir=`basename $j`
-          gnash_gtk2_version=`echo ${gnash_gtk2_topdir} | sed -e 's:gtk-::'`
+          gnash_gtk2_topdir="`basename $j`"
+          gnash_gtk2_version="`echo ${gnash_gtk2_topdir} | sed -e 's:gtk-::'`"
          ac_cv_path_gtk2_incl="-I$i/${gnash_gtk2_topdir}"
           break
         fi
@@ -89,7 +89,7 @@
 
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
-      $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG 
--libs-only-l gtk+-2.0`
+      $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib="`$PKG_CONFIG 
--libs-only-l gtk+-2.0`"
     fi
   fi
 

Index: gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gtkglext.m4 24 Nov 2007 16:47:10 -0000      1.38
+++ gtkglext.m4 29 Nov 2007 05:36:01 -0000      1.39
@@ -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: gtkglext.m4,v 1.38 2007/11/24 16:47:10 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.39 2007/11/29 05:36:01 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_GLEXT],
 [
@@ -44,7 +44,7 @@
 
 
 if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
-       $PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_incl=`$PKG_CONFIG 
--cflags gtkglext-1.0`
+       $PKG_CONFIG --exists gtkglext-1.0 && 
ac_cv_path_glext_incl="`$PKG_CONFIG --cflags gtkglext-1.0`"
 fi
 
 dnl Attempt to find the top level directory, which unfortunately has a
@@ -53,7 +53,7 @@
 AC_MSG_CHECKING([for the Gtk GL Extensions Version])
 
 if test x"$PKG_CONFIG" != x; then
-       $PKG_CONFIG --exists gtkglext-1.0 && gnash_glext_version=`$PKG_CONFIG 
--modversion gtkglext-1.0 | cut -d "." -f 1,3`
+       $PKG_CONFIG --exists gtkglext-1.0 && gnash_glext_version="`$PKG_CONFIG 
--modversion gtkglext-1.0 | cut -d "." -f 1,3`"
 fi
 
 if test x"${gnash_glext_version}" = x ; then
@@ -62,8 +62,8 @@
        for i in $incllist; do
                for j in `ls -dr $i/gtkglext-[[0-9]].[[0-9]] 2>/dev/null`; do
                        if test -f $j/gtk/gtkgl.h; then
-                               gnash_glext_topdir=`basename $j`
-                               gnash_glext_version=`echo ${gnash_glext_topdir} 
| sed -e 's:gtkglext-::'`
+                               gnash_glext_topdir="`basename $j`"
+                               gnash_glext_version="`echo 
${gnash_glext_topdir} | sed -e 's:gtkglext-::'`"
                                break
                        fi
                done
@@ -108,7 +108,7 @@
 ])
 
 if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_lib}" = x; then
-       $PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_lib=`$PKG_CONFIG 
--libs-only-l gtkglext-1.0`
+       $PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_lib="`$PKG_CONFIG 
--libs-only-l gtkglext-1.0`"
 fi
 
 ac_cv_path_glext_incl_config=""