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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/04 09:04:35

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

Log message:
                * 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).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1509&r2=1.1510
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/zlib.m4?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -u -b -r1.1509 -r1.1510
--- ChangeLog   4 Nov 2006 08:18:37 -0000       1.1509
+++ ChangeLog   4 Nov 2006 09:04:35 -0000       1.1510
@@ -4,6 +4,9 @@
        * macros/gnashpkgtool.m4: Look in the $prefix path for includes and
        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).
 
 2006-11-03 Sandro Santilli <address@hidden>
 

Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/pkg.m4       4 Nov 2006 00:00:30 -0000       1.2
+++ macros/pkg.m4       4 Nov 2006 09:04:35 -0000       1.3
@@ -21,13 +21,15 @@
 # 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 $
+
 # PKG_PROG_PKG_CONFIG([MIN-VERSION])
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [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 = xno; then
+if test x$cross_compling != xyes; then
   if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
   fi

Index: macros/zlib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/zlib.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/zlib.m4      29 Oct 2006 18:34:11 -0000      1.12
+++ macros/zlib.m4      4 Nov 2006 09:04:35 -0000       1.13
@@ -14,8 +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  
-dnl 
+dnl $Id: zlib.m4,v 1.13 2006/11/04 09:04:35 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_ZLIB],
 [
@@ -28,7 +27,7 @@
     elif test -f ${with_zlib_incl}/zlib.h ; then
       ac_cv_path_zlib_incl=`(cd ${with_zlib_incl}; pwd)`
     else
-      AC_MSG_ERROR([${with_zlib_incl} directory doesn't contain zliblib.h])
+      AC_MSG_ERROR([${with_zlib_incl} directory doesn't contain zlib.h])
     fi
   fi
   ])
@@ -49,6 +48,7 @@
          fi
         fi
       done
+      AC_MSG_RESULT(${ac_cv_path_zlib_incl})
     fi])
   else
     if test x"${ac_cv_path_zlib_incl}" != x"/usr/include"; then