cvs: gd /libgd/src configure.ac

scottmac		Fri Nov 23 11:47:56 2007 UTC

  Modified files:              
    /gd/libgd/src	configure.ac 
  Log:
  - #133, MFH, configure script ignores --with-png=DIR option
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/configure.ac?r1=1.34&r2=1.35&diff_format=u
Index: gd/libgd/src/configure.ac
diff -u gd/libgd/src/configure.ac:1.34 gd/libgd/src/configure.ac:1.35
--- gd/libgd/src/configure.ac:1.34	Sun May  6 19:53:05 2007
+++ gd/libgd/src/configure.ac	Fri Nov 23 11:47:56 2007
@@ -350,21 +350,28 @@
 # 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 -d "$withval"; then
+    if test -e "$withval/bin/libpng12-config"; then
+      LIBPNG12_CONFIG="$withval/bin/libpng12-config"
+    fi
+    if test -e "$withval/bin/libpng-config"; then
+      LIBPNG_CONFIG="$withval/bin/libpng-config"
+    fi
+  else
+      AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
+      AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
+  fi
+
   if test -n "$LIBPNG12_CONFIG"; then
-    libpng_CPPFLAGS=`libpng12-config --cflags`
+    libpng_CPPFLAGS=`$LIBPNG12_CONFIG --cflags`
     # should be --ldopts, but it's currently broken
-    libpng_LDFLAGS=`libpng12-config --ldflags`
+    libpng_LDFLAGS=`$LIBPNG12_CONFIG --ldflags`
     libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
   elif test -n "$LIBPNG_CONFIG"; then
-    libpng_CPPFLAGS=`libpng-config --cflags`
+    libpng_CPPFLAGS=`$LIBPNG_CONFIG --cflags`
     # should be --ldopts, but it's currently broken
-    libpng_LDFLAGS=`libpng-config --ldflags`
+    libpng_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
     libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
-  elif test -d "$withval"; then
-    libpng_CPPFLAGS="-I$withval/include"
-    libpng_LDFLAGS="-L$withval/lib"
   fi
 
   AC_CHECK_HEADERS(png.h,,