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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/25 12:16:28

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

Log message:
        Try-out of finding zlib with generic macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1758&r2=1.1759
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.200&r2=1.201
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -b -r1.1758 -r1.1759
--- ChangeLog   25 Nov 2006 11:56:39 -0000      1.1758
+++ ChangeLog   25 Nov 2006 12:16:27 -0000      1.1759
@@ -10,6 +10,7 @@
        * backend/render_handler_ogl.cpp: #ifdef'd VITALY to get OGL working.
        * configure.ac: List FLTK and RISCOS as params to --enable-gui.
        * libbase/rc.h: DSOLOCAL -> DSOEXPORT.
+       * configure.ac: Try-out of finding zlib with generic macro.
 
 2006-11-24  Rob Savoye  <address@hidden>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- configure.ac        25 Nov 2006 11:14:47 -0000      1.200
+++ configure.ac        25 Nov 2006 12:16:27 -0000      1.201
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.200 2006/11/25 11:14:47 nihilus Exp $
+dnl $Id: configure.ac,v 1.201 2006/11/25 12:16:27 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -448,7 +448,10 @@
 
 GNASH_HASHMAP
 dnl AC_CHECK_LIB(c, mremap)
-GNASH_PATH_ZLIB
+dnl GNASH_PATH_ZLIB
+dnl test generic macro
+GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
+
 dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg images])
 GNASH_PATH_JPEG
 

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/gnashpkgtool.m4      9 Nov 2006 18:32:15 -0000       1.16
+++ macros/gnashpkgtool.m4      25 Nov 2006 12:16:28 -0000      1.17
@@ -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: gnashpkgtool.m4,v 1.16 2006/11/09 18:32:15 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.17 2006/11/25 12:16:28 nihilus Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()..
@@ -39,7 +39,7 @@
 
 dnl Look for the header
 if test x"${$1}" = x"yes"; then
-               AC_ARG_WITH($1_incl, AC_HELP_STRING([--with-$1-incl], 
[Directory where $2 header is]), with_$1_incl=${withval})
+               AC_ARG_WITH($1_incl, AC_HELP_STRING([--with-$1-incl], 
[Directory where $2 is]), with_$1_incl=${withval})
                AC_CACHE_VAL(ac_cv_path_$1_incl,[
                if test x"${with_$1_incl}" != x ; then
                        if test -f ${with_$1_incl}/$2 ; then