components/gd2/patches/001-configure.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 19 Dec 2011 14:41:24 -0800
changeset 629 daaab66f7276
parent 130 5e67396e42dc
permissions -rw-r--r--
7117296 legacy actions need some love

# 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`