rocklinux/package/gnome2/dia/png-hotfix.patch

# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
# 
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
# 
# ROCK Linux: rock-src/package/gnome2/dia/png-hotfix.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
# 
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# 
# --- ROCK-COPYRIGHT-NOTE-END ---

--- ./configure.orig	2004-12-06 02:08:09.273370376 +0100
+++ ./configure	2004-12-06 02:10:24.354834872 +0100
@@ -22383,52 +22383,52 @@
   png_ok=no
 fi
 
-if test "$png_ok" = yes; then
-  echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
-echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6
-    old_LDFLAGS="${LDFLAGS}"
-  LDFLAGS="${LDFLAGS} -lz -lm"
-  cat >conftest.$ac_ext <<_ACEOF
-#include <png.h>
-                  png_structp pp;
-		  png_infop info;
-		  png_colorp cmap;
-		  main() { void*foo = png_create_read_struct; }
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  png_ok=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-png_ok=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS="${old_LDFLAGS}"
-  echo "$as_me:$LINENO: result: $png_ok" >&5
-echo "${ECHO_T}$png_ok" >&6
+#if test "$png_ok" = yes; then
+#  echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
+#echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6
+#    old_LDFLAGS="${LDFLAGS}"
+#  LDFLAGS="${LDFLAGS} -lz -lm"
+#  cat >conftest.$ac_ext <<_ACEOF
+##include <png.h>
+#                  png_structp pp;
+#		  png_infop info;
+#		  png_colorp cmap;
+#		  main() { void*foo = png_create_read_struct; }
+#_ACEOF
+#rm -f conftest.$ac_objext conftest$ac_exeext
+#if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+#  (eval $ac_link) 2>conftest.er1
+#  ac_status=$?
+#  grep -v '^ *+' conftest.er1 >conftest.err
+#  rm -f conftest.er1
+#  cat conftest.err >&5
+#  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+#  (exit $ac_status); } &&
+#	 { ac_try='test -z "$ac_c_werror_flag"
+#			 || test ! -s conftest.err'
+#  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+#  (eval $ac_try) 2>&5
+#  ac_status=$?
+#  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+#  (exit $ac_status); }; } &&
+#	 { ac_try='test -s conftest$ac_exeext'
+#  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+#  (eval $ac_try) 2>&5
+#  ac_status=$?
+#  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+#  (exit $ac_status); }; }; then
+#  png_ok=yes
+#else
+#  echo "$as_me: failed program was:" >&5
+#sed 's/^/| /' conftest.$ac_ext >&5
+#
+#png_ok=no
+#fi
+#rm -f conftest.err conftest.$ac_objext \
+#      conftest$ac_exeext conftest.$ac_ext
+#  LDFLAGS="${old_LDFLAGS}"
+#  echo "$as_me:$LINENO: result: $png_ok" >&5
+#echo "${ECHO_T}$png_ok" >&6
   if test "$png_ok" = yes; then
     PNG_LIBS='-lpng -lz -lm'
 
@@ -22437,7 +22437,7 @@
 _ACEOF
 
   fi
-fi
+#fi
 
 
 LIBS="${old_LIBS} ${PNG_LIBS}"
@@ -25132,7 +25132,7 @@
 
 
   if test -z "$PYTHON"; then
-     for ac_prog in python python2.1 python2.0 python1.6 python1.5
+     for ac_prog in python python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2