Update jpilot to 0.99.3. Changes include:

 * Added Simplified Chinese translation
 * Added Traditional Chinese translation
 * Made dialog windows Modal
 * Manana support http://bill.sexton.tripod.com/download.htm
 * Changed code to keep unique IDs intact.
 * Support for OS 4.X passwords.
 * Better DateBk support
 * Pop up dialogs during the sync when different user name, null ID is
   found.
 * Lots of patches, bug fixes and minor improvements.
 * Made changes to support pilot-link 0.10.1 and USB
 * Export for Datebook, Address, Todo, and Memo
 * Import for Datebook, Address, Todo, and Memo
 * Can now enter begin/end times into datebook by GUI, or keyboard.
 * Put icons in clist title buttons.
 * Prompts to Save a changed/new record instead of letting it get away.
 * Drastically improved local database read speeds caused by bugs intro'd
   in 0.99
 * Fixed misc bugs in alarms.
 * Support for pedit (pedit is a memo editor for the palm).
 * Added Preferences to choose conduits.
 * Adding in better printing support.
 * Adding in record masking support.
 * Wrote a KeyRing plugin (KeyRing is a palm encryption app).
 * Added Restore Functionality.
 * Added plugin_startup & plugin_cleanup funcs to jpilot-sync.
 * Added man pages.
 * Added plugin_startup and plugin_cleanup to jpilot-sync.
 * Added a default pdb file for Expenses.
 * Added an icon when iconized.

8 files changed, 135 insertions, 125 deletions

diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index b660a4bdc0b..34fc53218d6 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2002/11/30 13:36:14 salo Exp $
+# $NetBSD: Makefile,v 1.31 2003/01/10 04:34:18 rh Exp $
 #
 
-DISTNAME=		jpilot-0.99
-PKGREVISION=		2
+DISTNAME=		jpilot-0.99.3
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
 
@@ -10,20 +9,21 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://jpilot.org/
 COMMENT=		desktop organizer application for the palm pilot
 
-BUILD_USES_MSGFMT=	# defined
+BUILD_USES_MSGFMT=	YES
 
 CONFLICTS+=		jpilot-libplugin-[0-9]*
 
-USE_BUILDLINK2=		# defined
-USE_PKGLOCALEDIR=	# defined
-USE_X11=		# defined
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
 CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
+LDFLAGS+=		-export-dynamic
 
-USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 DOCDIR=			${PREFIX}/share/doc/jpilot
 INCDIR=			${PREFIX}/include/jpilot
diff --git a/comms/jpilot/PLIST b/comms/jpilot/PLIST
index 3bb708ba8b5..740ebb327f2 100644
--- a/comms/jpilot/PLIST
+++ b/comms/jpilot/PLIST
@@ -1,19 +1,62 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/28 14:23:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/10 04:34:18 rh Exp $
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
 bin/jpilot-upgrade-99
 include/jpilot/libplugin.h
 include/jpilot/prefs.h
+lib/jpilot/plugins/.directory
+lib/jpilot/plugins/libexpense.a
+lib/jpilot/plugins/libexpense.la
+lib/jpilot/plugins/libexpense.so
+lib/jpilot/plugins/libexpense.so.0
+lib/jpilot/plugins/libexpense.so.0.0
+lib/jpilot/plugins/libkeyring.a
+lib/jpilot/plugins/libkeyring.la
+lib/jpilot/plugins/libkeyring.so
+lib/jpilot/plugins/libkeyring.so.0
+lib/jpilot/plugins/libkeyring.so.0.0
+lib/jpilot/plugins/libsynctime.a
+lib/jpilot/plugins/libsynctime.la
+lib/jpilot/plugins/libsynctime.so
+lib/jpilot/plugins/libsynctime.so.0
+lib/jpilot/plugins/libsynctime.so.0.0
+man/man1/jpilot-dump.1
 man/man1/jpilot-sync.1
 man/man1/jpilot-upgrade-99.1
 man/man1/jpilot.1
-lib/jpilot/plugins/.directory
 share/doc/html/jpilot/manual.html
 share/doc/html/jpilot/plugin.html
+share/doc/${PKGNAME}/AUTHORS
+share/doc/${PKGNAME}/BUGS
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/ChangeLog
+share/doc/${PKGNAME}/INSTALL
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/TODO
+share/doc/${PKGNAME}/UPGRADING
+share/doc/${PKGNAME}/icons/README
+share/doc/${PKGNAME}/icons/jpilot-icon1.xpm
+share/doc/${PKGNAME}/icons/jpilot-icon2.xpm
+share/doc/${PKGNAME}/icons/jpilot-icon3.xpm
+share/doc/${PKGNAME}/icons/jpilot-icon4.xpm
+share/doc/${PKGNAME}/jpilot-address.png
+share/doc/${PKGNAME}/jpilot-datebook.png
+share/doc/${PKGNAME}/jpilot-expense.png
+share/doc/${PKGNAME}/jpilot-install.png
+share/doc/${PKGNAME}/jpilot-memo.png
+share/doc/${PKGNAME}/jpilot-prefs.png
+share/doc/${PKGNAME}/jpilot-print.png
+share/doc/${PKGNAME}/jpilot-search.png
+share/doc/${PKGNAME}/jpilot-todo.png
+share/doc/${PKGNAME}/jpilot-toplogo.jpg
+share/doc/${PKGNAME}/manual.html
+share/doc/${PKGNAME}/plugin.html
 share/doc/jpilot/BUGS
 share/jpilot/AddressDB.pdb
 share/jpilot/DatebookDB.pdb
+share/jpilot/ExpenseDB.pdb
+share/jpilot/Memo32DB.pdb
 share/jpilot/MemoDB.pdb
 share/jpilot/ToDoDB.pdb
 share/jpilot/jpilotrc.blue
@@ -27,12 +70,18 @@ ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot
 @dirrm share/doc/jpilot
+@dirrm share/doc/${PKGNAME}/icons
+@dirrm share/doc/${PKGNAME}
 @dirrm share/doc/html/jpilot
 @dirrm lib/jpilot/plugins
 @dirrm lib/jpilot
diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo
index 6b747815c71..33e74e978fc 100644
--- a/comms/jpilot/distinfo
+++ b/comms/jpilot/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/11/30 13:36:14 salo Exp $
+$NetBSD: distinfo,v 1.8 2003/01/10 04:34:18 rh Exp $
 
-SHA1 (jpilot-0.99.tar.gz) = d52e4b31872c1b20bf882c8a062fdb954c8f4b1f
-Size (jpilot-0.99.tar.gz) = 488619 bytes
-SHA1 (patch-aa) = 4773e948de2d499cdb07f735d5cbc46c1fde5b92
-SHA1 (patch-ab) = d0363a51220defc09147f4f176fe25d384bb3666
-SHA1 (patch-ac) = 1dfab3f52134426e362d9bf1a11cad036d5981e7
-SHA1 (patch-ad) = ae9ebca51baaca6f2542a2ac9fbd98e31f85ac34
-SHA1 (patch-ae) = 418faa42e6d7decf8e8914f279ba30700b657496
+SHA1 (jpilot-0.99.3.tar.gz) = 36b0c8c41886230bccfbcc0edd05ffa00d63108d
+Size (jpilot-0.99.3.tar.gz) = 965780 bytes
+SHA1 (patch-aa) = 48aade27edf9df1c67e15faba0fda904ea7e8c79
+SHA1 (patch-ad) = e1e7ce9e7cc1bd1e901f6763799cdfd03f3cd605
diff --git a/comms/jpilot/patches/patch-aa b/comms/jpilot/patches/patch-aa
index da1eb616622..8608abefb6a 100644
--- a/comms/jpilot/patches/patch-aa
+++ b/comms/jpilot/patches/patch-aa
@@ -1,34 +1,65 @@
-$NetBSD: patch-aa,v 1.3 2001/03/01 21:13:12 tron Exp $
+$NetBSD: patch-aa,v 1.4 2003/01/10 04:34:19 rh Exp $
 
---- Makefile.in.orig	Tue Feb  6 20:31:05 2001
-+++ Makefile.in	Thu Mar  1 22:11:03 2001
-@@ -43,7 +43,7 @@
- INTLLIBS = @INTLLIBS@
+--- docs/Makefile.in.orig	Wed Oct  9 11:55:05 2002
++++ docs/Makefile.in
+@@ -330,33 +330,33 @@ uninstall-man: uninstall-man1
+ # HTML documentation, etc.
+ ###
+ install-data-local:
+-	$(INSTALL) -d -m 755 $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 manual.html $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 plugin.html $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-address.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-datebook.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-expense.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-install.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-memo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-prefs.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-print.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-search.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-todo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 644 jpilot-toplogo.jpg $(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -d -m 755 $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons
+-	$(INSTALL) -m 644 ../icons/README $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/README
+-	$(INSTALL) -m 644 ../icons/jpilot-icon1.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
+-	$(INSTALL) -m 644 ../icons/jpilot-icon2.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
+-	$(INSTALL) -m 644 ../icons/jpilot-icon3.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
+-	$(INSTALL) -m 644 ../icons/jpilot-icon4.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
+-	$(INSTALL) -m 644 ../BUGS $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../ChangeLog $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../COPYING $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../AUTHORS $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../INSTALL $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../README $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../TODO $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 ../UPGRADING $(prefix)/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -d -m 755 $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 manual.html $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 plugin.html $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-address.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-datebook.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-expense.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-install.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-memo.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-prefs.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-print.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-search.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-todo.png $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 644 jpilot-toplogo.jpg $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -d -m 755 $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons
++	$(INSTALL) -m 644 ../icons/README $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons/README
++	$(INSTALL) -m 644 ../icons/jpilot-icon1.xpm $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons/
++	$(INSTALL) -m 644 ../icons/jpilot-icon2.xpm $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons/
++	$(INSTALL) -m 644 ../icons/jpilot-icon3.xpm $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons/
++	$(INSTALL) -m 644 ../icons/jpilot-icon4.xpm $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons/
++	$(INSTALL) -m 644 ../BUGS $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../ChangeLog $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../COPYING $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../AUTHORS $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../INSTALL $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../README $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../TODO $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
++	$(INSTALL) -m 644 ../UPGRADING $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/
  
- # Targets
--all: po_dir intl_dir jpilot jpilot-sync jpilot-dump
-+all: po_dir intl_dir jpilot jpilot-sync jpilot-dump jpilot-upgrade-99
- 
- jpilot: jpilot.o datebook.o address.o todo.o memo.o \
- 	utils.o sync.o prefs.o log.o plugins.o \
-@@ -155,7 +155,7 @@
- 	$(CC) $(OPTIONS) -c cp1250.c
- 
- password.o: password.c password.h config.h
--	$(CC) $(OPTIONS) $(GTKFLAGS) -c password.c
-+	$(CC) $(OPTIONS) $(PILOT_FLAGS) $(GTKFLAGS) -c password.c
- 
- russian.o: russian.c russian.h config.h
- 	$(CC) $(OPTIONS) -c russian.c
-@@ -240,9 +240,9 @@
- 	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-dump ; \
- 	fi
- 	if test -d "$(prefix)/bin" ; then \
--	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/bin/jpilot-upgrade-99 ; \
-+	  ./install-sh -s -c -m 555 jpilot-upgrade-99 $(prefix)/bin/jpilot-upgrade-99 ; \
- 	else \
--	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-upgrade-99 ; \
-+	  ./install-sh -s -c -m 555 jpilot-upgrade-99 $(prefix)/jpilot-upgrade-99 ; \
- 	fi
- 	./install-sh -d -m 755 $(prefix)/share/jpilot
- 	./install-sh -c -m 755 jpilotrc.blue $(prefix)/share/jpilot
+ uninstall-local:
+ 	rm -f $(prefix)/doc/$(PACKAGE)-$(VERSION)/manual.html
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
deleted file mode 100644
index 3596076e640..00000000000
--- a/comms/jpilot/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/11/30 13:36:14 salo Exp $
-
---- configure.in.orig	Tue Feb  6 20:26:38 2001
-+++ configure.in	Sat Nov 30 13:49:28 2002
-@@ -180,6 +180,10 @@
-    AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);] , have_dlopen=yes, , )
-    LIBS="$save_LIBS"
- 
-+   if test "x$have_dlopen" != "yes"; then
-+      AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);], have_dlopen=yes,, )
-+   fi
-+
-    if test "x$have_dlopen" = "xyes"; then
-       AC_DEFINE(ENABLE_PLUGINS)
-       AC_MSG_RESULT(ok, plugin support enabled)
diff --git a/comms/jpilot/patches/patch-ac b/comms/jpilot/patches/patch-ac
deleted file mode 100644
index fd55882e567..00000000000
--- a/comms/jpilot/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/12/08 10:52:25 jmc Exp $
-
---- aclocal.m4.orig	Sat Dec  8 10:44:06 2001
-+++ aclocal.m4	Sat Dec  8 10:44:35 2001
-@@ -808,7 +808,7 @@
- dnl Get the cflags and libraries from the gtk-config script
- dnl
- AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
--            gtk_config_prefix="$withval", gtk_config_prefix="")
-+            gtk_config_prefix="", gtk_config_prefix="")
- AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
- AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
diff --git a/comms/jpilot/patches/patch-ad b/comms/jpilot/patches/patch-ad
index 261703ffb29..cc55d692bf8 100644
--- a/comms/jpilot/patches/patch-ad
+++ b/comms/jpilot/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.3 2002/01/28 14:23:40 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2003/01/10 04:34:20 rh Exp $
 
---- docs/jpilot.1.orig	Wed Feb  7 06:23:22 2001
+--- docs/jpilot.1.orig	Thu Aug 29 02:31:40 2002
 +++ docs/jpilot.1
-@@ -7,8 +7,11 @@
- J-Pilot is a desktop organizer application for the palm pilot and other
- Palm OS devices.  It is similar in functionality to the one that
- 3Com distributes.
+@@ -29,8 +29,11 @@ The PILOTPORT, and PILOTRATE env variabl
+ port to sync on, and at what speed.
+ 
+ If PILOTPORT is not set then it defaults to /dev/pilot.
 +.PP
 +For a more complete description, see
 +@PREFIX@/share/doc/html/jpilot/manual.html.
diff --git a/comms/jpilot/patches/patch-ae b/comms/jpilot/patches/patch-ae
deleted file mode 100644
index edba86a6a2d..00000000000
--- a/comms/jpilot/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/11/30 13:36:14 salo Exp $
-
---- configure.orig	Tue Feb  6 20:31:18 2001
-+++ configure	Sat Nov 30 13:49:01 2002
-@@ -3831,6 +3831,25 @@
- rm -f conftest*
-    LIBS="$save_LIBS"
- 
-+   if test "x$have_dlopen" != "yes"; then
-+      cat > conftest.$ac_ext <<EOF
-+#line 3840 "configure"
-+#include "confdefs.h"
-+#include <dlfcn.h>
-+int main() {
-+dlopen("huh",0);
-+; return 0; }
-+EOF
-+if { (eval echo configure:3847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  have_dlopen=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+   fi
-+
-    if test "x$have_dlopen" = "xyes"; then
-       cat >> confdefs.h <<\EOF
- #define ENABLE_PLUGINS 1
-@@ -3866,7 +3885,7 @@
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
- if test "${with_gtk_prefix+set}" = set; then
-   withval="$with_gtk_prefix"
--  gtk_config_prefix="$withval"
-+  gtk_config_prefix=""
- else
-   gtk_config_prefix=""
- fi