summaryrefslogtreecommitdiff
path: root/package/dillo
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-31 20:20:09 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-31 20:20:09 +0200
commitc2bd3a43342e37a05a97e12581dd2bd52993877a (patch)
tree39f9427d581669d8f619b4df44c5c5548c8fd955 /package/dillo
parentac46bdeef28bc2b65e1880884a79257c28e423a7 (diff)
Revert "fix conflict, autoseect libgcj"
This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
Diffstat (limited to 'package/dillo')
-rw-r--r--package/dillo/patches/patch-configure14
1 files changed, 1 insertions, 13 deletions
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
index 222be7882..233acb5a8 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-03-28 02:30:04.373370428 +0200
++++ dillo-2.2/configure 2011-01-07 21:35:04.000000000 +0100
@@ -5830,11 +5830,6 @@ typedef unsigned char bool_t;
_______EOF
@@ -12,15 +12,3 @@
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`