Update to 2.8.6.

Make sure we build plugins now.

11 files changed, 342 insertions, 2698 deletions

diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index af14317f1ab1..b03d6480f530 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	abiword-docs
-# Date created:		2008-04-16
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/editors/abiword-docs/Makefile,v 1.1 2009/11/10 14:08:20 kwm Exp $
-#
 
 PORTNAME=	abiword-docs
-PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTVERSION=	2.8.6
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
diff --git a/editors/abiword-docs/distinfo b/editors/abiword-docs/distinfo
index 35cd5e501680..c9c30b3620f3 100644
--- a/editors/abiword-docs/distinfo
+++ b/editors/abiword-docs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (AbiWord/abiword-docs-2.8.4.tar.gz) = b67071dc15126fa89491bf898dd64111d3a009a80e232bc1fe34d6c09c195c8d
-SIZE (AbiWord/abiword-docs-2.8.4.tar.gz) = 1462430
+MD5 (AbiWord/abiword-docs-2.8.6.tar.gz) = 197df94c1d9ed287903cb5aa0b60bbc1
+SHA256 (AbiWord/abiword-docs-2.8.6.tar.gz) = b6620b5887151a44c61ed63118ebe9044e332015f36b624724ab007d3465b502
+SIZE (AbiWord/abiword-docs-2.8.6.tar.gz) = 1460563
diff --git a/editors/abiword-docs/files/patch-configure b/editors/abiword-docs/files/patch-configure
index 4273e56a5a19..3e5f7a7c8e05 100644
--- a/editors/abiword-docs/files/patch-configure
+++ b/editors/abiword-docs/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2009-10-28 18:13:56.000000000 +0100
-+++ configure	2009-10-28 18:14:55.000000000 +0100
-@@ -2548,7 +2548,7 @@
+--- configure.orig	2010-05-30 21:34:34.000000000 +0200
++++ configure	2010-06-09 18:25:08.000000000 +0200
+@@ -2447,7 +2447,7 @@
  
  
  
 -if test "x$ABIWORD" == "x"; then
-+if test "x$ABIWORD" \= "x"; then
- 	{ { $as_echo "$as_me:$LINENO: error: abiword not found in PATH" >&5
- $as_echo "$as_me: error: abiword not found in PATH" >&2;}
-    { (exit 1); exit 1; }; }
++if test "x$ABIWORD" = "x"; then
+ 	{ as_fn_set_status 1
+ as_fn_error "abiword not found in PATH" "$LINENO" 5; }
+ fi
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index da9c6f6ff552..debea8753dbd 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/editors/abiword/Makefile,v 1.13 2009/11/10 13:56:18 kwm Exp $
 
 PORTNAME=	abiword
-PORTVERSION=	2.8.4
-PORTREVISION=	3
+PORTVERSION=	2.8.6
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -15,6 +14,7 @@ COMMENT=	An open-source, cross-platform WYSIWYG word processor
 
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		png15:${PORTSDIR}/graphics/png \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		wv-1.2:${PORTSDIR}/textproc/wv \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		fribidi:${PORTSDIR}/converters/fribidi \
@@ -22,17 +22,22 @@ LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		goffice-0.8:${PORTSDIR}/devel/goffice
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USES=		pathfix
-USE_GNOME=	libxml2 gtk20 desktopfileutils librsvg2
-WANT_GNOME=	yes
+USE_GNOME=	libxml2 gtk20 desktopfileutils librsvg2 libxslt
+MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--without-gnomevfs --disable-collab-backend-xmpp \
-		--disable-collab-backend-sugar
+CONFIGURE_ARGS=	--without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \
+		enable_dynamic="yes" enable_static="no" \
+		--disable-collab-backend-telepathy \
+		--enable-collab-backend-sugar
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
@@ -41,23 +46,117 @@ PLIST_SUB+=	ABIVERSION=${ABIVERSION}
 
 MAN1=		abiword.1
 
-OPTIONS_DEFINE=	DEBUG BOOST SPELLCHECK CLIPART TEMPLATES
-OPTIONS_DEFAULT=BOOST SPELLCHECK CLIPART TEMPLATES
+OPTIONS_DEFINE=	DEBUG SPELLCHECK CLIPART TEMPLATES MATHVIEW \
+		OTS WP AIKSAURUS GRAMMAR PSION
+OPTIONS_DEFAULT=SPELLCHECK CLIPART TEMPLATES COLLAB
+
+OPTIONS_GROUP=	COLLAB
+OPTIONS_GROUP_COLLAB=	COLXMPP
+
 SPELLCHECK_DESC=	Spell checking support
-CLIPART_DESC=		Install clipart
-TEMPLATES_DESC=		Install additional templates
+CLIPART_DESC=		Include clipart
+TEMPLATES_DESC=		Include additional templates
+COLLAB_DESC=		Collaboration backend
+COLXMPP_DESC=		Collaboration jammer/XMPP backend
+MATHVIEW_DESC=		MathML render plugin
+OTS_DESC=		Text Summarizer plugin
+WP_DESC=		WordPerfect img/doc import/export plugin
+AIKSAURUS_DESC=		Thesaurus plugin
+GRAMMAR_DESC=		Grammar checking plugin
+PSION_DESC=		Psion 5(MX) files convertion plugin
+
+# check configure for ALL_PLUGINS for complete list
+ABIWORD_PLUGINS=	garble loadbindings opml xslfo bmp iscii sdw babelfish \
+			paint command latex pdf wikipedia hrtext openxml \
+			goffice wmf kword mif wml s5 freetranslation gdict mht \
+			applix t602 docbook google eml hancom presentation \
+			clarisworks pdb urldict openwriter mswrite gimp \
+			passepartout collab eml
+
+# opendocument enabled by default, rsvg plugin isn't needed on unix.
+# Plugins we don't support:
+# gda
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MMATHVIEW}
+LIB_DEPENDS+=	mathview:${PORTSDIR}/x11-toolkits/gtkmathview
+ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} mathview
+PLIST_SUB+=	MATHVIEW=""
+.else
+PLIST_SUB+=	MATHVIEW="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MOTS}
+LIB_DEPENDS+=	ots-1:${PORTSDIR}/textproc/ots
+ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} ots
+PLIST_SUB+=	OTS=""
+.else
+PLIST_SUB+=	OTS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MWP}
+USE_GNOME+=	libgsf
+LIB_DEPENDS+=	wpg-0.1:${PORTSDIR}/graphics/libwpg01 \
+		wpd-0.8:${PORTSDIR}/textproc/libwpd08
+ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} wpg wordperfect
+PLIST_SUB+=	WP=""
+.else
+PLIST_SUB+=	WP="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MAIKSAURUS}
+LIB_DEPENDS+=	AiksaurusGTK-1.2:${PORTSDIR}/textproc/aiksaurus-gtk
+ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} aiksaurus
+PLIST_SUB+=	AIKSAURUS=""
+.else
+PLIST_SUB+=	AIKSAURUS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MGRAMMAR}
+LIB_DEPENDS+=	link-grammar:${PORTSDIR}/textproc/link-grammar
+ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} grammar
+PLIST_SUB+=	GRAMMAR=""
+.else
+PLIST_SUB+=	GRAMMAR="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPSION}
+LIB_DEPENDS+=	psiconv:${PORTSDIR}/converters/psiconv
+ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} psion
+PLIST_SUB+=	PSION=""
+.else
+PLIST_SUB+=	PSION="@comment "
+.endif
+
+#.if ! ${PORT_OPTIONS:MCOLLAB} && ${PORT_OPTIONS:MCOLXMPP}
+#BROKEN=		Please enable the COLLAB option, the COLXMPP option need it.
+#.endif
+
+.if ${PORT_OPTIONS:MCOLXMPP}
+CONFIGURE_ARGS+=--enable-collab-backend-xmpp
+LIB_DEPENDS+=	loudmouth-1:${PORTSDIR}/net-im/loudmouth
+.else
+CONFIGURE_ARGS+=--disable-collab-backend-xmpp
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug --enable-symbols
 .endif
 
-.if ${PORT_OPTIONS:MBOOST}
-CONFIGURE_ARGS+=	--with-boost
-LIB_DEPENDS+=		boost_system:${PORTSDIR}/devel/boost-libs
+.if ${PORT_OPTIONS:MCOLLAB}
+CONFIGURE_ARGS+=--with-boost --enable-collab-backend-tcp \
+		--enable-collab-backend-service
+BUILD_DEPENDS+=	${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+LIB_DEPENDS+=	boost_system:${PORTSDIR}/devel/boost-libs \
+		soup-2.4:${PORTSDIR}/devel/libsoup \
+		gnutls:${PORTSDIR}/security/gnutls
+RUN_DEPENDS+=	${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+PLIST_SUB+=		COLLAB=""
 .else
-CONFIGURE_ARGS+=	--without-boost
+CONFIGURE_ARGS+=--without-boost --disable-collab-backend-tcp \
+		--disable-collab-backend-service
+PLIST_SUB+=		COLLAB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSPELLCHECK}
@@ -89,6 +188,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \
 		${WRKSRC}/src/af/util/xp/ut_go_file.h
+	@${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}-${ABIVERSION}/plugins
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index dd2055ce30b6..38a079b05d77 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,2 +1,3 @@
-SHA256 (AbiWord/abiword-2.8.4.tar.gz) = 14a4b4638a38bbff225e20e8e2dbc9d32166f40009caf7bd86cc48c4d8404eec
-SIZE (AbiWord/abiword-2.8.4.tar.gz) = 9133449
+MD5 (AbiWord/abiword-2.8.6.tar.gz) = f883b0a7f26229a9c66fd6a1a94381aa
+SHA256 (AbiWord/abiword-2.8.6.tar.gz) = d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
+SIZE (AbiWord/abiword-2.8.6.tar.gz) = 9218827
diff --git a/editors/abiword/files/patch-configure b/editors/abiword/files/patch-configure
deleted file mode 100644
index 323a11f86adc..000000000000
--- a/editors/abiword/files/patch-configure
+++ /dev/null
@@ -1,2594 +0,0 @@
---- configure.orig	2013-03-22 13:57:57.000000000 +0100
-+++ configure	2013-03-22 13:58:05.000000000 +0100
-@@ -16637,9 +16637,9 @@
- xp_funcs='localeconv strcspn strncasecmp strtoul' # "sqrt" test fails, hmm
- funcs=
- 
--if test "$PLATFORM" == "cocoa"; then
-+if test "$PLATFORM" = "cocoa"; then
- 	funcs="$cocoa_funcs $xp_funcs"
--elif test "$PLATFORM" == "unix"; then
-+elif test "$PLATFORM" = "unix"; then
- 
- for ac_header in sys/time.h
- do
-@@ -17125,7 +17125,7 @@
-   esac
- 
- 	funcs="$unix_funcs $xp_funcs"
--elif test "$PLATFORM" == "win"; then
-+elif test "$PLATFORM" = "win"; then
- 	funcs="$win_funcs $xp_funcs"
- fi
- 
-@@ -17244,7 +17244,7 @@
- # Check whether --enable-default-plugins was given.
- if test "${enable_default_plugins+set}" = set; then
-   enableval=$enable_default_plugins;
--	if test "$enableval" == "no"; then
-+	if test "$enableval" = "no"; then
- 		abi_cv_disable_default_plugins="yes"
- 	fi
- 
-@@ -17254,11 +17254,11 @@
- # Check whether --enable-plugins was given.
- if test "${enable_plugins+set}" = set; then
-   enableval=$enable_plugins;
--	if test "$enableval" == "no"; then
-+	if test "$enableval" = "no"; then
- 		abi_cv_disable_exports="yes"
- 		abi_cv_disable_default_plugins="yes"
- 		abi_cv_plugins=""
--	elif test "$enableval" == "yes"; then
-+	elif test "$enableval" = "yes"; then
- 		# auto-detect which plugins can be built
- 		abi_cv_plugins="auto"
- 	else
-@@ -17272,9 +17272,9 @@
- # Check whether --enable-builtin-plugins was given.
- if test "${enable_builtin_plugins+set}" = set; then
-   enableval=$enable_builtin_plugins;
--	if test "$enableval" == "no"; then
-+	if test "$enableval" = "no"; then
- 		abi_cv_builtin_plugins=""
--	elif test "$enableval" == "yes"; then
-+	elif test "$enableval" = "yes"; then
- 		# just build default plugins
- 		abi_cv_builtin_plugins=""
- 	else
-@@ -17309,8 +17309,8 @@
- fi
- 
- 
--if test "$abi_cv_print" == "yes" &&
--   test "$TOOLKIT" == "gtk"; then
-+if test "$abi_cv_print" = "yes" &&
-+   test "$TOOLKIT" = "gtk"; then
- 	opt_pkgs="$opt_pkgs"
- fi
- 
-@@ -17438,7 +17438,7 @@
- else
- 
- 	# autodetect
--	if test "$TOOLKIT" == "gtk"; then
-+	if test "$TOOLKIT" = "gtk"; then
- 		if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$enchant_req \"") >&5
-   ($PKG_CONFIG --exists --print-errors " $enchant_req ") 2>&5
-@@ -17460,7 +17460,7 @@
- fi
- 
- 
--if test "$abi_cv_spell" == "yes"; then
-+if test "$abi_cv_spell" = "yes"; then
- 	opt_pkgs="$opt_pkgs $enchant_req"
- fi
- 
-@@ -17528,7 +17528,7 @@
- #
- # deferred from the "enable-embedded"
- #
--if test "$abi_cv_embedded_platform" == "hildon"; then
-+if test "$abi_cv_embedded_platform" = "hildon"; then
- 	opt_pkgs="$opt_pkgs $hildon_pkgs"
- fi
- 
-@@ -17536,7 +17536,7 @@
- # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
-   enableval=$enable_debug;
--	if test "$enableval" == "yes"; then
-+	if test "$enableval" = "yes"; then
- 		abi_cv_debug="yes"
- 	fi
- 
-@@ -17560,7 +17560,7 @@
- else
- 
- 	# use gnomevfs if detected
--	if test "$TOOLKIT" == "gtk"; then
-+	if test "$TOOLKIT" = "gtk"; then
- 		if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomevfs_req \"") >&5
-   ($PKG_CONFIG --exists --print-errors " $gnomevfs_req ") 2>&5
-@@ -17582,7 +17582,7 @@
- fi
- 
- 
--if test "$abi_cv_gnomevfs" == "yes"; then
-+if test "$abi_cv_gnomevfs" = "yes"; then
- 	opt_pkgs="$opt_pkgs $gnomevfs_req"
- fi
- 
-@@ -17613,7 +17613,7 @@
- fi
- 
- 
--if test "$abi_cv_gio" == "yes"; then
-+if test "$abi_cv_gio" = "yes"; then
- 	opt_pkgs="$opt_pkgs $gio_req"
- fi
- 
-@@ -17626,7 +17626,7 @@
- else
- 
- 	# use goffice if detected
--	if test "$TOOLKIT" == "gtk"; then
-+	if test "$TOOLKIT" = "gtk"; then
- 	if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$goffice_req \"") >&5
-   ($PKG_CONFIG --exists --print-errors " $goffice_req ") 2>&5
-@@ -17648,8 +17648,8 @@
- 
- GOFFICE_BUILTIN_CPPFLAGS=
- GOFFICE_BUILTIN_LIBS=
--if test "$PLATFORM" == "unix" && \
--   test "$abi_cv_goffice" == "yes"; then
-+if test "$PLATFORM" = "unix" && \
-+   test "$abi_cv_goffice" = "yes"; then
- 	opt_pkgs="$opt_pkgs $goffice_req"
- else
- 	GOFFICE_BUILTIN_CPPFLAGS='-I${top_srcdir}/goffice-bits'
-@@ -17688,7 +17688,7 @@
- # Check whether --with-abisdk was given.
- if test "${with_abisdk+set}" = set; then
-   withval=$with_abisdk;
--	if test "x$withval" == "x"; then
-+	if test "x$withval" = "x"; then
- 		{ { $as_echo "$as_me:$LINENO: error: The AbiSDK path must be specified." >&5
- $as_echo "$as_me: error: The AbiSDK path must be specified." >&2;}
-    { (exit 1); exit 1; }; }
-@@ -18389,13 +18389,13 @@
- deps_pkgs="$xp_pkgs $opt_pkgs"
- SYSTEM_LIBS=
- SYSTEM_CFLAGS=
--if test "$TOOLKIT" == "win"; then
-+if test "$TOOLKIT" = "win"; then
- 	deps_pkgs="$deps_pkgs $win_pkgs"
- 	# nonstandard dlls go below the blank line
- 	SYSTEM_LIBS="-ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lshell32 -luser32 -luuid -lversion -lwinspool \
- 		      $PNG_LIBS -lz -ljpeg"
- 	SYSTEM_CFLAGS="-mthreads"
--elif test "$TOOLKIT" == "cocoa"; then
-+elif test "$TOOLKIT" = "cocoa"; then
- 	deps_pkgs="$deps_pkgs $cocoa_pkgs"
- 	SYSTEM_LIBS="-framework Cocoa"
- 	# Extract the first word of "convert", so it can be a program name with args.
-@@ -18551,7 +18551,7 @@
- $as_echo "yes" >&6; }
- 	:
- fi
--if test "$TOOLKIT" == "gtk"; then
-+if test "$TOOLKIT" = "gtk"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for GTK214" >&5
-@@ -18619,7 +18619,7 @@
- $as_echo "yes" >&6; }
- 	abi_cv_gtk214=yes
- fi
--	if test "$abi_cv_gtk214" == "yes" ; then
-+	if test "$abi_cv_gtk214" = "yes" ; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GTK214 1
-@@ -18628,7 +18628,7 @@
- 	fi
- fi
- 
--if test "$TOOLKIT" == "gtk" -o "$TOOLKIT" == "cocoa"; then
-+if test "$TOOLKIT" = "gtk" -o "$TOOLKIT" = "cocoa"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define WITH_CAIRO 1
-@@ -18636,7 +18636,7 @@
- 
- 	WITH_CAIRO=1
- fi
-- if test "$WITH_CAIRO" == "1"; then
-+ if test "$WITH_CAIRO" = "1"; then
-   WITH_CAIRO_TRUE=
-   WITH_CAIRO_FALSE='#'
- else
-@@ -18647,7 +18647,7 @@
- 
- 
- 
--if test "$abi_cv_gio" == "yes"; then
-+if test "$abi_cv_gio" = "yes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for GSFGI" >&5
-@@ -18715,7 +18715,7 @@
- $as_echo "yes" >&6; }
- 	abi_cv_gsf_gio=yes
- fi
--	if test "$abi_cv_gsf_gio" == "yes" ; then
-+	if test "$abi_cv_gsf_gio" = "yes" ; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GSF_GIO 1
-@@ -18811,7 +18811,7 @@
- 
- ABIWORD_HEADERSDIR="${includedir}/${PACKAGE_NAME}-${ABIWORD_SERIES}"
- 
--if test "$TOOLKIT" == "cocoa"; then
-+if test "$TOOLKIT" = "cocoa"; then
- ABIWORD_CONTENTSDIR="/AbiWord.app/Contents"
- 
- ABIWORD_DATADIR="${ABIWORD_CONTENTSDIR}/Resources"
-@@ -18837,7 +18837,7 @@
- 
- # maybe just switch on TOOLKIT instead of the fancy TARGET defines
- # also for embedded, e.g. hildon would set TOOLKIT_GTK and TOOLKIT_HILDON
-- if test "$TOOLKIT" == "cocoa"; then
-+ if test "$TOOLKIT" = "cocoa"; then
-   TOOLKIT_COCOA_TRUE=
-   TOOLKIT_COCOA_FALSE='#'
- else
-@@ -18845,7 +18845,7 @@
-   TOOLKIT_COCOA_FALSE=
- fi
- 
-- if test "$TOOLKIT" == "gtk"; then
-+ if test "$TOOLKIT" = "gtk"; then
-   TOOLKIT_GTK_TRUE=
-   TOOLKIT_GTK_FALSE='#'
- else
-@@ -18853,7 +18853,7 @@
-   TOOLKIT_GTK_FALSE=
- fi
- 
-- if test "$TOOLKIT" == "win"; then
-+ if test "$TOOLKIT" = "win"; then
-   TOOLKIT_WIN_TRUE=
-   TOOLKIT_WIN_FALSE='#'
- else
-@@ -18862,15 +18862,15 @@
- fi
- 
- 
--if test "$enable_dynamic" == ""; then
-+if test "$enable_dynamic" = ""; then
- 	enable_dynamic="no"
- fi
- 
--if test "$enable_static" == ""; then
-+if test "$enable_static" = ""; then
- 	enable_static="no"
- fi
- 
--if test "$TOOLKIT" == "win"; then
-+if test "$TOOLKIT" = "win"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define TOOLKIT_WIN 1
-@@ -18889,7 +18889,7 @@
- 	# override static/dynamic, on win32 only static is possible
- 	enable_dynamic="no"
- 	enable_static="yes"
--elif test "$TOOLKIT" == "cocoa"; then
-+elif test "$TOOLKIT" = "cocoa"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define TOOLKIT_COCOA 1
-@@ -18905,7 +18905,7 @@
- _ACEOF
- 
- fi
-- if test "$enable_dynamic" == "yes"; then
-+ if test "$enable_dynamic" = "yes"; then
-   ENABLE_DYNAMIC_TRUE=
-   ENABLE_DYNAMIC_FALSE='#'
- else
-@@ -18913,7 +18913,7 @@
-   ENABLE_DYNAMIC_FALSE=
- fi
- 
-- if test "$enable_static" == "yes"; then
-+ if test "$enable_static" = "yes"; then
-   ENABLE_STATIC_TRUE=
-   ENABLE_STATIC_FALSE='#'
- else
-@@ -19032,22 +19032,22 @@
- 	:
- fi
- PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'${WP_CPPFLAGS} -DABI_DLL'
--if test "$TOOLKIT" == "gtk" &&
--   test "$enable_dynamic" == "yes"; then
-+if test "$TOOLKIT" = "gtk" &&
-+   test "$enable_dynamic" = "yes"; then
- 	# link plugins to work around gcc visibility issue with
- 	# derived classes in dlopened modules
- 	PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES"
--elif test "$TOOLKIT" == "win"; then
-+elif test "$TOOLKIT" = "win"; then
- 	PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0500'
- 	# link plugins to the executable so they can be loaded
- 	PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src -labiword'
--elif test "$TOOLKIT" == "cocoa" ; then
-+elif test "$TOOLKIT" = "cocoa" ; then
- 	PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES"
- fi
- 
- 
- 
--if test "$abi_cv_disable_exports" == "yes"; then
-+if test "$abi_cv_disable_exports" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define DISABLE_EXPORTS 1
-@@ -19055,14 +19055,14 @@
- 
- fi
- 
--if test "$abi_cv_menubutton" == "yes"; then
-+if test "$abi_cv_menubutton" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_MENUBUTTON 1
- _ACEOF
- 
- fi
-- if test "$abi_cv_menubutton" == "yes"; then
-+ if test "$abi_cv_menubutton" = "yes"; then
-   ENABLE_MENUBUTTON_TRUE=
-   ENABLE_MENUBUTTON_FALSE='#'
- else
-@@ -19071,14 +19071,14 @@
- fi
- 
- 
--if test "$abi_cv_print" == "yes"; then
-+if test "$abi_cv_print" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_PRINT 1
- _ACEOF
- 
- fi
-- if test "$abi_cv_print" == "yes"; then
-+ if test "$abi_cv_print" = "yes"; then
-   ENABLE_PRINT_TRUE=
-   ENABLE_PRINT_FALSE='#'
- else
-@@ -19087,7 +19087,7 @@
- fi
- 
- 
--if test "$abi_cv_spell" == "yes"; then
-+if test "$abi_cv_spell" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_SPELL 1
-@@ -19100,7 +19100,7 @@
- _ACEOF
- 
- fi
-- if test "$abi_cv_spell" == "yes"; then
-+ if test "$abi_cv_spell" = "yes"; then
-   ENABLE_SPELL_TRUE=
-   ENABLE_SPELL_FALSE='#'
- else
-@@ -19109,14 +19109,14 @@
- fi
- 
- 
--if test "$abi_cv_statusbar" == "yes"; then
-+if test "$abi_cv_statusbar" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_STATUSBAR 1
- _ACEOF
- 
- fi
-- if test "$abi_cv_statusbar" == "yes"; then
-+ if test "$abi_cv_statusbar" = "yes"; then
-   ENABLE_STATUSBAR_TRUE=
-   ENABLE_STATUSBAR_FALSE='#'
- else
-@@ -19132,7 +19132,7 @@
- _ACEOF
- 
- fi
-- if test "$abi_cv_embedded_target" == "EMBEDDED_TARGET_HILDON"; then
-+ if test "$abi_cv_embedded_target" = "EMBEDDED_TARGET_HILDON"; then
-   EMBEDDED_HILDON_TRUE=
-   EMBEDDED_HILDON_FALSE='#'
- else
-@@ -19141,14 +19141,14 @@
- fi
- 
- 
--if test "$abi_cv_emacs_keybinding" == "yes"; then
-+if test "$abi_cv_emacs_keybinding" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_EMACS_KEYBINDING 1
- _ACEOF
- 
- fi
-- if test "$abi_cv_emacs_keybinding" == "yes"; then
-+ if test "$abi_cv_emacs_keybinding" = "yes"; then
-   ENABLE_EMACS_KEYBINDING_TRUE=
-   ENABLE_EMACS_KEYBINDING_FALSE='#'
- else
-@@ -19157,14 +19157,14 @@
- fi
- 
- 
--if test "$abi_cv_vi_keybinding" == "yes"; then
-+if test "$abi_cv_vi_keybinding" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_VI_KEYBINDING 1
- _ACEOF
- 
- fi
-- if test "$abi_cv_vi_keybinding" == "yes"; then
-+ if test "$abi_cv_vi_keybinding" = "yes"; then
-   ENABLE_VI_KEYBINDING_TRUE=
-   ENABLE_VI_KEYBINDING_FALSE='#'
- else
-@@ -19173,7 +19173,7 @@
- fi
- 
- 
-- if test "$abi_cv_clipart" == "yes"; then
-+ if test "$abi_cv_clipart" = "yes"; then
-   ENABLE_CLIPART_TRUE=
-   ENABLE_CLIPART_FALSE='#'
- else
-@@ -19181,7 +19181,7 @@
-   ENABLE_CLIPART_FALSE=
- fi
- 
-- if test "$abi_cv_templates" == "yes"; then
-+ if test "$abi_cv_templates" = "yes"; then
-   ENABLE_TEMPLATES_TRUE=
-   ENABLE_TEMPLATES_FALSE='#'
- else
-@@ -19190,7 +19190,7 @@
- fi
- 
- 
--if test "$abi_cv_debug" == "yes"; then
-+if test "$abi_cv_debug" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define DEBUG 1
-@@ -19203,7 +19203,7 @@
- _ACEOF
- 
- fi
-- if test "$abi_cv_debug" == "yes"; then
-+ if test "$abi_cv_debug" = "yes"; then
-   DEBUG_TRUE=
-   DEBUG_FALSE='#'
- else
-@@ -19216,7 +19216,7 @@
- # Optional dependencies handling
- #
- 
--if test "$abi_cv_gnomevfs" == "yes"; then
-+if test "$abi_cv_gnomevfs" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define WITH_GNOMEVFS 1
-@@ -19224,7 +19224,7 @@
- 
- fi
- 
--if test "$abi_cv_gio" == "yes"; then
-+if test "$abi_cv_gio" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define WITH_GIO 1
-@@ -19232,14 +19232,14 @@
- 
- fi
- 
--if test "$abi_cv_goffice" == "yes"; then
-+if test "$abi_cv_goffice" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define WITH_GOFFICE 1
- _ACEOF
- 
- fi
-- if test "$TOOLKIT" == "gtk" && test "$abi_cv_goffice" != "yes"; then
-+ if test "$TOOLKIT" = "gtk" && test "$abi_cv_goffice" != "yes"; then
-   WITH_GOFFICE_BUILTIN_TRUE=
-   WITH_GOFFICE_BUILTIN_FALSE='#'
- else
-@@ -19258,7 +19258,7 @@
- 
- 
- PLUGINS=
--if test "$abi_cv_plugins" == "auto"; then
-+if test "$abi_cv_plugins" = "auto"; then
- 
- 	# which plugins to auto-enable
- 	# this creates variables like "enable_wordperfect=auto"
-@@ -19301,7 +19301,7 @@
- 	BUILTIN_PLUGINS_LA="$BUILTIN_PLUGINS_LA ../../plugins/$plugin/$plugin.la"
- done
- 
-- if test "$enable_openxml_builtin" == "yes"; then
-+ if test "$enable_openxml_builtin" = "yes"; then
-   OPENXML_BUILTIN_TRUE=
-   OPENXML_BUILTIN_FALSE='#'
- else
-@@ -19309,7 +19309,7 @@
-   OPENXML_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_t602_builtin" == "yes"; then
-+ if test "$enable_t602_builtin" = "yes"; then
-   T602_BUILTIN_TRUE=
-   T602_BUILTIN_FALSE='#'
- else
-@@ -19317,7 +19317,7 @@
-   T602_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_docbook_builtin" == "yes"; then
-+ if test "$enable_docbook_builtin" = "yes"; then
-   DOCBOOK_BUILTIN_TRUE=
-   DOCBOOK_BUILTIN_FALSE='#'
- else
-@@ -19325,7 +19325,7 @@
-   DOCBOOK_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_gimp_builtin" == "yes"; then
-+ if test "$enable_gimp_builtin" = "yes"; then
-   GIMP_BUILTIN_TRUE=
-   GIMP_BUILTIN_FALSE='#'
- else
-@@ -19333,7 +19333,7 @@
-   GIMP_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_clarisworks_builtin" == "yes"; then
-+ if test "$enable_clarisworks_builtin" = "yes"; then
-   CLARISWORKS_BUILTIN_TRUE=
-   CLARISWORKS_BUILTIN_FALSE='#'
- else
-@@ -19341,7 +19341,7 @@
-   CLARISWORKS_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_bmp_builtin" == "yes"; then
-+ if test "$enable_bmp_builtin" = "yes"; then
-   BMP_BUILTIN_TRUE=
-   BMP_BUILTIN_FALSE='#'
- else
-@@ -19349,7 +19349,7 @@
-   BMP_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_wml_builtin" == "yes"; then
-+ if test "$enable_wml_builtin" = "yes"; then
-   WML_BUILTIN_TRUE=
-   WML_BUILTIN_FALSE='#'
- else
-@@ -19357,7 +19357,7 @@
-   WML_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_command_builtin" == "yes"; then
-+ if test "$enable_command_builtin" = "yes"; then
-   COMMAND_BUILTIN_TRUE=
-   COMMAND_BUILTIN_FALSE='#'
- else
-@@ -19365,7 +19365,7 @@
-   COMMAND_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_freetranslation_builtin" == "yes"; then
-+ if test "$enable_freetranslation_builtin" = "yes"; then
-   FREETRANSLATION_BUILTIN_TRUE=
-   FREETRANSLATION_BUILTIN_FALSE='#'
- else
-@@ -19373,7 +19373,7 @@
-   FREETRANSLATION_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_kword_builtin" == "yes"; then
-+ if test "$enable_kword_builtin" = "yes"; then
-   KWORD_BUILTIN_TRUE=
-   KWORD_BUILTIN_FALSE='#'
- else
-@@ -19381,7 +19381,7 @@
-   KWORD_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_iscii_builtin" == "yes"; then
-+ if test "$enable_iscii_builtin" = "yes"; then
-   ISCII_BUILTIN_TRUE=
-   ISCII_BUILTIN_FALSE='#'
- else
-@@ -19389,7 +19389,7 @@
-   ISCII_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_s5_builtin" == "yes"; then
-+ if test "$enable_s5_builtin" = "yes"; then
-   S5_BUILTIN_TRUE=
-   S5_BUILTIN_FALSE='#'
- else
-@@ -19397,7 +19397,7 @@
-   S5_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_babelfish_builtin" == "yes"; then
-+ if test "$enable_babelfish_builtin" = "yes"; then
-   BABELFISH_BUILTIN_TRUE=
-   BABELFISH_BUILTIN_FALSE='#'
- else
-@@ -19405,7 +19405,7 @@
-   BABELFISH_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_hancom_builtin" == "yes"; then
-+ if test "$enable_hancom_builtin" = "yes"; then
-   HANCOM_BUILTIN_TRUE=
-   HANCOM_BUILTIN_FALSE='#'
- else
-@@ -19413,7 +19413,7 @@
-   HANCOM_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_goffice_builtin" == "yes"; then
-+ if test "$enable_goffice_builtin" = "yes"; then
-   GOFFICE_BUILTIN_TRUE=
-   GOFFICE_BUILTIN_FALSE='#'
- else
-@@ -19421,7 +19421,7 @@
-   GOFFICE_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_mht_builtin" == "yes"; then
-+ if test "$enable_mht_builtin" = "yes"; then
-   MHT_BUILTIN_TRUE=
-   MHT_BUILTIN_FALSE='#'
- else
-@@ -19429,7 +19429,7 @@
-   MHT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_openwriter_builtin" == "yes"; then
-+ if test "$enable_openwriter_builtin" = "yes"; then
-   OPENWRITER_BUILTIN_TRUE=
-   OPENWRITER_BUILTIN_FALSE='#'
- else
-@@ -19437,7 +19437,7 @@
-   OPENWRITER_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_ots_builtin" == "yes"; then
-+ if test "$enable_ots_builtin" = "yes"; then
-   OTS_BUILTIN_TRUE=
-   OTS_BUILTIN_FALSE='#'
- else
-@@ -19445,7 +19445,7 @@
-   OTS_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_opml_builtin" == "yes"; then
-+ if test "$enable_opml_builtin" = "yes"; then
-   OPML_BUILTIN_TRUE=
-   OPML_BUILTIN_FALSE='#'
- else
-@@ -19453,7 +19453,7 @@
-   OPML_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_pdf_builtin" == "yes"; then
-+ if test "$enable_pdf_builtin" = "yes"; then
-   PDF_BUILTIN_TRUE=
-   PDF_BUILTIN_FALSE='#'
- else
-@@ -19461,7 +19461,7 @@
-   PDF_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_collab_builtin" == "yes"; then
-+ if test "$enable_collab_builtin" = "yes"; then
-   COLLAB_BUILTIN_TRUE=
-   COLLAB_BUILTIN_FALSE='#'
- else
-@@ -19469,7 +19469,7 @@
-   COLLAB_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_paint_builtin" == "yes"; then
-+ if test "$enable_paint_builtin" = "yes"; then
-   PAINT_BUILTIN_TRUE=
-   PAINT_BUILTIN_FALSE='#'
- else
-@@ -19477,7 +19477,7 @@
-   PAINT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_wmf_builtin" == "yes"; then
-+ if test "$enable_wmf_builtin" = "yes"; then
-   WMF_BUILTIN_TRUE=
-   WMF_BUILTIN_FALSE='#'
- else
-@@ -19485,7 +19485,7 @@
-   WMF_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_loadbindings_builtin" == "yes"; then
-+ if test "$enable_loadbindings_builtin" = "yes"; then
-   LOADBINDINGS_BUILTIN_TRUE=
-   LOADBINDINGS_BUILTIN_FALSE='#'
- else
-@@ -19493,7 +19493,7 @@
-   LOADBINDINGS_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_wpg_builtin" == "yes"; then
-+ if test "$enable_wpg_builtin" = "yes"; then
-   WPG_BUILTIN_TRUE=
-   WPG_BUILTIN_FALSE='#'
- else
-@@ -19501,7 +19501,7 @@
-   WPG_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_mswrite_builtin" == "yes"; then
-+ if test "$enable_mswrite_builtin" = "yes"; then
-   MSWRITE_BUILTIN_TRUE=
-   MSWRITE_BUILTIN_FALSE='#'
- else
-@@ -19509,7 +19509,7 @@
-   MSWRITE_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_rsvg_builtin" == "yes"; then
-+ if test "$enable_rsvg_builtin" = "yes"; then
-   RSVG_BUILTIN_TRUE=
-   RSVG_BUILTIN_FALSE='#'
- else
-@@ -19517,7 +19517,7 @@
-   RSVG_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_garble_builtin" == "yes"; then
-+ if test "$enable_garble_builtin" = "yes"; then
-   GARBLE_BUILTIN_TRUE=
-   GARBLE_BUILTIN_FALSE='#'
- else
-@@ -19525,7 +19525,7 @@
-   GARBLE_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_latex_builtin" == "yes"; then
-+ if test "$enable_latex_builtin" = "yes"; then
-   LATEX_BUILTIN_TRUE=
-   LATEX_BUILTIN_FALSE='#'
- else
-@@ -19533,7 +19533,7 @@
-   LATEX_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_pdb_builtin" == "yes"; then
-+ if test "$enable_pdb_builtin" = "yes"; then
-   PDB_BUILTIN_TRUE=
-   PDB_BUILTIN_FALSE='#'
- else
-@@ -19541,7 +19541,7 @@
-   PDB_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_eml_builtin" == "yes"; then
-+ if test "$enable_eml_builtin" = "yes"; then
-   EML_BUILTIN_TRUE=
-   EML_BUILTIN_FALSE='#'
- else
-@@ -19549,7 +19549,7 @@
-   EML_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_wordperfect_builtin" == "yes"; then
-+ if test "$enable_wordperfect_builtin" = "yes"; then
-   WORDPERFECT_BUILTIN_TRUE=
-   WORDPERFECT_BUILTIN_FALSE='#'
- else
-@@ -19557,7 +19557,7 @@
-   WORDPERFECT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_wikipedia_builtin" == "yes"; then
-+ if test "$enable_wikipedia_builtin" = "yes"; then
-   WIKIPEDIA_BUILTIN_TRUE=
-   WIKIPEDIA_BUILTIN_FALSE='#'
- else
-@@ -19565,7 +19565,7 @@
-   WIKIPEDIA_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_gda_builtin" == "yes"; then
-+ if test "$enable_gda_builtin" = "yes"; then
-   GDA_BUILTIN_TRUE=
-   GDA_BUILTIN_FALSE='#'
- else
-@@ -19573,7 +19573,7 @@
-   GDA_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_aiksaurus_builtin" == "yes"; then
-+ if test "$enable_aiksaurus_builtin" = "yes"; then
-   AIKSAURUS_BUILTIN_TRUE=
-   AIKSAURUS_BUILTIN_FALSE='#'
- else
-@@ -19581,7 +19581,7 @@
-   AIKSAURUS_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_applix_builtin" == "yes"; then
-+ if test "$enable_applix_builtin" = "yes"; then
-   APPLIX_BUILTIN_TRUE=
-   APPLIX_BUILTIN_FALSE='#'
- else
-@@ -19589,7 +19589,7 @@
-   APPLIX_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_grammar_builtin" == "yes"; then
-+ if test "$enable_grammar_builtin" = "yes"; then
-   GRAMMAR_BUILTIN_TRUE=
-   GRAMMAR_BUILTIN_FALSE='#'
- else
-@@ -19597,7 +19597,7 @@
-   GRAMMAR_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_mathview_builtin" == "yes"; then
-+ if test "$enable_mathview_builtin" = "yes"; then
-   MATHVIEW_BUILTIN_TRUE=
-   MATHVIEW_BUILTIN_FALSE='#'
- else
-@@ -19605,7 +19605,7 @@
-   MATHVIEW_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_gdict_builtin" == "yes"; then
-+ if test "$enable_gdict_builtin" = "yes"; then
-   GDICT_BUILTIN_TRUE=
-   GDICT_BUILTIN_FALSE='#'
- else
-@@ -19613,7 +19613,7 @@
-   GDICT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_passepartout_builtin" == "yes"; then
-+ if test "$enable_passepartout_builtin" = "yes"; then
-   PASSEPARTOUT_BUILTIN_TRUE=
-   PASSEPARTOUT_BUILTIN_FALSE='#'
- else
-@@ -19621,7 +19621,7 @@
-   PASSEPARTOUT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_xslfo_builtin" == "yes"; then
-+ if test "$enable_xslfo_builtin" = "yes"; then
-   XSLFO_BUILTIN_TRUE=
-   XSLFO_BUILTIN_FALSE='#'
- else
-@@ -19629,7 +19629,7 @@
-   XSLFO_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_opendocument_builtin" == "yes"; then
-+ if test "$enable_opendocument_builtin" = "yes"; then
-   OPENDOCUMENT_BUILTIN_TRUE=
-   OPENDOCUMENT_BUILTIN_FALSE='#'
- else
-@@ -19637,7 +19637,7 @@
-   OPENDOCUMENT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_google_builtin" == "yes"; then
-+ if test "$enable_google_builtin" = "yes"; then
-   GOOGLE_BUILTIN_TRUE=
-   GOOGLE_BUILTIN_FALSE='#'
- else
-@@ -19645,7 +19645,7 @@
-   GOOGLE_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_sdw_builtin" == "yes"; then
-+ if test "$enable_sdw_builtin" = "yes"; then
-   SDW_BUILTIN_TRUE=
-   SDW_BUILTIN_FALSE='#'
- else
-@@ -19653,7 +19653,7 @@
-   SDW_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_presentation_builtin" == "yes"; then
-+ if test "$enable_presentation_builtin" = "yes"; then
-   PRESENTATION_BUILTIN_TRUE=
-   PRESENTATION_BUILTIN_FALSE='#'
- else
-@@ -19661,7 +19661,7 @@
-   PRESENTATION_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_urldict_builtin" == "yes"; then
-+ if test "$enable_urldict_builtin" = "yes"; then
-   URLDICT_BUILTIN_TRUE=
-   URLDICT_BUILTIN_FALSE='#'
- else
-@@ -19669,7 +19669,7 @@
-   URLDICT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_psion_builtin" == "yes"; then
-+ if test "$enable_psion_builtin" = "yes"; then
-   PSION_BUILTIN_TRUE=
-   PSION_BUILTIN_FALSE='#'
- else
-@@ -19677,7 +19677,7 @@
-   PSION_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_hrtext_builtin" == "yes"; then
-+ if test "$enable_hrtext_builtin" = "yes"; then
-   HRTEXT_BUILTIN_TRUE=
-   HRTEXT_BUILTIN_FALSE='#'
- else
-@@ -19685,7 +19685,7 @@
-   HRTEXT_BUILTIN_FALSE=
- fi
- 
-- if test "$enable_mif_builtin" == "yes"; then
-+ if test "$enable_mif_builtin" = "yes"; then
-   MIF_BUILTIN_TRUE=
-   MIF_BUILTIN_FALSE='#'
- else
-@@ -19853,7 +19853,7 @@
- 
- else
- 
--		if test "$enable_openxml" == "auto"; then
-+		if test "$enable_openxml" = "auto"; then
- 		  { $as_echo "$as_me:$LINENO: WARNING: openxml plugin: \`boost/shared_ptr.hpp' not found, install boost or specify CPPFLAGS to include custom locations" >&5
- $as_echo "$as_me: WARNING: openxml plugin: \`boost/shared_ptr.hpp' not found, install boost or specify CPPFLAGS to include custom locations" >&2;}
- 		else
-@@ -19874,15 +19874,15 @@
- 
- else
- 
--	test "$enable_openxml" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: openxml plugin: dependencies not satisfied - $openxml_pkgs" >&5
-+	test "$enable_openxml" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: openxml plugin: dependencies not satisfied - $openxml_pkgs" >&5
- $as_echo "$as_me: WARNING: openxml plugin: dependencies not satisfied - $openxml_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_openxml" == "yes" || \
--   test "$openxml_deps" == "yes"; then
-+if test "$enable_openxml" = "yes" || \
-+   test "$openxml_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -19994,12 +19994,12 @@
- 	:
- fi
- 
--test "$enable_openxml" == "auto" && PLUGINS="$PLUGINS openxml"
-+test "$enable_openxml" = "auto" && PLUGINS="$PLUGINS openxml"
- 
- OPENXML_CFLAGS="$OPENXML_CFLAGS "'${PLUGIN_CFLAGS}'
- OPENXML_LIBS="$OPENXML_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_openxml_builtin" == "yes"; then
-+if test "$enable_openxml_builtin" = "yes"; then
- 	OPENXML_CFLAGS="$OPENXML_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -20025,15 +20025,15 @@
- 
- else
- 
--	test "$enable_t602" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: t602 plugin: dependencies not satisfied - $t602_pkgs" >&5
-+	test "$enable_t602" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: t602 plugin: dependencies not satisfied - $t602_pkgs" >&5
- $as_echo "$as_me: WARNING: t602 plugin: dependencies not satisfied - $t602_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_t602" == "yes" || \
--   test "$t602_deps" == "yes"; then
-+if test "$enable_t602" = "yes" || \
-+   test "$t602_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -20145,12 +20145,12 @@
- 	:
- fi
- 
--test "$enable_t602" == "auto" && PLUGINS="$PLUGINS t602"
-+test "$enable_t602" = "auto" && PLUGINS="$PLUGINS t602"
- 
- T602_CFLAGS="$T602_CFLAGS "'${PLUGIN_CFLAGS}'
- T602_LIBS="$T602_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_t602_builtin" == "yes"; then
-+if test "$enable_t602_builtin" = "yes"; then
- 	T602_CFLAGS="$T602_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -20176,15 +20176,15 @@
- 
- else
- 
--	test "$enable_docbook" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: docbook plugin: dependencies not satisfied - $docbook_pkgs" >&5
-+	test "$enable_docbook" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: docbook plugin: dependencies not satisfied - $docbook_pkgs" >&5
- $as_echo "$as_me: WARNING: docbook plugin: dependencies not satisfied - $docbook_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_docbook" == "yes" || \
--   test "$docbook_deps" == "yes"; then
-+if test "$enable_docbook" = "yes" || \
-+   test "$docbook_deps" = "yes"; then
- 
- { $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
- $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-@@ -20359,12 +20359,12 @@
- 	:
- fi
- 
--test "$enable_docbook" == "auto" && PLUGINS="$PLUGINS docbook"
-+test "$enable_docbook" = "auto" && PLUGINS="$PLUGINS docbook"
- 
- DOCBOOK_CFLAGS="$DOCBOOK_CFLAGS "'${PLUGIN_CFLAGS}'
- DOCBOOK_LIBS="$DOCBOOK_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_docbook_builtin" == "yes"; then
-+if test "$enable_docbook_builtin" = "yes"; then
- 	DOCBOOK_CFLAGS="$DOCBOOK_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -20379,12 +20379,12 @@
- 
- if test "$enable_gimp" != ""; then
- 
--test "$enable_gimp" == "auto" && PLUGINS="$PLUGINS gimp"
-+test "$enable_gimp" = "auto" && PLUGINS="$PLUGINS gimp"
- 
- GIMP_CFLAGS="$GIMP_CFLAGS "'${PLUGIN_CFLAGS}'
- GIMP_LIBS="$GIMP_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_gimp_builtin" == "yes"; then
-+if test "$enable_gimp_builtin" = "yes"; then
- 	GIMP_CFLAGS="$GIMP_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -20410,15 +20410,15 @@
- 
- else
- 
--	test "$enable_clarisworks" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: clarisworks plugin: dependencies not satisfied - $clarisworks_pkgs" >&5
-+	test "$enable_clarisworks" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: clarisworks plugin: dependencies not satisfied - $clarisworks_pkgs" >&5
- $as_echo "$as_me: WARNING: clarisworks plugin: dependencies not satisfied - $clarisworks_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_clarisworks" == "yes" || \
--   test "$clarisworks_deps" == "yes"; then
-+if test "$enable_clarisworks" = "yes" || \
-+   test "$clarisworks_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -20530,12 +20530,12 @@
- 	:
- fi
- 
--test "$enable_clarisworks" == "auto" && PLUGINS="$PLUGINS clarisworks"
-+test "$enable_clarisworks" = "auto" && PLUGINS="$PLUGINS clarisworks"
- 
- CLARISWORKS_CFLAGS="$CLARISWORKS_CFLAGS "'${PLUGIN_CFLAGS}'
- CLARISWORKS_LIBS="$CLARISWORKS_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_clarisworks_builtin" == "yes"; then
-+if test "$enable_clarisworks_builtin" = "yes"; then
- 	CLARISWORKS_CFLAGS="$CLARISWORKS_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -20555,19 +20555,19 @@
- 
- fi
- 
--if test "$enable_bmp" == "yes" || \
--   test "$bmp_deps" == "yes"; then
-+if test "$enable_bmp" = "yes" || \
-+   test "$bmp_deps" = "yes"; then
- 
- # TODO check for libpng, well abiword links to it anyways
- 
- BMP_CFLAGS="$BMP_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
- BMP_LIBS="$BMP_LIBS $PNG_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_bmp_builtin" == "yes"; then
-+if test "$enable_bmp_builtin" = "yes"; then
- 	BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
--test "$enable_bmp" == "auto" && PLUGINS="$PLUGINS bmp"
-+test "$enable_bmp" = "auto" && PLUGINS="$PLUGINS bmp"
- 
- fi
- 
-@@ -20591,15 +20591,15 @@
- 
- else
- 
--	test "$enable_wml" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: wml plugin: dependencies not satisfied - $wml_pkgs" >&5
-+	test "$enable_wml" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: wml plugin: dependencies not satisfied - $wml_pkgs" >&5
- $as_echo "$as_me: WARNING: wml plugin: dependencies not satisfied - $wml_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_wml" == "yes" || \
--   test "$wml_deps" == "yes"; then
-+if test "$enable_wml" = "yes" || \
-+   test "$wml_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -20711,12 +20711,12 @@
- 	:
- fi
- 
--test "$enable_wml" == "auto" && PLUGINS="$PLUGINS wml"
-+test "$enable_wml" = "auto" && PLUGINS="$PLUGINS wml"
- 
- WML_CFLAGS="$WML_CFLAGS "'${PLUGIN_CFLAGS}'
- WML_LIBS="$WML_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_wml_builtin" == "yes"; then
-+if test "$enable_wml_builtin" = "yes"; then
- 	WML_CFLAGS="$WML_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -21158,10 +21158,10 @@
- 	fi
- fi
- 
--if test "$enable_command" == "yes" || \
--   test "$command_deps" == "yes"; then
-+if test "$enable_command" = "yes" || \
-+   test "$command_deps" = "yes"; then
- 
--if test "$enable_command_builtin" == "yes"; then
-+if test "$enable_command_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: command plugin: static linking not supported" >&5
- $as_echo "$as_me: error: command plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -21179,7 +21179,7 @@
-         COMMAND_LIBS="-lreadline -lhistory $COMMAND_LIBS"
- fi
- 
--test "$enable_command" == "auto" && PLUGINS="$PLUGINS command"
-+test "$enable_command" = "auto" && PLUGINS="$PLUGINS command"
- 
- COMMAND_CFLAGS="$COMMAND_CFLAGS "'${PLUGIN_CFLAGS}'
- COMMAND_LIBS="$COMMAND_LIBS "'${PLUGIN_LIBS}'
-@@ -21195,12 +21195,12 @@
- 
- if test "$enable_freetranslation" != ""; then
- 
--test "$enable_freetranslation" == "auto" && PLUGINS="$PLUGINS freetranslation"
-+test "$enable_freetranslation" = "auto" && PLUGINS="$PLUGINS freetranslation"
- 
- FREETRANSLATION_CFLAGS="$FREETRANSLATION_CFLAGS "'${PLUGIN_CFLAGS}'
- FREETRANSLATION_LIBS="$FREETRANSLATION_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_freetranslation_builtin" == "yes"; then
-+if test "$enable_freetranslation_builtin" = "yes"; then
- 	FREETRANSLATION_CFLAGS="$FREETRANSLATION_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -21226,15 +21226,15 @@
- 
- else
- 
--	test "$enable_kword" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: kword plugin: dependencies not satisfied - $kword_pkgs" >&5
-+	test "$enable_kword" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: kword plugin: dependencies not satisfied - $kword_pkgs" >&5
- $as_echo "$as_me: WARNING: kword plugin: dependencies not satisfied - $kword_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_kword" == "yes" || \
--   test "$kword_deps" == "yes"; then
-+if test "$enable_kword" = "yes" || \
-+   test "$kword_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -21346,7 +21346,7 @@
- 	:
- fi
- 
--test "$enable_kword" == "auto" && PLUGINS="$PLUGINS kword"
-+test "$enable_kword" = "auto" && PLUGINS="$PLUGINS kword"
- 
- KWORD_CFLAGS="$KWORD_CFLAGS "'${PLUGIN_CFLAGS}'
- KWORD_LIBS="$KWORD_LIBS "'${PLUGIN_LIBS}'
-@@ -21366,12 +21366,12 @@
- 
- if test "$enable_iscii" != ""; then
- 
--test "$enable_iscii" == "auto" && PLUGINS="$PLUGINS iscii"
-+test "$enable_iscii" = "auto" && PLUGINS="$PLUGINS iscii"
- 
- ISCII_CFLAGS="$ISCII_CFLAGS "'${PLUGIN_CFLAGS}'
- ISCII_LIBS="$ISCII_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_iscii_builtin" == "yes"; then
-+if test "$enable_iscii_builtin" = "yes"; then
- 	ISCII_CFLAGS="$ISCII_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -21386,12 +21386,12 @@
- 
- if test "$enable_s5" != ""; then
- 
--test "$enable_s5" == "auto" && PLUGINS="$PLUGINS s5"
-+test "$enable_s5" = "auto" && PLUGINS="$PLUGINS s5"
- 
- S5_CFLAGS="$S5_CFLAGS "'${PLUGIN_CFLAGS}'
- S5_LIBS="$S5_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_s5_builtin" == "yes"; then
-+if test "$enable_s5_builtin" = "yes"; then
- 	S5_CFLAGS="$S5_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -21406,12 +21406,12 @@
- 
- if test "$enable_babelfish" != ""; then
- 
--test "$enable_babelfish" == "auto" && PLUGINS="$PLUGINS babelfish"
-+test "$enable_babelfish" = "auto" && PLUGINS="$PLUGINS babelfish"
- 
- BABELFISH_CFLAGS="$BABELFISH_CFLAGS "'${PLUGIN_CFLAGS}'
- BABELFISH_LIBS="$BABELFISH_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_babelfish_builtin" == "yes"; then
-+if test "$enable_babelfish_builtin" = "yes"; then
- 	BABELFISH_CFLAGS="$BABELFISH_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -21437,15 +21437,15 @@
- 
- else
- 
--	test "$enable_hancom" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: hancom plugin: dependencies not satisfied - $hancom_pkgs" >&5
-+	test "$enable_hancom" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: hancom plugin: dependencies not satisfied - $hancom_pkgs" >&5
- $as_echo "$as_me: WARNING: hancom plugin: dependencies not satisfied - $hancom_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_hancom" == "yes" || \
--   test "$hancom_deps" == "yes"; then
-+if test "$enable_hancom" = "yes" || \
-+   test "$hancom_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -21557,12 +21557,12 @@
- 	:
- fi
- 
--test "$enable_hancom" == "auto" && PLUGINS="$PLUGINS hancom"
-+test "$enable_hancom" = "auto" && PLUGINS="$PLUGINS hancom"
- 
- HANCOM_CFLAGS="$HANCOM_CFLAGS "'${PLUGIN_CFLAGS}'
- HANCOM_LIBS="$HANCOM_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_hancom_builtin" == "yes"; then
-+if test "$enable_hancom_builtin" = "yes"; then
- 	HANCOM_CFLAGS="$HANCOM_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -21598,14 +21598,14 @@
- 
- 	{ $as_echo "$as_me:$LINENO: checking for gtk toolkit" >&5
- $as_echo_n "checking for gtk toolkit... " >&6; }
--	if test "$TOOLKIT" == "gtk"; then
-+	if test "$TOOLKIT" = "gtk"; then
- 	  { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 	  goffice_deps="yes"
- 	else
- 	  { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
--	  if test "$enable_goffice" == "auto"; then
-+	  if test "$enable_goffice" = "auto"; then
- 	    { $as_echo "$as_me:$LINENO: WARNING: goffice plugin: only supported with gtk" >&5
- $as_echo "$as_me: WARNING: goffice plugin: only supported with gtk" >&2;}
- 	  else
-@@ -21617,17 +21617,17 @@
- 
- else
- 
--	test "$enable_goffice" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: goffice plugin: dependencies not satisfied - $goffice_pkgs" >&5
-+	test "$enable_goffice" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: goffice plugin: dependencies not satisfied - $goffice_pkgs" >&5
- $as_echo "$as_me: WARNING: goffice plugin: dependencies not satisfied - $goffice_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_goffice" == "yes" || \
--   test "$goffice_deps" == "yes"; then
-+if test "$enable_goffice" = "yes" || \
-+   test "$goffice_deps" = "yes"; then
- 
--if test "$enable_goffice_builtin" == "yes"; then
-+if test "$enable_goffice_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: goffice plugin: static linking not supported" >&5
- $as_echo "$as_me: error: goffice plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -21743,7 +21743,7 @@
- 	:
- fi
- 
--test "$enable_goffice" == "auto" && PLUGINS="$PLUGINS goffice"
-+test "$enable_goffice" = "auto" && PLUGINS="$PLUGINS goffice"
- 
- GOFFICE_CFLAGS="$GOFFICE_CFLAGS "'${PLUGIN_CFLAGS}'
- GOFFICE_LIBS="$GOFFICE_LIBS "'${PLUGIN_LIBS}'
-@@ -21801,19 +21801,19 @@
- 
- else
- 
--	test "$enable_mht" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: mht plugin: dependencies not satisfied - $mht_pkgs" >&5
-+	test "$enable_mht" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: mht plugin: dependencies not satisfied - $mht_pkgs" >&5
- $as_echo "$as_me: WARNING: mht plugin: dependencies not satisfied - $mht_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_mht" == "yes" || \
--   test "$mht_deps" == "yes"; then
-+if test "$enable_mht" = "yes" || \
-+   test "$mht_deps" = "yes"; then
- 
--test "$enable_mht" == "auto" && PLUGINS="$PLUGINS mht"
-+test "$enable_mht" = "auto" && PLUGINS="$PLUGINS mht"
- 
--if test "$enable_mht_builtin" == "yes"; then
-+if test "$enable_mht_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: mht plugin: static linking not supported" >&5
- $as_echo "$as_me: error: mht plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -22143,27 +22143,27 @@
- # Settings
- #
- 
--if test "$mht_cv_inter7eps" == "yes" &&
--   test "$inter7eps_found" == "no"; then
-+if test "$mht_cv_inter7eps" = "yes" &&
-+   test "$inter7eps_found" = "no"; then
- 	{ { $as_echo "$as_me:$LINENO: error: MHT plugin: error - inter7 EPS headers not found" >&5
- $as_echo "$as_me: error: MHT plugin: error - inter7 EPS headers not found" >&2;}
-    { (exit 1); exit 1; }; }
--elif test "$mht_cv_inter7eps" == "auto"; then
-+elif test "$mht_cv_inter7eps" = "auto"; then
- 	mht_cv_inter7eps="$inter7eps_found"
- fi
--if test "$mht_cv_inter7eps" == "yes"; then
-+if test "$mht_cv_inter7eps" = "yes"; then
- 	MHT_OPT_LIBS="$MHT_OPT_LIBS -leps"
- fi
- 
--if test "$mht_cv_libtidy" == "yes" &&
--   test "$libtidy_found" == "no"; then
-+if test "$mht_cv_libtidy" = "yes" &&
-+   test "$libtidy_found" = "no"; then
- 	{ { $as_echo "$as_me:$LINENO: error: MHT plugin: error - libtidy headers not found" >&5
- $as_echo "$as_me: error: MHT plugin: error - libtidy headers not found" >&2;}
-    { (exit 1); exit 1; }; }
--elif test "$mht_cv_libtidy" == "auto"; then
-+elif test "$mht_cv_libtidy" = "auto"; then
- 	mht_cv_libtidy="$libtidy_found"
- fi
--if test "$mht_cv_libtidy" == "yes"; then
-+if test "$mht_cv_libtidy" = "yes"; then
- 	MHT_OPT_LIBS="$MHT_OPT_LIBS -ltidy"
- fi
- 
-@@ -22294,7 +22294,7 @@
-   ABI_XHTML_XML2_FALSE=
- fi
- 
-- if test "$mht_cv_inter7eps" == "yes"; then
-+ if test "$mht_cv_inter7eps" = "yes"; then
-   ABI_XHTML_MHT_TRUE=
-   ABI_XHTML_MHT_FALSE='#'
- else
-@@ -22302,7 +22302,7 @@
-   ABI_XHTML_MHT_FALSE=
- fi
- 
-- if test "$mht_cv_libtidy" == "yes"; then
-+ if test "$mht_cv_libtidy" = "yes"; then
-   ABI_XHTML_TIDY_TRUE=
-   ABI_XHTML_TIDY_FALSE='#'
- else
-@@ -22328,15 +22328,15 @@
- 
- else
- 
--	test "$enable_openwriter" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: openwriter plugin: dependencies not satisfied - $openwriter_pkgs" >&5
-+	test "$enable_openwriter" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: openwriter plugin: dependencies not satisfied - $openwriter_pkgs" >&5
- $as_echo "$as_me: WARNING: openwriter plugin: dependencies not satisfied - $openwriter_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_openwriter" == "yes" || \
--   test "$openwriter_deps" == "yes"; then
-+if test "$enable_openwriter" = "yes" || \
-+   test "$openwriter_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -22448,12 +22448,12 @@
- 	:
- fi
- 
--test "$enable_openwriter" == "auto" && PLUGINS="$PLUGINS openwriter"
-+test "$enable_openwriter" = "auto" && PLUGINS="$PLUGINS openwriter"
- 
- OPENWRITER_CFLAGS="$OPENWRITER_CFLAGS "'${PLUGIN_CFLAGS}'
- OPENWRITER_LIBS="$OPENWRITER_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_openwriter_builtin" == "yes"; then
-+if test "$enable_openwriter_builtin" = "yes"; then
- 	OPENWRITER_CFLAGS="$OPENWRITER_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -22479,19 +22479,19 @@
- 
- else
- 
--	test "$enable_ots" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: ots plugin: dependencies not satisfied - $ots_pkgs" >&5
-+	test "$enable_ots" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: ots plugin: dependencies not satisfied - $ots_pkgs" >&5
- $as_echo "$as_me: WARNING: ots plugin: dependencies not satisfied - $ots_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_ots" == "yes" || \
--   test "$ots_deps" == "yes"; then
-+if test "$enable_ots" = "yes" || \
-+   test "$ots_deps" = "yes"; then
- 
--test "$enable_ots" == "auto" && PLUGINS="$PLUGINS ots"
-+test "$enable_ots" = "auto" && PLUGINS="$PLUGINS ots"
- 
--if test "$enable_ots_builtin" == "yes"; then
-+if test "$enable_ots_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: ots plugin: static linking not supported" >&5
- $as_echo "$as_me: error: ots plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -22621,12 +22621,12 @@
- 
- if test "$enable_opml" != ""; then
- 
--test "$enable_opml" == "auto" && PLUGINS="$PLUGINS opml"
-+test "$enable_opml" = "auto" && PLUGINS="$PLUGINS opml"
- 
- OPML_CFLAGS="$OPML_CFLAGS "'${PLUGIN_CFLAGS}'
- OPML_LIBS="$OPML_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_opml_builtin" == "yes"; then
-+if test "$enable_opml_builtin" = "yes"; then
- 	OPML_CFLAGS="$OPML_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -22655,15 +22655,15 @@
- 
- else
- 
--	test "$enable_pdf" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdf plugin: dependencies not satisfied - $pdf_pkgs" >&5
-+	test "$enable_pdf" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdf plugin: dependencies not satisfied - $pdf_pkgs" >&5
- $as_echo "$as_me: WARNING: pdf plugin: dependencies not satisfied - $pdf_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_pdf" == "yes" || \
--   test "$pdf_deps" == "yes"; then
-+if test "$enable_pdf" = "yes" || \
-+   test "$pdf_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -22775,12 +22775,12 @@
- 	:
- fi
- 
--test "$enable_pdf" == "auto" && PLUGINS="$PLUGINS pdf"
-+test "$enable_pdf" = "auto" && PLUGINS="$PLUGINS pdf"
- 
- PDF_CFLAGS="$PDF_CFLAGS "'${PLUGIN_CFLAGS}'
- PDF_LIBS="$PDF_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_pdf_builtin" == "yes"; then
-+if test "$enable_pdf_builtin" = "yes"; then
- 	PDF_CFLAGS="$PDF_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -22825,7 +22825,7 @@
- 
- fi
- 
--test "$enable_collab_backend_telepathy" == "yes" && collab_pkgs="$collab_pkgs $collab_telepathy_req"
-+test "$enable_collab_backend_telepathy" = "yes" && collab_pkgs="$collab_pkgs $collab_telepathy_req"
- { $as_echo "$as_me:$LINENO: checking for collab telepathy backend" >&5
- $as_echo_n "checking for collab telepathy backend... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_telepathy" >&5
-@@ -22852,7 +22852,7 @@
- 
- fi
- 
--test "$enable_collab_backend_xmpp" == "yes" && collab_pkgs="$collab_pkgs $collab_xmpp_req"
-+test "$enable_collab_backend_xmpp" = "yes" && collab_pkgs="$collab_pkgs $collab_xmpp_req"
- { $as_echo "$as_me:$LINENO: checking for collab xmpp backend" >&5
- $as_echo_n "checking for collab xmpp backend... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_xmpp" >&5
-@@ -23227,7 +23227,7 @@
- 
- fi
- 
--test "$enable_collab_backend_sugar" == "yes" && collab_pkgs="$collab_pkgs $collab_sugar_req"
-+test "$enable_collab_backend_sugar" = "yes" && collab_pkgs="$collab_pkgs $collab_sugar_req"
- { $as_echo "$as_me:$LINENO: checking for collab sugar backend" >&5
- $as_echo_n "checking for collab sugar backend... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_sugar" >&5
-@@ -23577,7 +23577,7 @@
- 
- fi
- 
--test "$enable_collab_backend_service" == "yes" && collab_pkgs="$collab_pkgs $collab_service_req"
-+test "$enable_collab_backend_service" = "yes" && collab_pkgs="$collab_pkgs $collab_service_req"
- { $as_echo "$as_me:$LINENO: checking for collab service backend" >&5
- $as_echo_n "checking for collab service backend... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_service" >&5
-@@ -23616,17 +23616,17 @@
- 
- fi
- 
--if test "$enable_collab" == "yes" || \
--   test "$collab_deps" == "yes"; then
-+if test "$enable_collab" = "yes" || \
-+   test "$collab_deps" = "yes"; then
- 
--if test "$enable_collab_builtin" == "yes"; then
-+if test "$enable_collab_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: collab plugin: static linking not supported" >&5
- $as_echo "$as_me: error: collab plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- # HACK, no way to detect, check only if explicitely enabled
--if test "$enable_collab" == "yes"; then
-+if test "$enable_collab" = "yes"; then
- # check for various boost libs, needs to be done before
- 
- 
-@@ -24014,48 +24014,48 @@
- 	:
- fi
- 
--if test "$enable_collab_backend_fake" == "yes"; then
-+if test "$enable_collab_backend_fake" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_FAKE"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_FAKE"
- fi
--if test "$enable_collab_backend_telepathy" == "yes"; then
-+if test "$enable_collab_backend_telepathy" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_TELEPATHY"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_TELEPATHY"
- fi
--if test "$enable_collab_backend_xmpp" == "yes"; then
-+if test "$enable_collab_backend_xmpp" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_XMPP"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_XMPP"
- fi
--if test "$enable_collab_backend_tcp" == "yes"; then
-+if test "$enable_collab_backend_tcp" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_TCP"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_TCP"
- fi
--if test "$enable_collab_backend_sugar" == "yes"; then
-+if test "$enable_collab_backend_sugar" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SUGAR"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SUGAR"
- fi
--if test "$enable_collab_backend_service" == "yes"; then
-+if test "$enable_collab_backend_service" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SERVICE"
- fi
--if test "$enable_collab_record_always" == "yes"; then
-+if test "$enable_collab_record_always" = "yes"; then
- 	COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_RECORD_ALWAYS"
- 	COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_RECORD_ALWAYS"
- fi
- 
--if test "$enable_collab_backend_tcp" == "yes" || \
--   test "$enable_collab_backend_service" == "yes"; then
--	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread"
-+if test "$enable_collab_backend_tcp" = "yes" || \
-+   test "$enable_collab_backend_service" = "yes"; then
-+	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -pthread"
- fi
- 
--test "$enable_collab" == "auto" && PLUGINS="$PLUGINS collab"
-+test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"
- 
- COLLAB_CFLAGS="$COLLAB_CFLAGS "'${PLUGIN_CFLAGS}'
- COLLAB_LIBS="$COLLAB_LIBS "'${PLUGIN_LIBS}'
- 
- fi # plugin conditional
- 
-- if test "$enable_collab_backend_fake" == "yes"; then
-+ if test "$enable_collab_backend_fake" = "yes"; then
-   COLLAB_BACKEND_FAKE_TRUE=
-   COLLAB_BACKEND_FAKE_FALSE='#'
- else
-@@ -24063,7 +24063,7 @@
-   COLLAB_BACKEND_FAKE_FALSE=
- fi
- 
-- if test "$enable_collab_backend_telepathy" == "yes"; then
-+ if test "$enable_collab_backend_telepathy" = "yes"; then
-   COLLAB_BACKEND_TELEPATHY_TRUE=
-   COLLAB_BACKEND_TELEPATHY_FALSE='#'
- else
-@@ -24071,7 +24071,7 @@
-   COLLAB_BACKEND_TELEPATHY_FALSE=
- fi
- 
-- if test "$enable_collab_backend_xmpp" == "yes"; then
-+ if test "$enable_collab_backend_xmpp" = "yes"; then
-   COLLAB_BACKEND_XMPP_TRUE=
-   COLLAB_BACKEND_XMPP_FALSE='#'
- else
-@@ -24079,7 +24079,7 @@
-   COLLAB_BACKEND_XMPP_FALSE=
- fi
- 
-- if test "$enable_collab_backend_tcp" == "yes"; then
-+ if test "$enable_collab_backend_tcp" = "yes"; then
-   COLLAB_BACKEND_TCP_TRUE=
-   COLLAB_BACKEND_TCP_FALSE='#'
- else
-@@ -24087,7 +24087,7 @@
-   COLLAB_BACKEND_TCP_FALSE=
- fi
- 
-- if test "$enable_collab_backend_sugar" == "yes"; then
-+ if test "$enable_collab_backend_sugar" = "yes"; then
-   COLLAB_BACKEND_SUGAR_TRUE=
-   COLLAB_BACKEND_SUGAR_FALSE='#'
- else
-@@ -24095,7 +24095,7 @@
-   COLLAB_BACKEND_SUGAR_FALSE=
- fi
- 
-- if test "$enable_collab_backend_service" == "yes"; then
-+ if test "$enable_collab_backend_service" = "yes"; then
-   COLLAB_BACKEND_SERVICE_TRUE=
-   COLLAB_BACKEND_SERVICE_FALSE='#'
- else
-@@ -24103,7 +24103,7 @@
-   COLLAB_BACKEND_SERVICE_FALSE=
- fi
- 
-- if test "$enable_collab_record_always" == "yes"; then
-+ if test "$enable_collab_record_always" = "yes"; then
-   COLLAB_RECORD_ALWAYS_TRUE=
-   COLLAB_RECORD_ALWAYS_FALSE='#'
- else
-@@ -24122,10 +24122,10 @@
- 
- if test "$enable_paint" != ""; then
- 
--test "$enable_paint" == "auto" && PLUGINS="$PLUGINS paint"
-+test "$enable_paint" = "auto" && PLUGINS="$PLUGINS paint"
- 
- # TODO check for libpng
--if test "$TOOLKIT" == "win"; then
-+if test "$TOOLKIT" = "win"; then
- 	PAINT_LIBS="-lgdi32 $PNG_LIBS"
- 	PAINT_CFLAGS="$PAINT_CFLAGS $PNG_CFLAGS"
- fi
-@@ -24133,7 +24133,7 @@
- PAINT_CFLAGS="$PAINT_CFLAGS "'${PLUGIN_CFLAGS}'
- PAINT_LIBS="$PAINT_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_paint_builtin" == "yes"; then
-+if test "$enable_paint_builtin" = "yes"; then
- 	PAINT_CFLAGS="$PAINT_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -24242,8 +24242,8 @@
- 
- if test "$enable_wmf" != ""; then
- 
--	if test "$libwmfconfig" == ""; then
--		if test "$enable_wmf" == "yes"; then
-+	if test "$libwmfconfig" = ""; then
-+		if test "$enable_wmf" = "yes"; then
- 		  { { $as_echo "$as_me:$LINENO: error: wmf plugin: program libwmf-config not found in path" >&5
- $as_echo "$as_me: error: wmf plugin: program libwmf-config not found in path" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -24272,10 +24272,10 @@
- 	fi
- fi
- 
--if test "$enable_wmf" == "yes" || \
--   test "$wmf_deps" == "yes"; then
-+if test "$enable_wmf" = "yes" || \
-+   test "$wmf_deps" = "yes"; then
- 
--if test "$enable_wmf_builtin" == "yes"; then
-+if test "$enable_wmf_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: wmf plugin: static linking not supported" >&5
- $as_echo "$as_me: error: wmf plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -24283,7 +24283,7 @@
- 
- { $as_echo "$as_me:$LINENO: checking for libwmf >= ${libwmf_major_req}.${libwmf_minor_req}.${libwmf_micro_req}" >&5
- $as_echo_n "checking for libwmf >= ${libwmf_major_req}.${libwmf_minor_req}.${libwmf_micro_req}... " >&6; }
--if test "$wmf_deps" == "yes"; then
-+if test "$wmf_deps" = "yes"; then
- 	{ $as_echo "$as_me:$LINENO: result: version ${libwmf_major_found}.${libwmf_minor_found}.${libwmf_micro_found} (ok)" >&5
- $as_echo "version ${libwmf_major_found}.${libwmf_minor_found}.${libwmf_micro_found} (ok)" >&6; }
- 	WMF_CFLAGS=`$libwmfconfig --cflags`
-@@ -24294,7 +24294,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--test "$enable_wmf" == "auto" && PLUGINS="$PLUGINS wmf"
-+test "$enable_wmf" = "auto" && PLUGINS="$PLUGINS wmf"
- 
- WMF_CFLAGS="$WMF_CFLAGS "'${PLUGIN_CFLAGS}'
- WMF_LIBS="$WMF_LIBS "'${PLUGIN_LIBS}'
-@@ -24321,15 +24321,15 @@
- 
- else
- 
--	test "$enable_loadbindings" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: loadbindings plugin: dependencies not satisfied - $loadbindings_pkgs" >&5
-+	test "$enable_loadbindings" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: loadbindings plugin: dependencies not satisfied - $loadbindings_pkgs" >&5
- $as_echo "$as_me: WARNING: loadbindings plugin: dependencies not satisfied - $loadbindings_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_loadbindings" == "yes" || \
--   test "$loadbindings_deps" == "yes"; then
-+if test "$enable_loadbindings" = "yes" || \
-+   test "$loadbindings_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -24441,12 +24441,12 @@
- 	:
- fi
- 
--test "$enable_loadbindings" == "auto" && PLUGINS="$PLUGINS loadbindings"
-+test "$enable_loadbindings" = "auto" && PLUGINS="$PLUGINS loadbindings"
- 
- LOADBINDINGS_CFLAGS="$LOADBINDINGS_CFLAGS "'${PLUGIN_CFLAGS}'
- LOADBINDINGS_LIBS="$LOADBINDINGS_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_loadbindings_builtin" == "yes"; then
-+if test "$enable_loadbindings_builtin" = "yes"; then
- 	LOADBINDINGS_CFLAGS="$LOADBINDINGS_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -24472,17 +24472,17 @@
- 
- else
- 
--	test "$enable_wpg" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: wpg plugin: dependencies not satisfied - $wpg_pkgs" >&5
-+	test "$enable_wpg" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: wpg plugin: dependencies not satisfied - $wpg_pkgs" >&5
- $as_echo "$as_me: WARNING: wpg plugin: dependencies not satisfied - $wpg_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_wpg" == "yes" || \
--   test "$wpg_deps" == "yes"; then
-+if test "$enable_wpg" = "yes" || \
-+   test "$wpg_deps" = "yes"; then
- 
--if test "$enable_wpg_builtin" == "yes"; then
-+if test "$enable_wpg_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: wpg plugin: static linking not supported" >&5
- $as_echo "$as_me: error: wpg plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -24598,7 +24598,7 @@
- 	:
- fi
- 
--test "$enable_wpg" == "auto" && PLUGINS="$PLUGINS wpg"
-+test "$enable_wpg" = "auto" && PLUGINS="$PLUGINS wpg"
- 
- WPG_CFLAGS="$WPG_CFLAGS "'${PLUGIN_CFLAGS}'
- WPG_LIBS="$WPG_LIBS "'${PLUGIN_LIBS}'
-@@ -24625,15 +24625,15 @@
- 
- else
- 
--	test "$enable_mswrite" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: mswrite plugin: dependencies not satisfied - $mswrite_pkgs" >&5
-+	test "$enable_mswrite" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: mswrite plugin: dependencies not satisfied - $mswrite_pkgs" >&5
- $as_echo "$as_me: WARNING: mswrite plugin: dependencies not satisfied - $mswrite_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_mswrite" == "yes" || \
--   test "$mswrite_deps" == "yes"; then
-+if test "$enable_mswrite" = "yes" || \
-+   test "$mswrite_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -24745,12 +24745,12 @@
- 	:
- fi
- 
--test "$enable_mswrite" == "auto" && PLUGINS="$PLUGINS mswrite"
-+test "$enable_mswrite" = "auto" && PLUGINS="$PLUGINS mswrite"
- 
- MSWRITE_CFLAGS="$MSWRITE_CFLAGS "'${PLUGIN_CFLAGS}'
- MSWRITE_LIBS="$MSWRITE_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_mswrite_builtin" == "yes"; then
-+if test "$enable_mswrite_builtin" = "yes"; then
- 	MSWRITE_CFLAGS="$MSWRITE_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -24763,9 +24763,9 @@
- rsvg_pkgs="librsvg-2.0 >= 2.0 glib-2.0"
- rsvg_deps="no"
- 
--if test "$TOOLKIT" == "gtk"; then
-+if test "$TOOLKIT" = "gtk"; then
- 
-- if test "$enable_rsvg" == "auto"; then
-+ if test "$enable_rsvg" = "auto"; then
-    { $as_echo "$as_me:$LINENO: WARNING: rsvg plugin: not needed with gtk" >&5
- $as_echo "$as_me: WARNING: rsvg plugin: not needed with gtk" >&2;}
-  fi
-@@ -24785,17 +24785,17 @@
- 
- else
- 
--	test "$enable_rsvg" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: rsvg plugin: dependencies not satisfied - $rsvg_pkgs" >&5
-+	test "$enable_rsvg" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: rsvg plugin: dependencies not satisfied - $rsvg_pkgs" >&5
- $as_echo "$as_me: WARNING: rsvg plugin: dependencies not satisfied - $rsvg_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_rsvg" == "yes" || \
--   test "$rsvg_deps" == "yes"; then
-+if test "$enable_rsvg" = "yes" || \
-+   test "$rsvg_deps" = "yes"; then
- 
--if test "$enable_rsvg_builtin" == "yes"; then
-+if test "$enable_rsvg_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: rsvg plugin: static linking not supported" >&5
- $as_echo "$as_me: error: rsvg plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -24911,7 +24911,7 @@
- 	:
- fi
- 
--test "$enable_rsvg" == "auto" && PLUGINS="$PLUGINS rsvg"
-+test "$enable_rsvg" = "auto" && PLUGINS="$PLUGINS rsvg"
- 
- RSVG_CFLAGS="$RSVG_CFLAGS "'${PLUGIN_CFLAGS}'
- RSVG_LIBS="$RSVG_LIBS "'${PLUGIN_LIBS}'
-@@ -24938,15 +24938,15 @@
- 
- else
- 
--	test "$enable_garble" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: garble plugin: dependencies not satisfied - $garble_pkgs" >&5
-+	test "$enable_garble" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: garble plugin: dependencies not satisfied - $garble_pkgs" >&5
- $as_echo "$as_me: WARNING: garble plugin: dependencies not satisfied - $garble_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_garble" == "yes" || \
--   test "$garble_deps" == "yes"; then
-+if test "$enable_garble" = "yes" || \
-+   test "$garble_deps" = "yes"; then
- 
- { $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
- $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-@@ -25121,12 +25121,12 @@
- 	:
- fi
- 
--test "$enable_garble" == "auto" && PLUGINS="$PLUGINS garble"
-+test "$enable_garble" = "auto" && PLUGINS="$PLUGINS garble"
- 
- GARBLE_CFLAGS="$GARBLE_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
- GARBLE_LIBS="$GARBLE_LIBS $PNG_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_garble_builtin" == "yes"; then
-+if test "$enable_garble_builtin" = "yes"; then
- 	GARBLE_CFLAGS="$GARBLE_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -25155,7 +25155,7 @@
- 	abi_cv_libxslt="no"
- 
- fi
-- if test "$abi_cv_libxslt" == "yes"; then
-+ if test "$abi_cv_libxslt" = "yes"; then
-   HAVE_LIBXSLT_TRUE=
-   HAVE_LIBXSLT_FALSE='#'
- else
-@@ -25166,9 +25166,9 @@
- 
- if test "$enable_latex" != ""; then
- 
--test "$enable_latex" == "auto" && PLUGINS="$PLUGINS latex"
-+test "$enable_latex" = "auto" && PLUGINS="$PLUGINS latex"
- 
--if test "$abi_cv_libxslt" == "yes"; then
-+if test "$abi_cv_libxslt" = "yes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for LIBXSLT" >&5
-@@ -25398,7 +25398,7 @@
- LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}'
- LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_latex_builtin" == "yes"; then
-+if test "$enable_latex_builtin" = "yes"; then
- 	LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -25424,15 +25424,15 @@
- 
- else
- 
--	test "$enable_pdb" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdb plugin: dependencies not satisfied - $pdb_pkgs" >&5
-+	test "$enable_pdb" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdb plugin: dependencies not satisfied - $pdb_pkgs" >&5
- $as_echo "$as_me: WARNING: pdb plugin: dependencies not satisfied - $pdb_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_pdb" == "yes" || \
--   test "$pdb_deps" == "yes"; then
-+if test "$enable_pdb" = "yes" || \
-+   test "$pdb_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -25544,12 +25544,12 @@
- 	:
- fi
- 
--test "$enable_pdb" == "auto" && PLUGINS="$PLUGINS pdb"
-+test "$enable_pdb" = "auto" && PLUGINS="$PLUGINS pdb"
- 
- PDB_CFLAGS="$PDB_CFLAGS "'${PLUGIN_CFLAGS}'
- PDB_LIBS="$PDB_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_pdb_builtin" == "yes"; then
-+if test "$enable_pdb_builtin" = "yes"; then
- 	PDB_CFLAGS="$PDB_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -25564,12 +25564,12 @@
- 
- if test "$enable_eml" != ""; then
- 
--test "$enable_eml" == "auto" && PLUGINS="$PLUGINS eml"
-+test "$enable_eml" = "auto" && PLUGINS="$PLUGINS eml"
- 
- EML_CFLAGS="$EML_CFLAGS "'${PLUGIN_CFLAGS}'
- EML_LIBS="$EML_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_eml_builtin" == "yes"; then
-+if test "$enable_eml_builtin" = "yes"; then
- 	EML_CFLAGS="$EML_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -25600,17 +25600,17 @@
- 
- else
- 
--	test "$enable_wordperfect" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: wordperfect plugin: dependencies not satisfied - $wordperfect_pkgs" >&5
-+	test "$enable_wordperfect" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: wordperfect plugin: dependencies not satisfied - $wordperfect_pkgs" >&5
- $as_echo "$as_me: WARNING: wordperfect plugin: dependencies not satisfied - $wordperfect_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_wordperfect" == "yes" || \
--   test "$wordperfect_deps" == "yes"; then
-+if test "$enable_wordperfect" = "yes" || \
-+   test "$wordperfect_deps" = "yes"; then
- 
--if test "$enable_wordperfect_builtin" == "yes"; then
-+if test "$enable_wordperfect_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: wordperfect plugin: static linking not supported" >&5
- $as_echo "$as_me: error: wordperfect plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -25740,7 +25740,7 @@
- 	:
- fi
- 
--test "$enable_wordperfect" == "auto" && PLUGINS="$PLUGINS wordperfect"
-+test "$enable_wordperfect" = "auto" && PLUGINS="$PLUGINS wordperfect"
- 
- WORDPERFECT_CFLAGS="$WORDPERFECT_CFLAGS "'${PLUGIN_CFLAGS}'"$WPS_DEFINE"
- WORDPERFECT_LIBS="$WORDPERFECT_LIBS "'${PLUGIN_LIBS}'
-@@ -25756,12 +25756,12 @@
- 
- if test "$enable_wikipedia" != ""; then
- 
--test "$enable_wikipedia" == "auto" && PLUGINS="$PLUGINS wikipedia"
-+test "$enable_wikipedia" = "auto" && PLUGINS="$PLUGINS wikipedia"
- 
- WIKIPEDIA_CFLAGS="$WIKIPEDIA_CFLAGS "'${PLUGIN_CFLAGS}'
- WIKIPEDIA_LIBS="$WIKIPEDIA_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_wikipedia_builtin" == "yes"; then
-+if test "$enable_wikipedia_builtin" = "yes"; then
- 	WIKIPEDIA_CFLAGS="$WIKIPEDIA_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -25785,14 +25785,14 @@
- 
- 	{ $as_echo "$as_me:$LINENO: checking for gtk toolkit" >&5
- $as_echo_n "checking for gtk toolkit... " >&6; }
--	if test "$TOOLKIT" == "gtk"; then
-+	if test "$TOOLKIT" = "gtk"; then
- 	  { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 	  gda_deps="yes"
- 	else
- 	  { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
--	  if test "$enable_gda" == "auto"; then
-+	  if test "$enable_gda" = "auto"; then
- 	    { $as_echo "$as_me:$LINENO: WARNING: gda plugin: only supported with gtk" >&5
- $as_echo "$as_me: WARNING: gda plugin: only supported with gtk" >&2;}
- 	  else
-@@ -25804,17 +25804,17 @@
- 
- else
- 
--	test "$enable_gda" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: gda plugin: dependencies not satisfied - $gda_pkgs" >&5
-+	test "$enable_gda" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: gda plugin: dependencies not satisfied - $gda_pkgs" >&5
- $as_echo "$as_me: WARNING: gda plugin: dependencies not satisfied - $gda_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_gda" == "yes" || \
--   test "$gda_deps" == "yes"; then
-+if test "$enable_gda" = "yes" || \
-+   test "$gda_deps" = "yes"; then
- 
--if test "$enable_gda_builtin" == "yes"; then
-+if test "$enable_gda_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: gda plugin: static linking not supported" >&5
- $as_echo "$as_me: error: gda plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -25930,7 +25930,7 @@
- 	:
- fi
- 
--test "$enable_gda" == "auto" && PLUGINS="$PLUGINS gda"
-+test "$enable_gda" = "auto" && PLUGINS="$PLUGINS gda"
- 
- GDA_CFLAGS="$GDA_CFLAGS "'${PLUGIN_CFLAGS}'
- GDA_LIBS="$GDA_LIBS "'${PLUGIN_LIBS}'
-@@ -25954,7 +25954,7 @@
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 
--	if test "$TOOLKIT" == "gtk"; then
-+	if test "$TOOLKIT" = "gtk"; then
- 	if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$aiksaurus_gtk_pkgs \"") >&5
-   ($PKG_CONFIG --exists --print-errors " $aiksaurus_gtk_pkgs ") 2>&5
-@@ -25966,7 +25966,7 @@
- 
- else
- 
--		test "$enable_aiksaurus" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_gtk_pkgs" >&5
-+		test "$enable_aiksaurus" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_gtk_pkgs" >&5
- $as_echo "$as_me: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_gtk_pkgs" >&2;}
- 
- fi
-@@ -25976,17 +25976,17 @@
- 
- else
- 
--	test "$enable_aiksaurus" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs" >&5
-+	test "$enable_aiksaurus" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs" >&5
- $as_echo "$as_me: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_aiksaurus" == "yes" || \
--   test "$aiksaurus_deps" == "yes"; then
-+if test "$enable_aiksaurus" = "yes" || \
-+   test "$aiksaurus_deps" = "yes"; then
- 
--if test "$enable_aiksaurus_builtin" == "yes"; then
-+if test "$enable_aiksaurus_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: aiksaurus plugin: static linking not supported" >&5
- $as_echo "$as_me: error: aiksaurus plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -26102,7 +26102,7 @@
- 	:
- fi
- 
--if test "$TOOLKIT" == "gtk"; then
-+if test "$TOOLKIT" = "gtk"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for AIKSAURUS_GTK" >&5
-@@ -26216,7 +26216,7 @@
- 	AIKSAURUS_LIBS="$AIKSAURUS_LIBS $AIKSAURUS_GTK_LIBS"
- fi
- 
--test "$enable_aiksaurus" == "auto" && PLUGINS="$PLUGINS aiksaurus"
-+test "$enable_aiksaurus" = "auto" && PLUGINS="$PLUGINS aiksaurus"
- 
- AIKSAURUS_CFLAGS="$AIKSAURUS_CFLAGS "'${PLUGIN_CFLAGS}'
- AIKSAURUS_LIBS="$AIKSAURUS_LIBS "'${PLUGIN_LIBS}'
-@@ -26243,15 +26243,15 @@
- 
- else
- 
--	test "$enable_applix" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: applix plugin: dependencies not satisfied - $applix_pkgs" >&5
-+	test "$enable_applix" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: applix plugin: dependencies not satisfied - $applix_pkgs" >&5
- $as_echo "$as_me: WARNING: applix plugin: dependencies not satisfied - $applix_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_applix" == "yes" || \
--   test "$applix_deps" == "yes"; then
-+if test "$enable_applix" = "yes" || \
-+   test "$applix_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -26363,12 +26363,12 @@
- 	:
- fi
- 
--test "$enable_applix" == "auto" && PLUGINS="$PLUGINS applix"
-+test "$enable_applix" = "auto" && PLUGINS="$PLUGINS applix"
- 
- APPLIX_CFLAGS="$APPLIX_CFLAGS "'${PLUGIN_CFLAGS}'
- APPLIX_LIBS="$APPLIX_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_applix_builtin" == "yes"; then
-+if test "$enable_applix_builtin" = "yes"; then
- 	APPLIX_CFLAGS="$APPLIX_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -26381,7 +26381,7 @@
- grammar_pkgs='link-grammar >= 4.2.1'
- grammar_deps="no"
- 
--if test "$enable_grammar" != "" && test  "$abi_cv_spell" == "yes"; then
-+if test "$enable_grammar" != "" && test  "$abi_cv_spell" = "yes"; then
- 
- if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$grammar_pkgs \"") >&5
-@@ -26394,17 +26394,17 @@
- 
- else
- 
--	test "$enable_grammar" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: grammar plugin: dependencies not satisfied - $grammar_pkgs" >&5
-+	test "$enable_grammar" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: grammar plugin: dependencies not satisfied - $grammar_pkgs" >&5
- $as_echo "$as_me: WARNING: grammar plugin: dependencies not satisfied - $grammar_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_grammar" == "yes" || \
--   test "$grammar_deps" == "yes"; then
-+if test "$enable_grammar" = "yes" || \
-+   test "$grammar_deps" = "yes"; then
- 
--if test "$enable_grammar_builtin" == "yes"; then
-+if test "$enable_grammar_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: grammar plugin: static linking not supported" >&5
- $as_echo "$as_me: error: grammar plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -26520,7 +26520,7 @@
- 	:
- fi
- 
--test "$enable_grammar" == "auto" && PLUGINS="$PLUGINS grammar"
-+test "$enable_grammar" = "auto" && PLUGINS="$PLUGINS grammar"
- 
- GRAMMAR_CFLAGS="$GRAMMAR_CFLAGS "'${PLUGIN_CFLAGS}'
- GRAMMAR_LIBS="$GRAMMAR_LIBS "'${PLUGIN_LIBS}'
-@@ -26850,17 +26850,17 @@
- 
- else
- 
--	test "$enable_mathview" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: mathview plugin: dependencies not satisfied - $mathview_pkgs" >&5
-+	test "$enable_mathview" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: mathview plugin: dependencies not satisfied - $mathview_pkgs" >&5
- $as_echo "$as_me: WARNING: mathview plugin: dependencies not satisfied - $mathview_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_mathview" == "yes" || \
--   test "$mathview_deps" == "yes"; then
-+if test "$enable_mathview" = "yes" || \
-+   test "$mathview_deps" = "yes"; then
- 
--if test "$enable_mathview_builtin" == "yes"; then
-+if test "$enable_mathview_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: mathview plugin: static linking not supported" >&5
- $as_echo "$as_me: error: mathview plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -26976,7 +26976,7 @@
- 	:
- fi
- 
--test "$enable_mathview" == "auto" && PLUGINS="$PLUGINS mathview"
-+test "$enable_mathview" = "auto" && PLUGINS="$PLUGINS mathview"
- 
- MATHVIEW_CFLAGS="$MATHVIEW_CFLAGS $HASHMAP_CFLAGS "'${PLUGIN_CFLAGS}'
- MATHVIEW_LIBS="$MATHVIEW_LIBS "'${PLUGIN_LIBS}'
-@@ -27258,14 +27258,14 @@
- 
- { $as_echo "$as_me:$LINENO: checking for unix/gtk platform" >&5
- $as_echo_n "checking for unix/gtk platform... " >&6; }
--if test "$TOOLKIT" == "gtk"; then
-+if test "$TOOLKIT" = "gtk"; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-   gdict_deps="yes"
- else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
--  if test "$enable_gdict" == "auto"; then
-+  if test "$enable_gdict" = "auto"; then
-     { $as_echo "$as_me:$LINENO: WARNING: gdict plugin: only supported on UNIX/gtk platforms" >&5
- $as_echo "$as_me: WARNING: gdict plugin: only supported on UNIX/gtk platforms" >&2;}
-   else
-@@ -27277,8 +27277,8 @@
- 
- fi
- 
--if test "$enable_gdict" == "yes" || \
--   test "$gdict_deps" == "yes"; then
-+if test "$enable_gdict" = "yes" || \
-+   test "$gdict_deps" = "yes"; then
- 
- { $as_echo "$as_me:$LINENO: checking for pid_t" >&5
- $as_echo_n "checking for pid_t... " >&6; }
-@@ -27385,7 +27385,7 @@
- fi
- 
- 
--test "$enable_gdict" == "auto" && PLUGINS="$PLUGINS gdict"
-+test "$enable_gdict" = "auto" && PLUGINS="$PLUGINS gdict"
- 
- GDICT_CFLAGS="$GDICT_CFLAGS "'${PLUGIN_CFLAGS} -DUSE_FORK_AND_EXEC_METHOD=1'
- GDICT_LIBS='${PLUGIN_LIBS}'
-@@ -27405,12 +27405,12 @@
- 
- if test "$enable_passepartout" != ""; then
- 
--test "$enable_passepartout" == "auto" && PLUGINS="$PLUGINS passepartout"
-+test "$enable_passepartout" = "auto" && PLUGINS="$PLUGINS passepartout"
- 
- PASSEPARTOUT_CFLAGS="$PASSEPARTOUT_CFLAGS "'${PLUGIN_CFLAGS}'
- PASSEPARTOUT_LIBS="$PASSEPARTOUT_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_passepartout_builtin" == "yes"; then
-+if test "$enable_passepartout_builtin" = "yes"; then
- 	PASSEPARTOUT_CFLAGS="$PASSEPARTOUT_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -27436,15 +27436,15 @@
- 
- else
- 
--	test "$enable_xslfo" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: xslfo plugin: dependencies not satisfied - $xslfo_pkgs" >&5
-+	test "$enable_xslfo" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: xslfo plugin: dependencies not satisfied - $xslfo_pkgs" >&5
- $as_echo "$as_me: WARNING: xslfo plugin: dependencies not satisfied - $xslfo_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_xslfo" == "yes" || \
--   test "$xslfo_deps" == "yes"; then
-+if test "$enable_xslfo" = "yes" || \
-+   test "$xslfo_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -27556,12 +27556,12 @@
- 	:
- fi
- 
--test "$enable_xslfo" == "auto" && PLUGINS="$PLUGINS xslfo"
-+test "$enable_xslfo" = "auto" && PLUGINS="$PLUGINS xslfo"
- 
- XSLFO_CFLAGS="$XSLFO_CFLAGS "'${PLUGIN_CFLAGS}'
- XSLFO_LIBS="$XSLFO_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_xslfo_builtin" == "yes"; then
-+if test "$enable_xslfo_builtin" = "yes"; then
- 	XSLFO_CFLAGS="$XSLFO_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -27587,15 +27587,15 @@
- 
- else
- 
--	test "$enable_opendocument" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: opendocument plugin: dependencies not satisfied - $opendocument_pkgs" >&5
-+	test "$enable_opendocument" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: opendocument plugin: dependencies not satisfied - $opendocument_pkgs" >&5
- $as_echo "$as_me: WARNING: opendocument plugin: dependencies not satisfied - $opendocument_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_opendocument" == "yes" || \
--   test "$opendocument_deps" == "yes"; then
-+if test "$enable_opendocument" = "yes" || \
-+   test "$opendocument_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -27707,12 +27707,12 @@
- 	:
- fi
- 
--test "$enable_opendocument" == "auto" && PLUGINS="$PLUGINS opendocument"
-+test "$enable_opendocument" = "auto" && PLUGINS="$PLUGINS opendocument"
- 
- OPENDOCUMENT_CFLAGS="$OPENDOCUMENT_CFLAGS "'${PLUGIN_CFLAGS}'
- OPENDOCUMENT_LIBS="$OPENDOCUMENT_LIBS "'${PLUGIN_LIBS} -lz'
- 
--if test "$enable_opendocument_builtin" == "yes"; then
-+if test "$enable_opendocument_builtin" = "yes"; then
- 	OPENDOCUMENT_CFLAGS="$OPENDOCUMENT_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -27727,12 +27727,12 @@
- 
- if test "$enable_google" != ""; then
- 
--test "$enable_google" == "auto" && PLUGINS="$PLUGINS google"
-+test "$enable_google" = "auto" && PLUGINS="$PLUGINS google"
- 
- GOOGLE_CFLAGS="$GOOGLE_CFLAGS "'${PLUGIN_CFLAGS}'
- GOOGLE_LIBS="$GOOGLE_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_google_builtin" == "yes"; then
-+if test "$enable_google_builtin" = "yes"; then
- 	GOOGLE_CFLAGS="$GOOGLE_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -27758,15 +27758,15 @@
- 
- else
- 
--	test "$enable_sdw" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: sdw plugin: dependencies not satisfied - $sdw_pkgs" >&5
-+	test "$enable_sdw" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: sdw plugin: dependencies not satisfied - $sdw_pkgs" >&5
- $as_echo "$as_me: WARNING: sdw plugin: dependencies not satisfied - $sdw_pkgs" >&2;}
- 
- fi
- 
- fi
- 
--if test "$enable_sdw" == "yes" || \
--   test "$sdw_deps" == "yes"; then
-+if test "$enable_sdw" = "yes" || \
-+   test "$sdw_deps" = "yes"; then
- 
- 
- pkg_failed=no
-@@ -27878,12 +27878,12 @@
- 	:
- fi
- 
--test "$enable_sdw" == "auto" && PLUGINS="$PLUGINS sdw"
-+test "$enable_sdw" = "auto" && PLUGINS="$PLUGINS sdw"
- 
- SDW_CFLAGS="$SDW_CFLAGS "'${PLUGIN_CFLAGS}'
- SDW_LIBS="$SDW_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_sdw_builtin" == "yes"; then
-+if test "$enable_sdw_builtin" = "yes"; then
- 	SDW_CFLAGS="$SDW_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -27898,12 +27898,12 @@
- 
- if test "$enable_presentation" != ""; then
- 
--test "$enable_presentation" == "auto" && PLUGINS="$PLUGINS presentation"
-+test "$enable_presentation" = "auto" && PLUGINS="$PLUGINS presentation"
- 
- PRESENTATION_CFLAGS="$PRESENTATION_CFLAGS "'${PLUGIN_CFLAGS}'
- PRESENTATION_LIBS="$PRESENTATION_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_presentation_builtin" == "yes"; then
-+if test "$enable_presentation_builtin" = "yes"; then
- 	PRESENTATION_CFLAGS="$PRESENTATION_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -27918,12 +27918,12 @@
- 
- if test "$enable_urldict" != ""; then
- 
--test "$enable_urldict" == "auto" && PLUGINS="$PLUGINS urldict"
-+test "$enable_urldict" = "auto" && PLUGINS="$PLUGINS urldict"
- 
- URLDICT_CFLAGS="$URLDICT_CFLAGS "'${PLUGIN_CFLAGS}'
- URLDICT_LIBS="$URLDICT_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_urldict_builtin" == "yes"; then
-+if test "$enable_urldict_builtin" = "yes"; then
- 	URLDICT_CFLAGS="$URLDICT_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -28032,8 +28032,8 @@
- 
- if test "$enable_psion" != ""; then
- 
--	if test "$psiconvconfig" == ""; then
--		if test "$enable_psion" == "yes"; then
-+	if test "$psiconvconfig" = ""; then
-+		if test "$enable_psion" = "yes"; then
- 		  { { $as_echo "$as_me:$LINENO: error: psiconv plugin: program psiconv-config not found in path" >&5
- $as_echo "$as_me: error: psiconv plugin: program psiconv-config not found in path" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -28062,10 +28062,10 @@
- 	fi
- fi
- 
--if test "$enable_psion" == "yes" || \
--   test "$psion_deps" == "yes"; then
-+if test "$enable_psion" = "yes" || \
-+   test "$psion_deps" = "yes"; then
- 
--if test "$enable_psion_builtin" == "yes"; then
-+if test "$enable_psion_builtin" = "yes"; then
- { { $as_echo "$as_me:$LINENO: error: psion plugin: static linking not supported" >&5
- $as_echo "$as_me: error: psion plugin: static linking not supported" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -28073,7 +28073,7 @@
- 
- { $as_echo "$as_me:$LINENO: checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_micro_req}" >&5
- $as_echo_n "checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_micro_req}... " >&6; }
--if test "$psion_deps" == "yes"; then
-+if test "$psion_deps" = "yes"; then
- 	{ $as_echo "$as_me:$LINENO: result: version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_micro_found} (ok)" >&5
- $as_echo "version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_micro_found} (ok)" >&6; }
- 	PSION_CFLAGS=`$psiconvconfig --cflags`
-@@ -28084,7 +28084,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--test "$enable_psion" == "auto" && PLUGINS="$PLUGINS psion"
-+test "$enable_psion" = "auto" && PLUGINS="$PLUGINS psion"
- 
- PSION_CFLAGS="$PSION_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
- PSION_LIBS="$PSION_LIBS $PNG_LIBS -lgsf-1 "'${PLUGIN_LIBS}'
-@@ -28100,12 +28100,12 @@
- 
- if test "$enable_hrtext" != ""; then
- 
--test "$enable_hrtext" == "auto" && PLUGINS="$PLUGINS hrtext"
-+test "$enable_hrtext" = "auto" && PLUGINS="$PLUGINS hrtext"
- 
- HRTEXT_CFLAGS="$HRTEXT_CFLAGS "'${PLUGIN_CFLAGS}'
- HRTEXT_LIBS="$HRTEXT_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_hrtext_builtin" == "yes"; then
-+if test "$enable_hrtext_builtin" = "yes"; then
- 	HRTEXT_CFLAGS="$HRTEXT_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
-@@ -28120,12 +28120,12 @@
- 
- if test "$enable_mif" != ""; then
- 
--test "$enable_mif" == "auto" && PLUGINS="$PLUGINS mif"
-+test "$enable_mif" = "auto" && PLUGINS="$PLUGINS mif"
- 
- MIF_CFLAGS="$MIF_CFLAGS "'${PLUGIN_CFLAGS}'
- MIF_LIBS="$MIF_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_mif_builtin" == "yes"; then
-+if test "$enable_mif_builtin" = "yes"; then
- 	MIF_CFLAGS="$MIF_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
- 
diff --git a/editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp b/editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp
new file mode 100644
index 000000000000..6a86bf685da8
--- /dev/null
+++ b/editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp
@@ -0,0 +1,38 @@
+--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2013-03-25 06:58:03.000000000 +0000
++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp	2013-03-25 07:00:22.000000000 +0000
+@@ -191,7 +191,7 @@
+ 
+ 	/* Clean Up Memory Used */
+ 		
+-	FREEP(m_pPNGInfo->palette);
++	//FREEP(m_pPNGInfo->palette);
+ 	DELETEP(pBB);
+ 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+    
+@@ -313,7 +313,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -332,7 +332,7 @@
+ 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
+ 	{
+ 		/* Reset error handling for libpng */
+-		if (setjmp(m_pPNG->jmpbuf))
++		if (setjmp(png_jmpbuf(m_pPNG)))
+ 		{
+ 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 			return UT_ERROR;
+@@ -372,7 +372,7 @@
+ UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
+ {
+ 	/* Reset error handling for libpng */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 		return UT_ERROR;
diff --git a/editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp b/editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp
new file mode 100644
index 000000000000..29dadf15783f
--- /dev/null
+++ b/editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp
@@ -0,0 +1,11 @@
+--- plugins/garble/xp/abiword-garble-png.cpp.orig	2013-03-25 06:55:41.000000000 +0000
++++ plugins/garble/xp/abiword-garble-png.cpp	2013-03-25 06:56:20.000000000 +0000
+@@ -79,7 +79,7 @@
+ 		png_set_strip_alpha( png_ptr );
+ 		png_set_interlace_handling( png_ptr );
+ 		png_set_bgr( png_ptr );
+-		rowbytes = info_ptr->rowbytes;
++		rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+ 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
+ 	}
+ 
diff --git a/editors/abiword/files/patch-plugins_mathview_itex2mml_itex2MML.y b/editors/abiword/files/patch-plugins_mathview_itex2mml_itex2MML.y
new file mode 100644
index 000000000000..a63c28b90306
--- /dev/null
+++ b/editors/abiword/files/patch-plugins_mathview_itex2mml_itex2MML.y
@@ -0,0 +1,11 @@
+--- plugins/mathview/itex2mml/itex2MML.y.orig	2010-06-08 23:03:23.000000000 +0200
++++ plugins/mathview/itex2mml/itex2MML.y	2010-06-08 23:07:10.000000000 +0200
+@@ -260,7 +260,7 @@
+ 
+  /* Create a hex character reference string corresponding to code
+   */
+- char * itex2MML_character_reference (unsigned long int code)
++ char * itex2MML_character_reference (unsigned int code)
+    {
+ #define ENTITY_LENGTH 10
+      char * entity = (char *) malloc(ENTITY_LENGTH);
diff --git a/editors/abiword/files/patch-src_Makefile.in b/editors/abiword/files/patch-src_Makefile.in
deleted file mode 100644
index 863e989dbddb..000000000000
--- a/editors/abiword/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	2011-10-18 13:46:19.263699367 -0400
-+++ src/Makefile.in	2011-10-18 13:48:41.402205325 -0400
-@@ -500,7 +500,7 @@
- 	$(WP_CPPFLAGS) \
- 	-DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
- 
--libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
-+libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \
- 	-export-dynamic $(am__append_6)
- libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
- 	text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
-@@ -535,7 +535,7 @@
- 
- @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
- @TOOLKIT_COCOA_TRUE@	$(DEPS_LIBS) \
--@TOOLKIT_COCOA_TRUE@	--no-undefined \
-+@TOOLKIT_COCOA_TRUE@	-Wl,--no-undefined \
- @TOOLKIT_COCOA_TRUE@	-avoid-version \
- @TOOLKIT_COCOA_TRUE@	-export-dynamic \
- @TOOLKIT_COCOA_TRUE@	-headerpad_max_install_names 
-@@ -551,7 +551,7 @@
- 
- @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
- @TOOLKIT_COCOA_FALSE@	$(platform_ldflags) \
--@TOOLKIT_COCOA_FALSE@	--no-undefined      \
-+@TOOLKIT_COCOA_FALSE@	-Wl,--no-undefined      \
- @TOOLKIT_COCOA_FALSE@	-avoid-version      \
- @TOOLKIT_COCOA_FALSE@	-export-dynamic
- 
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 2b5e358dfd0c..2682765375f3 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -2,62 +2,162 @@ bin/abiword
 include/abiword-%%ABIVERSION%%/abiwidget.h
 include/abiword-%%ABIVERSION%%/libabiword.h
 include/abiword-%%ABIVERSION%%/xap_UnixTableWidget.h
-lib/abiword-%%ABIVERSION%%/plugins/opendocument.a
+%%AIKSAURUS%%lib/abiword-%%ABIVERSION%%/plugins/aiksaurus.a
+%%AIKSAURUS%%lib/abiword-%%ABIVERSION%%/plugins/aiksaurus.la
+%%AIKSAURUS%%lib/abiword-%%ABIVERSION%%/plugins/aiksaurus.so
+lib/abiword-%%ABIVERSION%%/plugins/applix.la
+lib/abiword-%%ABIVERSION%%/plugins/applix.so
+lib/abiword-%%ABIVERSION%%/plugins/babelfish.la
+lib/abiword-%%ABIVERSION%%/plugins/babelfish.so
+lib/abiword-%%ABIVERSION%%/plugins/bmp.la
+lib/abiword-%%ABIVERSION%%/plugins/bmp.so
+lib/abiword-%%ABIVERSION%%/plugins/clarisworks.la
+lib/abiword-%%ABIVERSION%%/plugins/clarisworks.so
+%%COLLAB%%lib/abiword-%%ABIVERSION%%/plugins/collab.la
+%%COLLAB%%lib/abiword-%%ABIVERSION%%/plugins/collab.so
+lib/abiword-%%ABIVERSION%%/plugins/command.la
+lib/abiword-%%ABIVERSION%%/plugins/command.so
+lib/abiword-%%ABIVERSION%%/plugins/docbook.la
+lib/abiword-%%ABIVERSION%%/plugins/docbook.so
+lib/abiword-%%ABIVERSION%%/plugins/eml.la
+lib/abiword-%%ABIVERSION%%/plugins/eml.so
+lib/abiword-%%ABIVERSION%%/plugins/freetranslation.la
+lib/abiword-%%ABIVERSION%%/plugins/freetranslation.so
+lib/abiword-%%ABIVERSION%%/plugins/garble.la
+lib/abiword-%%ABIVERSION%%/plugins/garble.so
+lib/abiword-%%ABIVERSION%%/plugins/gdict.la
+lib/abiword-%%ABIVERSION%%/plugins/gdict.so
+lib/abiword-%%ABIVERSION%%/plugins/gimp.la
+lib/abiword-%%ABIVERSION%%/plugins/gimp.so
+lib/abiword-%%ABIVERSION%%/plugins/goffice.la
+lib/abiword-%%ABIVERSION%%/plugins/goffice.so
+lib/abiword-%%ABIVERSION%%/plugins/google.la
+lib/abiword-%%ABIVERSION%%/plugins/google.so
+%%GRAMMAR%%lib/abiword-%%ABIVERSION%%/plugins/grammar.la
+%%GRAMMAR%%lib/abiword-%%ABIVERSION%%/plugins/grammar.so
+lib/abiword-%%ABIVERSION%%/plugins/hancom.la
+lib/abiword-%%ABIVERSION%%/plugins/hancom.so
+lib/abiword-%%ABIVERSION%%/plugins/hrtext.la
+lib/abiword-%%ABIVERSION%%/plugins/hrtext.so
+lib/abiword-%%ABIVERSION%%/plugins/iscii.la
+lib/abiword-%%ABIVERSION%%/plugins/iscii.so
+lib/abiword-%%ABIVERSION%%/plugins/kword.la
+lib/abiword-%%ABIVERSION%%/plugins/kword.so
+lib/abiword-%%ABIVERSION%%/plugins/latex.la
+lib/abiword-%%ABIVERSION%%/plugins/latex.so
+lib/abiword-%%ABIVERSION%%/plugins/loadbindings.la
+lib/abiword-%%ABIVERSION%%/plugins/loadbindings.so
+%%MATHVIEW%%lib/abiword-%%ABIVERSION%%/plugins/mathview.la
+%%MATHVIEW%%lib/abiword-%%ABIVERSION%%/plugins/mathview.so
+lib/abiword-%%ABIVERSION%%/plugins/mht.la
+lib/abiword-%%ABIVERSION%%/plugins/mht.so
+lib/abiword-%%ABIVERSION%%/plugins/mif.la
+lib/abiword-%%ABIVERSION%%/plugins/mif.so
+lib/abiword-%%ABIVERSION%%/plugins/mswrite.la
+lib/abiword-%%ABIVERSION%%/plugins/mswrite.so
 lib/abiword-%%ABIVERSION%%/plugins/opendocument.la
 lib/abiword-%%ABIVERSION%%/plugins/opendocument.so
-lib/libabiword-%%ABIVERSION%%.a
+lib/abiword-%%ABIVERSION%%/plugins/openwriter.la
+lib/abiword-%%ABIVERSION%%/plugins/openwriter.so
+lib/abiword-%%ABIVERSION%%/plugins/openxml.la
+lib/abiword-%%ABIVERSION%%/plugins/openxml.so
+lib/abiword-%%ABIVERSION%%/plugins/opml.la
+lib/abiword-%%ABIVERSION%%/plugins/opml.so
+%%OTS%%lib/abiword-%%ABIVERSION%%/plugins/ots.la
+%%OTS%%lib/abiword-%%ABIVERSION%%/plugins/ots.so
+lib/abiword-%%ABIVERSION%%/plugins/paint.la
+lib/abiword-%%ABIVERSION%%/plugins/paint.so
+lib/abiword-%%ABIVERSION%%/plugins/passepartout.la
+lib/abiword-%%ABIVERSION%%/plugins/passepartout.so
+lib/abiword-%%ABIVERSION%%/plugins/pdb.la
+lib/abiword-%%ABIVERSION%%/plugins/pdb.so
+lib/abiword-%%ABIVERSION%%/plugins/pdf.la
+lib/abiword-%%ABIVERSION%%/plugins/pdf.so
+lib/abiword-%%ABIVERSION%%/plugins/presentation.la
+lib/abiword-%%ABIVERSION%%/plugins/presentation.so
+%%PSION%%lib/abiword-%%ABIVERSION%%/plugins/psion.la
+%%PSION%%lib/abiword-%%ABIVERSION%%/plugins/psion.so
+lib/abiword-%%ABIVERSION%%/plugins/s5.la
+lib/abiword-%%ABIVERSION%%/plugins/s5.so
+lib/abiword-%%ABIVERSION%%/plugins/sdw.la
+lib/abiword-%%ABIVERSION%%/plugins/sdw.so
+lib/abiword-%%ABIVERSION%%/plugins/t602.la
+lib/abiword-%%ABIVERSION%%/plugins/t602.so
+lib/abiword-%%ABIVERSION%%/plugins/urldict.la
+lib/abiword-%%ABIVERSION%%/plugins/urldict.so
+lib/abiword-%%ABIVERSION%%/plugins/wikipedia.la
+lib/abiword-%%ABIVERSION%%/plugins/wikipedia.so
+lib/abiword-%%ABIVERSION%%/plugins/wmf.la
+lib/abiword-%%ABIVERSION%%/plugins/wmf.so
+lib/abiword-%%ABIVERSION%%/plugins/wml.la
+lib/abiword-%%ABIVERSION%%/plugins/wml.so
+%%WP%%lib/abiword-%%ABIVERSION%%/plugins/wordperfect.la
+%%WP%%lib/abiword-%%ABIVERSION%%/plugins/wordperfect.so
+%%WP%%lib/abiword-%%ABIVERSION%%/plugins/wpg.la
+%%WP%%lib/abiword-%%ABIVERSION%%/plugins/wpg.so
+lib/abiword-%%ABIVERSION%%/plugins/xslfo.la
+lib/abiword-%%ABIVERSION%%/plugins/xslfo.so
 lib/libabiword-%%ABIVERSION%%.la
 lib/libabiword-%%ABIVERSION%%.so
 libdata/pkgconfig/abiword-%%ABIVERSION%%.pc
-%%CLIPART%%share/abiword-2.8/clipart/book.png
-%%CLIPART%%share/abiword-2.8/clipart/chip.png
-%%CLIPART%%share/abiword-2.8/clipart/fun.png
-%%CLIPART%%share/abiword-2.8/clipart/gear.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomea.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomeb.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomec.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomecorner.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomed.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomedecor1.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomedecor2.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomee.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomeflowers.png
-%%CLIPART%%share/abiword-2.8/clipart/gnomeline.png
-%%CLIPART%%share/abiword-2.8/clipart/idea.png
-%%CLIPART%%share/abiword-2.8/clipart/lamp.png
-%%CLIPART%%share/abiword-2.8/clipart/monitor.png
-%%CLIPART%%share/abiword-2.8/clipart/music1.png
-%%CLIPART%%share/abiword-2.8/clipart/pinceau.png
-%%CLIPART%%share/abiword-2.8/clipart/simca.png
-%%CLIPART%%share/abiword-2.8/clipart/surprise.png
-%%CLIPART%%share/abiword-2.8/clipart/together.png
-%%CLIPART%%share/abiword-2.8/clipart/toolbox.png
-%%CLIPART%%share/abiword-2.8/clipart/tree.png
-%%CLIPART%%share/abiword-2.8/clipart/tux_bordelais.png
-%%CLIPART%%share/abiword-2.8/clipart/weather.png
-%%CLIPART%%share/abiword-2.8/clipart/write.png
+share/abiword-%%ABIVERSION%%/Presentation.xml
+%%COLLAB%%share/abiword-%%ABIVERSION%%/certs/cacert.pem
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/book.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/chip.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/fun.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gear.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomea.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomeb.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomec.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomecorner.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomed.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomedecor1.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomedecor2.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomee.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomeflowers.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomeline.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/idea.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/lamp.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/monitor.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/music1.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/pinceau.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/simca.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/surprise.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/together.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/toolbox.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/tree.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/tux_bordelais.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/weather.png
+%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/write.png
 share/abiword-%%ABIVERSION%%/system.profile-ro
 share/abiword-%%ABIVERSION%%/system.profile-ro-RO
-%%TEMPLATES%%share/abiword-2.8/templates/A4.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Business-Letter.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Business-Report.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Employee-Directory.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Fax-Coversheet.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Friendly-Letter.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Memo.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Press-Release.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Resume.awt
-%%TEMPLATES%%share/abiword-2.8/templates/Two-Columns.awt
-%%TEMPLATES%%share/abiword-2.8/templates/US-Letter.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/A4.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Business-Letter.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Business-Report.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Employee-Directory.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Fax-Coversheet.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Friendly-Letter.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Memo.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Press-Release.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Resume.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Two-Columns.awt
+%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/US-Letter.awt
 share/abiword-%%ABIVERSION%%/templates/normal.awt-ro
 share/abiword-%%ABIVERSION%%/templates/normal.awt-ro_RO
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Annotation.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Break.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAccounts.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddAccount.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddBuddy.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationJoin.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationShare.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Field.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFootnotes.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFrame.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTOC.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTable.xml
+%%COLLAB%%share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_GenericInput.xml
+%%COLLAB%%share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_GenericProgress.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Goto.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_HdrFtr.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_InsertTable.xml
@@ -77,6 +177,7 @@ share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist_modal.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Tab.xml
 share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_WordCount.xml
+%%OTS%%share/abiword-%%ABIVERSION%%/ui/ots.xml
 share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_DocComparison.xml
 share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Encoding.xml
 share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_History.xml
@@ -289,18 +390,27 @@ share/abiword-%%ABIVERSION%%/templates/normal.awt-ur_PK
 share/abiword-%%ABIVERSION%%/templates/normal.awt-yi
 share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_CN
 share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_TW
+share/abiword-%%ABIVERSION%%/xsltml/README
+share/abiword-%%ABIVERSION%%/xsltml/cmarkup.xsl
+share/abiword-%%ABIVERSION%%/xsltml/entities.xsl
+share/abiword-%%ABIVERSION%%/xsltml/glayout.xsl
+share/abiword-%%ABIVERSION%%/xsltml/mmltex.xsl
+share/abiword-%%ABIVERSION%%/xsltml/scripts.xsl
+share/abiword-%%ABIVERSION%%/xsltml/tables.xsl
+share/abiword-%%ABIVERSION%%/xsltml/tokens.xsl
 share/applications/abiword.desktop
 share/icons/abiword_48.png
 share/mime-info/abiword.keys
 @dirrmtry share/applications
+@dirrm share/abiword-%%ABIVERSION%%/xsltml
 @dirrm share/abiword-%%ABIVERSION%%/ui
 @dirrm share/abiword-%%ABIVERSION%%/templates
 @dirrm share/abiword-%%ABIVERSION%%/strings
 %%CLIPART%%@dirrm share/abiword-%%ABIVERSION%%/clipart
+%%COLLAB%%@dirrm share/abiword-%%ABIVERSION%%/certs
 @dirrm share/abiword-%%ABIVERSION%%
-@exec /bin/mkdir -p %D/lib/abiword-%%ABIVERSION%%/plugins
-@dirrmtry lib/abiword-%%ABIVERSION%%/plugins
-@dirrmtry lib/abiword-%%ABIVERSION%%
+@dirrm lib/abiword-%%ABIVERSION%%/plugins
+@dirrm lib/abiword-%%ABIVERSION%%
 @dirrm include/abiword-%%ABIVERSION%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true