$NetBSD: patch-aa,v 1.12 2010/11/26 14:49:50 adam Exp $

--- configure.orig	2010-06-13 21:17:37.000000000 +0000
+++ configure
@@ -17074,7 +17074,7 @@ fi
 
 # 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
@@ -17082,7 +17082,7 @@ else
   TOOLKIT_COCOA_FALSE=
 fi
 
- if test "$TOOLKIT" == "gtk"; then
+ if test "$TOOLKIT" = "gtk"; then
   TOOLKIT_GTK_TRUE=
   TOOLKIT_GTK_FALSE='#'
 else
@@ -17090,7 +17090,7 @@ else
   TOOLKIT_GTK_FALSE=
 fi
 
- if test "$TOOLKIT" == "win"; then
+ if test "$TOOLKIT" = "win"; then
   TOOLKIT_WIN_TRUE=
   TOOLKIT_WIN_FALSE='#'
 else
@@ -17099,15 +17099,15 @@ else
 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
 
 $as_echo "#define TOOLKIT_WIN 1" >>confdefs.h
 
@@ -17120,7 +17120,7 @@ $as_echo "#define _WIN32_WINNT 0x0500" >
 	# 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
 
 $as_echo "#define TOOLKIT_COCOA 1" >>confdefs.h
 
@@ -17132,7 +17132,7 @@ else
 $as_echo "#define TOOLKIT_GTK 1" >>confdefs.h
 
 fi
- if test "$enable_dynamic" == "yes"; then
+ if test "$enable_dynamic" = "yes"; then
   ENABLE_DYNAMIC_TRUE=
   ENABLE_DYNAMIC_FALSE='#'
 else
@@ -17140,7 +17140,7 @@ else
   ENABLE_DYNAMIC_FALSE=
 fi
 
- if test "$enable_static" == "yes"; then
+ if test "$enable_static" = "yes"; then
   ENABLE_STATIC_TRUE=
   ENABLE_STATIC_FALSE='#'
 else
@@ -17239,33 +17239,33 @@ $as_echo "yes" >&6; }
 
 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
 
 $as_echo "#define DISABLE_EXPORTS 1" >>confdefs.h
 
 fi
 
-if test "$abi_cv_menubutton" == "yes"; then
+if test "$abi_cv_menubutton" = "yes"; then
 
 $as_echo "#define ENABLE_MENUBUTTON 1" >>confdefs.h
 
 fi
- if test "$abi_cv_menubutton" == "yes"; then
+ if test "$abi_cv_menubutton" = "yes"; then
   ENABLE_MENUBUTTON_TRUE=
   ENABLE_MENUBUTTON_FALSE='#'
 else
@@ -17274,12 +17274,12 @@ else
 fi
 
 
-if test "$abi_cv_print" == "yes"; then
+if test "$abi_cv_print" = "yes"; then
 
 $as_echo "#define ENABLE_PRINT 1" >>confdefs.h
 
 fi
- if test "$abi_cv_print" == "yes"; then
+ if test "$abi_cv_print" = "yes"; then
   ENABLE_PRINT_TRUE=
   ENABLE_PRINT_FALSE='#'
 else
@@ -17288,7 +17288,7 @@ else
 fi
 
 
-if test "$abi_cv_spell" == "yes"; then
+if test "$abi_cv_spell" = "yes"; then
 
 $as_echo "#define ENABLE_SPELL 1" >>confdefs.h
 
@@ -17297,7 +17297,7 @@ $as_echo "#define ENABLE_SPELL 1" >>conf
 $as_echo "#define WITH_ENCHANT 1" >>confdefs.h
 
 fi
- if test "$abi_cv_spell" == "yes"; then
+ if test "$abi_cv_spell" = "yes"; then
   ENABLE_SPELL_TRUE=
   ENABLE_SPELL_FALSE='#'
 else
@@ -17306,12 +17306,12 @@ else
 fi
 
 
-if test "$abi_cv_statusbar" == "yes"; then
+if test "$abi_cv_statusbar" = "yes"; then
 
 $as_echo "#define ENABLE_STATUSBAR 1" >>confdefs.h
 
 fi
- if test "$abi_cv_statusbar" == "yes"; then
+ if test "$abi_cv_statusbar" = "yes"; then
   ENABLE_STATUSBAR_TRUE=
   ENABLE_STATUSBAR_FALSE='#'
 else
@@ -17327,7 +17327,7 @@ cat >>confdefs.h <<_ACEOF
 _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
@@ -17336,12 +17336,12 @@ else
 fi
 
 
-if test "$abi_cv_emacs_keybinding" == "yes"; then
+if test "$abi_cv_emacs_keybinding" = "yes"; then
 
 $as_echo "#define ENABLE_EMACS_KEYBINDING 1" >>confdefs.h
 
 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
@@ -17350,12 +17350,12 @@ else
 fi
 
 
-if test "$abi_cv_vi_keybinding" == "yes"; then
+if test "$abi_cv_vi_keybinding" = "yes"; then
 
 $as_echo "#define ENABLE_VI_KEYBINDING 1" >>confdefs.h
 
 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
@@ -17364,7 +17364,7 @@ else
 fi
 
 
- if test "$abi_cv_clipart" == "yes"; then
+ if test "$abi_cv_clipart" = "yes"; then
   ENABLE_CLIPART_TRUE=
   ENABLE_CLIPART_FALSE='#'
 else
@@ -17372,7 +17372,7 @@ else
   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
@@ -17381,7 +17381,7 @@ else
 fi
 
 
-if test "$abi_cv_debug" == "yes"; then
+if test "$abi_cv_debug" = "yes"; then
 
 $as_echo "#define DEBUG 1" >>confdefs.h
 
@@ -17390,7 +17390,7 @@ else
 $as_echo "#define NDEBUG 1" >>confdefs.h
 
 fi
- if test "$abi_cv_debug" == "yes"; then
+ if test "$abi_cv_debug" = "yes"; then
   DEBUG_TRUE=
   DEBUG_FALSE='#'
 else
@@ -17403,24 +17403,24 @@ fi
 # Optional dependencies handling
 #
 
-if test "$abi_cv_gnomevfs" == "yes"; then
+if test "$abi_cv_gnomevfs" = "yes"; then
 
 $as_echo "#define WITH_GNOMEVFS 1" >>confdefs.h
 
 fi
 
-if test "$abi_cv_gio" == "yes"; then
+if test "$abi_cv_gio" = "yes"; then
 
 $as_echo "#define WITH_GIO 1" >>confdefs.h
 
 fi
 
-if test "$abi_cv_goffice" == "yes"; then
+if test "$abi_cv_goffice" = "yes"; then
 
 $as_echo "#define WITH_GOFFICE 1" >>confdefs.h
 
 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
@@ -17447,7 +17447,7 @@ if test "$abi_cv_plugins" = "auto"; then
 		eval $(echo "enable_$plugin")="auto"
 	done
 else
-	default_plugins="opendocument"
+	default_plugins=""
 
 	if test "$abi_cv_disable_default_plugins" != "yes"; then
 		PLUGINS="$default_plugins"