[Gnash-commit] gnash ChangeLog macros/libXML.m4 macros/pkg.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/04 10:14:20

Modified files:
        .              : ChangeLog 
        macros         : libXML.m4 pkg.m4 

Log message:
        cross_compling -> cross_compiling.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1510&r2=1.1511
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -b -r1.1510 -r1.1511
--- ChangeLog   4 Nov 2006 09:04:35 -0000       1.1510
+++ ChangeLog   4 Nov 2006 10:14:20 -0000       1.1511
@@ -5,8 +5,8 @@
        libraries. This lets specifying --prefix become the default path to
        search in for cross compiling.
        * macros/zlib.h: Fixed typo, corrected output.
-       * macros/pkg.m4: Check crosscompile != xyes, since it might not been 
-       set (which is the same as xno but not defined).
+       * macros/pkg.m4, macros/libXML.m4: Typo: 
+       cross_compling -> cross_compiling.
          
 2006-11-03 Sandro Santilli <address@hidden>
 

Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/libXML.m4    4 Nov 2006 00:00:30 -0000       1.24
+++ macros/libXML.m4    4 Nov 2006 10:14:20 -0000       1.25
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 dnl  
-dnl 
+dnl $Id: libXML.m4,v 1.25 2006/11/04 10:14:20 nihilus Exp $
 
 AC_DEFUN([AM_PATH_LIBXML2],
 [dnl 
@@ -54,7 +54,7 @@
   dnl       -L/usr/lib, which I really want to avoid!
   dnl
   #no_libxml=""
-  if test x$cross_compling = xno; then
+  if test x$cross_compiling = xno; then
     AC_PATH_PROG(XML2_CONFIG, xml2-config, , ,[$PATH])
     if test "x$XML2_CONFIG" != "x" ; then
       if test "x$LIBXML_CFLAGS" = "x" ; then

Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/pkg.m4       4 Nov 2006 09:04:35 -0000       1.3
+++ macros/pkg.m4       4 Nov 2006 10:14:20 -0000       1.4
@@ -21,7 +21,7 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# $Id: pkg.m4,v 1.3 2006/11/04 09:04:35 nihilus Exp $
+# $Id: pkg.m4,v 1.4 2006/11/04 10:14:20 nihilus Exp $
 
 # PKG_PROG_PKG_CONFIG([MIN-VERSION])
 # ----------------------------------
@@ -29,7 +29,7 @@
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test x$cross_compling != xyes; then
+if test x$cross_compiling = xno; then
   if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
   fi