[Mplayer-cvslog] CVS: main configure,1.379,1.380

[pl]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv11730

Modified Files:
	configure 
Log Message:
improved check for libpng/png.h: catch crappy build environment (png.h and
libpng.so version mismatch)


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- configure	26 Jan 2002 00:47:26 -0000	1.379
+++ configure	1 Feb 2002 13:10:35 -0000	1.380
@@ -1863,6 +1863,7 @@
 fi
 echores "$_dvb"
 
+
 echocheck "PNG support"
 if test "$_png" = auto ; then
   _png=no
@@ -1873,10 +1874,23 @@
   else
 cat > $TMPC << EOF
 #include <png.h>
-int main(void) { return 0; }
+#include <string.h>
+int main(void) {
+  printf("png.h : %s\n", PNG_LIBPNG_VER_STRING);
+  printf("libpng: %s\n", png_get_libpng_ver(NULL));
+  return (strcmp(PNG_LIBPNG_VER_STRING, png_get_libpng_ver(NULL)));
+}
 EOF
-    cc_check  -lpng -lz -lm && _png=yes
-    echores yes
+    if cc_check -lpng -lz -lm ; then
+      if "$TMPO" >> "$TMPLOG" ; then
+        _png=yes
+        echores yes
+      else
+        echores "no (mismatch of library and header versions)"
+      fi
+    else
+      echores no
+    fi
   fi
 else
   echores "$_png"