patches/gd/0004-Use-png-14.patch

   1 --- a/configure.ac      2011-03-27 22:36:27.417298518 -0300
   2 +++ b/configure.ac      2011-03-27 22:40:50.732063466 -0300
   3 @@ -345,20 +345,20 @@ AC_ARG_WITH(png,dnl
   4  [  --with-png=DIR          where to find the png library],,
   5    withval=yes)
   6
   7 -# libpng12.so is a nightmare. We have to test separately for
   8 -# libpng12-config and libpng-config. If we find libpng12-config,
   9 +# libpng14.so is a nightmare. We have to test separately for
  10 +# libpng14-config and libpng-config. If we find libpng14-config,
  11  # we don't look for the other, which will just be a symlink to it,
  12  # confusing autoconf into thinking the library itself will be named -lpng,
  13  # which it won't be. Awful. This code will suffice unless the libpng
  14  # authors decide to do this AGAIN. Which I really hope they won't. TBB
  15
  16  if test "$withval" != no; then
  17 -  AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
  18 +  AC_PATH_PROG([LIBPNG14_CONFIG], [libpng14-config])
  19    AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
  20 -  if test -n "$LIBPNG12_CONFIG"; then
  21 -    libpng_CPPFLAGS=`libpng12-config --cflags`
  22 +  if test -n "$LIBPNG14_CONFIG"; then
  23 +    libpng_CPPFLAGS=`libpng14-config --cflags`
  24      # should be --ldopts, but it's currently broken
  25 -    libpng_LDFLAGS=`libpng12-config --ldflags`
  26 +    libpng_LDFLAGS=`libpng14-config --ldflags`
  27      libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
  28    elif test -n "$LIBPNG_CONFIG"; then
  29      libpng_CPPFLAGS=`libpng-config --cflags`
  30 @@ -378,9 +378,9 @@ if test "$withval" != no; then
  31    _ldflags="$LDFLAGS"
  32    LDFLAGS="$libpng_LDFLAGS $LDFLAGS"
  33
  34 -  if test -n "$LIBPNG12_CONFIG"; then
  35 -    AC_CHECK_LIB(png12,png_create_read_struct,
  36 -      [LIBS="-lpng12 $LIBS"
  37 +  if test -n "$LIBPNG14_CONFIG"; then
  38 +    AC_CHECK_LIB(png14,png_create_read_struct,
  39 +      [LIBS="-lpng14 $LIBS"
  40         FEATURES="GD_PNG $FEATURES"
  41         AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
  42        [LDFLAGS="$_ldflags"
  43 @@ -405,9 +405,9 @@ else
  44    AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])
  45  fi
  46
  47 -#TBB: png12's png_create_read_struct is just as good
  48 +#TBB: png14's png_create_read_struct is just as good
  49  #2.0.23: should be = not ==
  50 -if test "$ac_cv_lib_png12_png_create_read_struct" = yes; then
  51 +if test "$ac_cv_lib_png14_png_create_read_struct" = yes; then
  52    ac_cv_lib_png_png_create_read_struct=yes
  53  fi
  54