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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/09 17:34:24

Modified files:
        macros         : zlib.m4 
        .              : ChangeLog 

Log message:
                * macros/zlib.m4: Update test to use AC_CHECK_HEADER and
                AC_CHECK_LIB correctly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/zlib.m4?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1096&r2=1.1097

Patches:
Index: macros/zlib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/zlib.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- macros/zlib.m4      9 Oct 2006 04:39:06 -0000       1.8
+++ macros/zlib.m4      9 Oct 2006 17:34:24 -0000       1.9
@@ -51,33 +51,35 @@
   fi
   ])
 
-  if test x"${ac_cv_path_zlib_incl}" = x ; then
-    AC_MSG_CHECKING([for zlib header])
-    incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
-
+  if test x"${ac_cv_path_zlib_incl}" = x; then
+    AC_CHECK_HEADERS(zlib.h, [ac_cv_path_zlib_incl=""],[
+    if test x"${ac_cv_path_zlib_incl}" = x; then
+      AC_MSG_CHECKING([additional locations for zlib header])
+      incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /opt/local/include /usr/include 
/usr/pkg/include .. ../.."
     for i in $incllist; do
-      if test -f $i/zlib.h; then
-        ac_cv_path_zlib_incl=$i
+        if test -f $i/png.h; then
+         if test x"$i" != x"/usr/include"; then
+           ac_cv_path_zlib_incl="$i"
+           break
+          else
+           ac_cv_path_zlib_incl=""
         break
       fi
+        fi
     done
-
-    ZLIB_CFLAGS=""
-    if test x"${ac_cv_path_zlib_incl}" = x ; then
-      AC_MSG_RESULT(none)
-      AC_CHECK_HEADERS(zlib.h, [ac_cv_path_zlib_incl=""])
+    fi])
     else
-      AC_MSG_RESULT(${ac_cv_path_zlib_incl})
       if test x"${ac_cv_path_zlib_incl}" != x"/usr/include"; then
-        ac_cv_path_zlib_incl="-I${ac_cv_path_zlib_incl}"
+      ac_cv_path_zlib_incl="${ac_cv_path_zlib_incl}"
       else
         ac_cv_path_zlib_incl=""
       fi
     fi
-  fi
 
   if test x"${ac_cv_path_zlib_incl}" != x ; then
-    ZLIB_CFLAGS="${ac_cv_path_zlib_incl}"
+    ZLIB_CFLAGS="-I${ac_cv_path_zlib_incl}"
+  else
+    ZLIB_CFLAGS=""
   fi
 
   dnl Look for the library
@@ -95,33 +97,30 @@
   fi
   ])
 
-  if test x"${ac_cv_path_zlib_lib}" = x ; then
-    liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib .. ../.."
-
-    for i in $liblist; do
-    if test -f $i/libz.a -o -f $i/libz.so -o -f $i/libz.dylib; then
-       ac_cv_path_zlib_lib=$i
-       break
-    fi
-    done
-
-    ZLIB_LIBS=""
-    if test x"${ac_cv_path_zlib_lib}" = x ; then
-      AC_MSG_RESULT(none)
-      dnl if we can't find libzlib via the path, see if it's in the compiler 
path
-      AC_CHECK_LIB(zlib, compress2, ${ac_cv_path_zlib_lib}="-lz")
-    else
+  dnl If the header doesn't exist, there is no point looking for the library.
+  if test x"${ac_cv_path_zlib_lib}" = x; then
+    AC_CHECK_LIB(z, zlibVersion, [ac_cv_path_zlib_lib="-lz"],[
+      AC_MSG_CHECKING([for zlib library])
+      libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib 
/usr/X11R6/lib .. ../.."
+      for i in $libslist; do
+        if test -f $i/libz.a -o -f $i/libz.so; then
+          if test x"$i" != x"/usr/lib"; then
+           ac_cv_path_zlib_lib="-L$i -lz"
       AC_MSG_RESULT(${ac_cv_path_zlib_lib})
-      if test x"${ac_cv_path_zlib_lib}" != x"/usr/lib"; then
-        ac_cv_path_zlib_lib="-L${ac_cv_path_zlib_lib} -lz"
+           break
       else
         ac_cv_path_zlib_lib="-lz"
+            AC_MSG_RESULT(yes)
+           break
       fi
     fi
+      done])
   fi
 
   if test x"${ac_cv_path_zlib_lib}" != x ; then
     ZLIB_LIBS="${ac_cv_path_zlib_lib}"
+  else
+    ZLIB_LIBS=""
   fi
 
   AC_SUBST(ZLIB_CFLAGS)

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1096
retrieving revision 1.1097
diff -u -b -r1.1096 -r1.1097
--- ChangeLog   9 Oct 2006 16:23:45 -0000       1.1096
+++ ChangeLog   9 Oct 2006 17:34:24 -0000       1.1097
@@ -1,3 +1,18 @@
+2006-10-09  Rob Savoye  <address@hidden>
+
+       * macros/zlib.m4: Update test to use AC_CHECK_HEADER and
+       AC_CHECK_LIB correctly.
+
+2006-10-09 Rob Savoye <address@hidden>
+
+       * macros/agg.m4, boost.m4, cairo.m4, curl.m, ffmpeg.m4,
+       gstreamer.m4, gtkglext.m4, libXML.m4, mad.m4, 
+       pango.m4, png.m4, sdl.m4, zlib.m4: Add /opt/local/include to all
+       include paths, and /opt/local/lib for opendarwin.
+       * macros/atk.m4, gtk2.m4, ogg.m4: Add /opt/local/include to all
+       include paths, and /opt/local/lib for opendarwin. Use pkg-config
+       if it exists. 
+
 2006-10-09 Sandro Santilli <address@hidden>
 
        * backend/render_handler_agg_compat.h: added compatibility
@@ -137,6 +152,18 @@
        * backend/Makefile.am: Fixed type, so that the OpenGL libs 
        are linked.
 
+2006-10-06  Rob Savoye  <address@hidden>
+
+       * configure.ac: Make config tests for gui or rendered enabled or
+       disabled based on the selected ones. Define all conditional
+       variables here, since the tests may not get executed now. This
+       makes configuring faster.
+       * backend/Makefile.am: Add AGG support.
+       * gui/Makefile.am: Add AGG support.
+       * gui/README: Add Framebuffer and AGG notes.
+       * macros/cairo.m4, ffmpeg.m4:, gtkglext.m4, kde.m4, opengl.m4:
+       Don't define conditional variables here.
+
 2006-10-06 Sandro Santilli <address@hidden>
 
        * server/render.cpp: don't abort when parsing w/out any 
@@ -170,6 +197,13 @@
 
        * macros/jpeg.m4: fixed typo.
 
+2006-10-05 Patrice Dumas <address@hidden>
+       
+       * testsuite/misc-ming.all/Makefile.am: Change clean to clean-local.
+       * packaging/redhat/gnash.spec: Add new buildrequires in specfile
+       and use gstreamer sound backend.
+       * libbase/Makefile.am: Remove reference to smart_ptr.hpp 
+
 2006-10-05  Rob Savoye  <address@hidden>
 
        * configure.ac: Add --enable-write option to optionally write the