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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Markus Gothe <nihilus>  06/11/04 09:03:26

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&only_with_tag=release_0_7_2&r1=1.1412.2.67&r2=1.1412.2.68
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/zlib.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.2&r2=1.11.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.67
retrieving revision 1.1412.2.68
diff -u -b -r1.1412.2.67 -r1.1412.2.68
--- ChangeLog   4 Nov 2006 08:17:12 -0000       1.1412.2.67
+++ ChangeLog   4 Nov 2006 09:03:26 -0000       1.1412.2.68
@@ -3,6 +3,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  Rob Savoye  <address@hidden>
 

Index: macros/pkg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pkg.m4,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- macros/pkg.m4       4 Nov 2006 03:07:25 -0000       1.1.2.1
+++ macros/pkg.m4       4 Nov 2006 09:03:26 -0000       1.1.2.2
@@ -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.1.2.2 2006/11/04 09:03:26 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.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- macros/zlib.m4      4 Nov 2006 03:07:25 -0000       1.11.2.2
+++ macros/zlib.m4      4 Nov 2006 09:03:26 -0000       1.11.2.3
@@ -14,6 +14,8 @@
 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: zlib.m4,v 1.11.2.3 2006/11/04 09:03:26 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_ZLIB],
 [
   dnl Lool for the header
@@ -25,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
   ])
@@ -46,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