diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/dillo/patches/patch-configure | |
parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/dillo/patches/patch-configure')
-rw-r--r-- | package/dillo/patches/patch-configure | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure index 233acb5a8..222be7882 100644 --- a/package/dillo/patches/patch-configure +++ b/package/dillo/patches/patch-configure @@ -1,5 +1,5 @@ --- dillo-2.2.orig/configure 2010-02-11 11:19:59.000000000 +0100 -+++ dillo-2.2/configure 2011-01-07 21:35:04.000000000 +0100 ++++ dillo-2.2/configure 2011-03-28 02:30:04.373370428 +0200 @@ -5830,11 +5830,6 @@ typedef unsigned char bool_t; _______EOF @@ -12,3 +12,15 @@ for ac_func in gethostbyname do : ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +@@ -6215,9 +6210,9 @@ if test "x$enable_png" = "xyes"; then + $as_echo_n "checking for libpng-config... " >&6; } + + if test -z "$PNG_CONFIG"; then +- PNG_CONFIG=`which libpng12-config` ++ PNG_CONFIG=`which libpng-config` + if test -z "$PNG_CONFIG"; then +- PNG_CONFIG=`which libpng-config` ++ PNG_CONFIG=`which libpng15-config` + fi + if test -z "$PNG_CONFIG"; then + PNG_CONFIG=`which libpng10-config` |