diff -r 15b2436fafb0 -r 5e67396e42dc components/gd2/patches/001-configure.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/gd2/patches/001-configure.patch Mon Mar 14 15:17:54 2011 -0700 @@ -0,0 +1,21 @@ +# remove searching for libpng12 first since we want the default libpng. +# see 6989480 + +--- configure.ac.orig Sun Mar 13 21:09:25 2011 ++++ configure.ac Sun Mar 13 21:10:10 2011 +@@ -350,14 +350,8 @@ + # authors decide to do this AGAIN. Which I really hope they won't. TBB + + if test "$withval" != no; then +- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config]) + AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config]) +- if test -n "$LIBPNG12_CONFIG"; then +- libpng_CPPFLAGS=`libpng12-config --cflags` +- # should be --ldopts, but it's currently broken +- libpng_LDFLAGS=`libpng12-config --ldflags` +- libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'` +- elif test -n "$LIBPNG_CONFIG"; then ++ if test -n "$LIBPNG_CONFIG"; then + libpng_CPPFLAGS=`libpng-config --cflags` + # should be --ldopts, but it's currently broken + libpng_LDFLAGS=`libpng-config --ldflags`