summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-pda/pilot-link/files')
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-gcc43.patch12
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch11
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-java_fPIC_fix.patch11
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-java_install_all.patch13
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch11
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-java_install_ppc.patch13
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-m4.patch6
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-missing-include.patch10
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.11.8-netsync.patch146
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch52
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch35
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch26
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch10
-rw-r--r--app-pda/pilot-link/files/pilot-link-0.12.2-png.patch85
14 files changed, 0 insertions, 441 deletions
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-gcc43.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-gcc43.patch
deleted file mode 100644
index 255e732e3aa1..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur src.old/ccexample.cc src/ccexample.cc
---- src.old/ccexample.cc 2008-07-11 23:06:47.000000000 +0200
-+++ src/ccexample.cc 2008-07-11 23:07:13.000000000 +0200
-@@ -2,7 +2,7 @@
- #include <stdlib.h>
- #include <string.h>
-
--#include <iostream.h>
-+#include <iostream>
- using namespace std;
-
- #include <unistd.h>
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch
deleted file mode 100644
index 4e348be561e6..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pilot-link-0.11.8/bindings/Java/Makefile.am 2003-06-17 17:08:51.000000000 -0400
-+++ pilot-link-0.11.8.new/bindings/Java/Makefile.am 2004-10-10 06:06:14.014193728 -0400
-@@ -38,7 +38,7 @@
- $(JAVAC) -d . $(java_files)
-
- java_lib: libjpisock.c
-- $(CXX) $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c
-+ $(CXX) $(CXXFLAGS) -fPIC $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c
-
- java_jar: $(java_classes)
- $(JAR) cvf pilot-link.jar $(java_classes)
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_fPIC_fix.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_fPIC_fix.patch
deleted file mode 100644
index 99d3f42ea0a5..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-java_fPIC_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pilot-link-0.11.8/bindings/Java/Makefile.in 2005-06-30 13:15:07.000000000 +0200
-+++ pilot-link-0.11.8-r2/bindings/Java/Makefile.in 2005-06-30 13:16:45.000000000 +0200
-@@ -233,7 +233,7 @@
- $(JAVAC) -d . $(java_files)
-
- java_lib: libjpisock.c
-- $(CXX) $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c
-+ $(CXX) $(CXXFLAGS) -fPIC $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c
-
- java_jar: $(java_classes)
- $(JAR) cvf pilot-link.jar $(java_classes)
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_all.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_all.patch
deleted file mode 100644
index ab45653b979e..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_all.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur pilot-link-0.11.8/bindings/Java/Makefile.in pilot-link-0.11.8.patched/bindings/Java/Makefile.in
---- pilot-link-0.11.8/bindings/Java/Makefile.in 2003-07-01 20:09:06.000000000 +0100
-+++ pilot-link-0.11.8.patched/bindings/Java/Makefile.in 2003-08-30 13:30:00.000000000 +0100
-@@ -241,7 +241,8 @@
- java_pisock: java_compile java_lib java_jar
-
- install: all
-- cp libjpisock.so ${JAVABASE}/jre/lib/i386/
-+ mkdir -p $(DESTDIR)${JAVABASE}/jre/lib/i386/
-+ cp libjpisock.so $(DESTDIR)${JAVABASE}/jre/lib/i386/
-
- test: install
- ${JAVABASE}/bin/java test ${PORT}
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch
deleted file mode 100644
index eff7a6f2b378..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pilot-link-0.11.8/bindings/Java/Makefile.in 2003-07-01 21:09:06.000000000 +0200
-+++ pilot-link-0.11.8-r2/bindings/Java/Makefile.in 2005-06-30 13:10:55.000000000 +0200
-@@ -241,7 +241,7 @@
- java_pisock: java_compile java_lib java_jar
-
- install: all
-- cp libjpisock.so ${JAVABASE}/jre/lib/i386/
-+ cp libjpisock.so $(DESTDIR)$(libdir)/
-
- test: install
- ${JAVABASE}/bin/java test ${PORT}
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_ppc.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_ppc.patch
deleted file mode 100644
index 9014c542a5ff..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_ppc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur pilot-link-0.11.8/bindings/Java/Makefile.in pilot-link-0.11.8.patched/bindings/Java/Makefile.in
---- pilot-link-0.11.8/bindings/Java/Makefile.in 2003-07-01 20:09:06.000000000 +0100
-+++ pilot-link-0.11.8.patched/bindings/Java/Makefile.in 2003-08-30 13:30:00.000000000 +0100
-@@ -241,7 +241,8 @@
- java_pisock: java_compile java_lib java_jar
-
- install: all
-- cp libjpisock.so ${JAVABASE}/jre/lib/i386/
-+ mkdir -p $(DESTDIR)${JAVABASE}/jre/lib/ppc/
-+ cp libjpisock.so $(DESTDIR)${JAVABASE}/jre/lib/ppc/
-
- test: install
- ${JAVABASE}/bin/java test ${PORT}
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-m4.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-m4.patch
deleted file mode 100644
index 05d45336f065..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-m4.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- pilot-link.m4.in
-+++ pilot-link.m4.in
-@@ -1,2 +1,2 @@
--AC_DEFUN(AC_PILOT_LINK_HOOK,
-+AC_DEFUN([AC_PILOT_LINK_HOOK],
- [
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-missing-include.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-missing-include.patch
deleted file mode 100644
index a41201e51cc2..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bindings/Tcl/pitcl.c.orig 2007-01-15 15:23:16.000000000 +0100
-+++ bindings/Tcl/pitcl.c 2007-01-15 15:23:35.000000000 +0100
-@@ -15,6 +15,7 @@
-
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <errno.h>
- #include <tcl.h>
- #include <pi-source.h>
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-netsync.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-netsync.patch
deleted file mode 100644
index 33f27e3ef504..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-netsync.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-*** net.c 2004/03/13 18:52:43 1.1
---- net.c 2004/03/13 19:54:13
-***************
-*** 179,187 ****
- bytes = next->write(ps, buf, PI_NET_HEADER_LEN, flags);
- if (bytes < PI_NET_HEADER_LEN)
- return bytes;
-! bytes = next->write(ps, msg, len, flags);
-! if (bytes < len)
- return bytes;
-
- CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, net_dump_header(buf, 1));
- CHECK(PI_DBG_NET, PI_DBG_LVL_DEBUG, dumpdata(msg, len));
---- 179,189 ----
- bytes = next->write(ps, buf, PI_NET_HEADER_LEN, flags);
- if (bytes < PI_NET_HEADER_LEN)
- return bytes;
-! if (len > 0) { /* avoid zero-length write on tickle */
-! bytes = next->write(ps, msg, len, flags);
-! if (bytes < len)
- return bytes;
-+ }
-
- CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, net_dump_header(buf, 1));
- CHECK(PI_DBG_NET, PI_DBG_LVL_DEBUG, dumpdata(msg, len));
-***************
-*** 196,202 ****
- total_bytes,
- packet_len,
- timeout,
-! size;
-
- struct pi_protocol *prot, *next;
- struct pi_net_data *data;
---- 198,205 ----
- total_bytes,
- packet_len,
- timeout,
-! size,
-! done;
-
- struct pi_protocol *prot, *next;
- struct pi_net_data *data;
-***************
-*** 216,255 ****
- pi_setsockopt(ps->sd, PI_LEVEL_DEV, PI_DEV_TIMEOUT,
- &timeout, &size);
-
-! total_bytes = 0;
-! if (data->txid == 0) {
- /* Peek to see if it is a headerless packet */
- bytes = next->read(ps, msg, 1, flags);
- if (bytes > 0) {
-! LOG ((PI_DBG_NET, PI_DBG_LVL_INFO,
-! "NET RX: Checking for headerless packet %d\n", msg[0]));
-
-! if (msg[0] == 0x90) {
-! /* Cause the header bytes to be skipped */
-! LOG ((PI_DBG_NET, PI_DBG_LVL_INFO,
-! "NET RX: Headerless packet\n"));
-! total_bytes = PI_NET_HEADER_LEN;
-! msg[PI_NET_OFFSET_TYPE] = PI_NET_TYPE_DATA;
-! msg[PI_NET_OFFSET_TXID] = 0x01;
-! set_long (&msg[PI_NET_OFFSET_SIZE], 21);
-! } else {
-! total_bytes += bytes;
-! }
- } else {
-! return bytes;
- }
-! }
-
-! /* Bytes in what's left of the header */
-! while (total_bytes < PI_NET_HEADER_LEN) {
- bytes = next->read(ps, msg + total_bytes, PI_NET_HEADER_LEN - total_bytes, flags);
- if (bytes <= 0)
-! return bytes;
- total_bytes += bytes;
- }
-
- /* Bytes in the rest of the packet */
-- packet_len = get_long(&msg[PI_NET_OFFSET_SIZE]);
- while (total_bytes < PI_NET_HEADER_LEN + packet_len) {
- bytes = next->read(ps, msg + total_bytes,
- PI_NET_HEADER_LEN + packet_len - total_bytes, flags);
---- 219,278 ----
- pi_setsockopt(ps->sd, PI_LEVEL_DEV, PI_DEV_TIMEOUT,
- &timeout, &size);
-
-! done = 0;
-! while (!done) {
-! total_bytes = 0;
-! if (data->txid == 0) {
- /* Peek to see if it is a headerless packet */
- bytes = next->read(ps, msg, 1, flags);
- if (bytes > 0) {
-! LOG ((PI_DBG_NET, PI_DBG_LVL_INFO,
-! "NET RX: Checking for headerless packet %d\n", msg[0]));
-
-! if (msg[0] == 0x90) {
-! /* Cause the header bytes to be skipped */
-! LOG ((PI_DBG_NET, PI_DBG_LVL_INFO,
-! "NET RX: Headerless packet\n"));
-! total_bytes = PI_NET_HEADER_LEN;
-! msg[PI_NET_OFFSET_TYPE] = PI_NET_TYPE_DATA;
-! msg[PI_NET_OFFSET_TXID] = 0x01;
-! set_long (&msg[PI_NET_OFFSET_SIZE], 21);
-! } else {
-! total_bytes += bytes;
-! }
- } else {
-! return bytes;
- }
-! }
-
-! /* Bytes in what's left of the header */
-! while (total_bytes < PI_NET_HEADER_LEN) {
- bytes = next->read(ps, msg + total_bytes, PI_NET_HEADER_LEN - total_bytes, flags);
- if (bytes <= 0)
-! return bytes;
- total_bytes += bytes;
-+ }
-+ packet_len = get_long(&msg[PI_NET_OFFSET_SIZE]);
-+ data->type = msg[PI_NET_OFFSET_TYPE];
-+ switch (data->type) {
-+ case PI_NET_TYPE_TCKL:
-+ if (packet_len != 0) {
-+ LOG ((PI_DBG_NET, PI_DBG_LVL_ERR,
-+ "NET RX: tickle packet with non-zero length\n"));
-+ return -1;
-+ }
-+ /* valid tickle packet; continue reading. */
-+ break;
-+ case PI_NET_TYPE_DATA:
-+ done = 1;
-+ break;
-+ default:
-+ LOG ((PI_DBG_NET, PI_DBG_LVL_ERR,
-+ "NET RX: Unknown packet type\n"));
-+ }
- }
-
- /* Bytes in the rest of the packet */
- while (total_bytes < PI_NET_HEADER_LEN + packet_len) {
- bytes = next->read(ps, msg + total_bytes,
- PI_NET_HEADER_LEN + packet_len - total_bytes, flags);
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch
deleted file mode 100644
index d6bb4da22db6..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur pilot-link-0.12.2.orig/configure.ac pilot-link-0.12.2/configure.ac
---- pilot-link-0.12.2.orig/configure.ac 2007-02-09 22:50:17.000000000 +0100
-+++ pilot-link-0.12.2/configure.ac 2007-08-25 18:49:58.000000000 +0200
-@@ -346,27 +346,32 @@
- use_bluez=no
- msg_bluez=no
-
--PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no))
-+AC_ARG_WITH([bluez], AS_HELP_STRING([--without-bluez], [Build without BlueZ bluetooth support (default: test)]))
-
--AC_MSG_CHECKING([for BlueZ bluetooth support])
--AC_ARG_WITH(bluez,
-+if test "x$with_bluez" != "xno"; then
-+ PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no))
-+
-+ AC_MSG_CHECKING([for BlueZ bluetooth support])
-+ AC_ARG_WITH(bluez,
- AC_HELP_STRING([--with-bluez],
-- [Enable usage of BlueZ]),,
-+ [Enable usage of BlueZ]),[use_bluez="$withval"],
- use_bluez=auto)
--if test "x$use_bluez" != "xno"; then
-- if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
-- AC_MSG_ERROR([BlueZ explicitly requested but no support found])
-- fi
-- if test "x$have_bluez" = xyes; then
-- AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
-- AC_MSG_RESULT([enabled])
-- msg_bluez="yes"
-- else
-- AC_MSG_RESULT([not found])
-- fi
-+ if test "x$use_bluez" != "xno"; then
-+ if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
-+ AC_MSG_ERROR([BlueZ explicitly requested but no support found])
-+ fi
-+ use_bluez="$have_bluez"
-+ if test "x$have_bluez" = xyes; then
-+ AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
-+ AC_MSG_RESULT([enabled])
-+ msg_bluez="yes"
-+ else
-+ AC_MSG_RESULT([not found])
-+ fi
-+ fi
- fi
-
--AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes")
-+AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno")
-
-
- dnl *********************************
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch
deleted file mode 100644
index 8974a21c86f7..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/bindings/Java/Makefile.am b/bindings/Java/Makefile.am
-index a2ead24..1500dcd 100644
---- a/bindings/Java/Makefile.am
-+++ b/bindings/Java/Makefile.am
-@@ -67,6 +67,8 @@ java_classes= \
- datebooktst.class \
- adrtest.class
-
-+$(java_classes): java_compile
-+
- java_compile: $(java_files)
- $(JAVAC) -d . $(java_files)
-
-@@ -81,16 +83,16 @@ java_pisock: java_compile java_lib java_jar
- install: all
- ARCH=""; \
- for a in i386 amd64 ppc; do \
-- if [ -e ${JAVABASE}/jre/lib/${a} ]; then \
-- ARCH="${a}"; \
-+ if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
-+ ARCH="$${a}"; \
- break; \
- fi; \
- done; \
-- if [ -n "${ARCH}" ]; then \
-+ if [ -n "$${ARCH}" ]; then \
- echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
- else \
-- mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}" && \
-- cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}"; \
-+ mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
-+ cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
- echo "done."; \
- fi
-
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch
deleted file mode 100644
index 5e50180cd309..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur pilot-link-0.12.2.orig/bindings/Java/Makefile.am pilot-link-0.12.2/bindings/Java/Makefile.am
---- pilot-link-0.12.2.orig/bindings/Java/Makefile.am 2007-07-22 10:40:48.000000000 +0200
-+++ pilot-link-0.12.2/bindings/Java/Makefile.am 2007-07-22 10:41:46.000000000 +0200
-@@ -81,21 +81,7 @@
- java_pisock: java_compile java_lib java_jar
-
- install: all
-- ARCH=""; \
-- for a in i386 amd64 ppc; do \
-- if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
-- ARCH="$${a}"; \
-- break; \
-- fi; \
-- done; \
-- if [ -n "$${ARCH}" ]; then \
-- echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
-- else \
-- mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
-- cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
-- echo "done."; \
-- fi
--
-+
- test: install
- ${JAVABASE}/bin/java test ${PORT}
-
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch
deleted file mode 100644
index e1941110df47..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/pilot-link.m4.in b/pilot-link.m4.in
-index 129dfc3..a271c74 100644
---- a/pilot-link.m4.in
-+++ b/pilot-link.m4.in
-@@ -1,5 +1,3 @@
--AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl
--
- AC_DEFUN([AC_PILOT_LINK_HOOK],
- [
- PILOT_LINK_VERS=0
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-png.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-png.patch
deleted file mode 100644
index 766a3b84ea8c..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-png.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur pilot-link-0.12.2.orig/configure.ac pilot-link-0.12.2/configure.ac
---- pilot-link-0.12.2.orig/configure.ac 2007-02-09 22:50:17.000000000 +0100
-+++ pilot-link-0.12.2/configure.ac 2007-08-25 17:38:42.000000000 +0200
-@@ -220,47 +220,52 @@
- dnl ******************************
- dnl PNG Support
- dnl ******************************
-+msg_png=no
- if test "x$enable_conduits" != "xno"; then
- have_png=no
-
- AC_ARG_WITH(libpng,
- [ --with-libpng Prefix where libpng is installed])
-
-- case $with_libpng in
-- /*)
-- PNG_CFLAGS="-I$withval/include"
-- PNG_LIBS="-L$withval/lib"
-- ;;
-- esac
-+ if test "x$with_libpng" != "xno"; then
-+
-+ case $with_libpng in
-+ /*)
-+ PNG_CFLAGS="-I$withval/include"
-+ PNG_LIBS="-L$withval/lib"
-+ ;;
-+ esac
-+
-+ save_CFLAGS="$CFLAGS"
-+ save_CPPFLAGS="$CPPFLAGS"
-+ save_LDFLAGS="$LDFLAGS"
-+ CFLAGS="$CFLAGS $PNG_CFLAGS"
-+ CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
-+ LDFLAGS="$LDFLAGS $PNG_LIBS"
-
-- save_CFLAGS="$CFLAGS"
-- save_CPPFLAGS="$CPPFLAGS"
-- save_LDFLAGS="$LDFLAGS"
-- CFLAGS="$CFLAGS $PNG_CFLAGS"
-- CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
-- LDFLAGS="$LDFLAGS $PNG_LIBS"
--
-- AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm])
-- if test "$have_png" = yes; then
-- AC_CHECK_HEADER(png.h, , have_png=no)
-+ AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm])
- if test "$have_png" = yes; then
-- AC_MSG_CHECKING(for png setjmp support)
-- AC_EGREP_CPP(yes,
-- [#include <png.h>
-- #ifdef PNG_SETJMP_SUPPORTED
-- yes
-- #endif], , have_png=no)
-- AC_MSG_RESULT($have_png)
-+ AC_CHECK_HEADER(png.h, , have_png=no)
- if test "$have_png" = yes; then
-- AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
-- have_png=yes
-+ AC_MSG_CHECKING(for png setjmp support)
-+ AC_EGREP_CPP(yes,
-+ [#include <png.h>
-+ #ifdef PNG_SETJMP_SUPPORTED
-+ yes
-+ #endif], , have_png=no)
-+ AC_MSG_RESULT($have_png)
-+ if test "$have_png" = yes; then
-+ AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
-+ have_png=yes
-+ msg_png=yes
-+ fi
- fi
- fi
-- fi
-
-- CFLAGS="$save_CFLAGS"
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-+ CFLAGS="$save_CFLAGS"
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ fi
- else
- have_png="none"
- PNG_CFLAGS=