2013-02-20 [colin] 3.9.0cvs88
authorColin Leroy <colin@colino.net>
Wed, 20 Feb 2013 13:27:50 +0000 (13:27 +0000)
committerColin Leroy <colin@colino.net>
Wed, 20 Feb 2013 13:27:50 +0000 (13:27 +0000)
* configure.ac
* Makefile.am
Don't check for GNOME2 when we want to check for
gtk-update-icon-cache; Typo fix

ChangeLog
Makefile.am
PATCHSETS
configure.ac

index fcb3812..d8e6578 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-20 [colin]     3.9.0cvs88
+
+       * configure.ac
+       * Makefile.am
+               Don't check for GNOME2 when we want to check for
+               gtk-update-icon-cache; Typo fix
+
 2013-02-20 [colin]     3.9.0cvs87
 
        * src/plugins/Makefile.am
index f432ee9..05788ec 100644 (file)
@@ -42,7 +42,7 @@ remove-icons:
        rm -f $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/claws-mail.png
        rm -f $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/claws-mail.png
 
-if CLAWS_GNOME2
+if UPDATE_GTK_ICON_CACHE
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: rename-icons update-icon-cache
index 0dba0ca..4f56db2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.654.2.4661 -r 1.654.2.4662 configure.ac;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/fancy_viewer.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/fancy_viewer.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/notification/notification_plugin.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/.cvsignore;  diff -u /dev/null src/plugins/notification/gtkhotkey/Makefile.am;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-error.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-error.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-info.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-info.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-listener.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-registry.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-utils.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-utils.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtkhotkey.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/eggaccelerators.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/eggaccelerators.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/tomboykeybinder.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/spam_report.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/tnef_parse/Makefile.am;  ) > 3.9.0cvs85.patchset
 ( cvs diff -u -r 1.654.2.4662 -r 1.654.2.4663 configure.ac;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs86.patchset
 ( cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/plugins/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/acpi_notifier/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/address_keeper/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/archive/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/att_remover/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/attachwarner/Makefile.am;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bsfilter/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/clamd/Makefile.am;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fancy/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fetchinfo/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/gdata/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/mailmbox/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/newmail/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pdf_viewer/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/perl/Makefile.am;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/python/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/rssyl/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/smime/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/spam_report/Makefile.am;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/tnef_parse/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/vcalendar/Makefile.am;  ) > 3.9.0cvs87.patchset
+( cvs diff -u -r 1.654.2.4664 -r 1.654.2.4665 configure.ac;  cvs diff -u -r 1.24.2.31 -r 1.24.2.32 Makefile.am;  ) > 3.9.0cvs88.patchset
index e857d24..c9386a0 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=87
+EXTRA_VERSION=88
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -36,19 +36,8 @@ AC_SUBST(MINOR_VERSION)
 AC_SUBST(MICRO_VERSION)
 AC_SUBST(EXTRA_VERSION)
 
-dnl GNOME installed?
-AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-if test "$GNOME_CONFIG" != no; then
-       gnomedatadir="`gnome-config --datadir`"
-       gnomeprefix="`gnome-config --prefix`"
-       if test "${prefix}" = "NONE"; then
-               gnomedatadir="${ac_default_prefix}/${gnomedatadir#${gnomeprefix}}"
-       else
-               gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}"
-       fi
-       AC_SUBST(gnomedatadir)
-fi
-AM_CONDITIONAL(CLAWS_GNOME, test -n "$gnomedatadir")
+AC_CHECK_PROG(HAVE_GTK_ICON_CACHE, gtk-update-icon-cache, yes, no)
+AM_CONDITIONAL(UPDATE_GTK_ICON_CACHE, test x"$HAVE_GTK_ICON_CACHE" = xyes)
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test x$PKG_CONFIG = xno ; then
@@ -1034,7 +1023,7 @@ AC_ARG_ENABLE(demo-plugin,
 
 
 dnl Then we check (unconditionnaly) for plugins dependencies
-dnl Some dependancies are optional, some mandatories. This is taken care of
+dnl Some dependencies are optional, some mandatories. This is taken care of
 dnl later.
 dnl
 dnl During this dependancy check we do the checks themselves, define HAVE_X to
@@ -1255,8 +1244,8 @@ AC_SUBST(CM_NP_HOTKEY_CFLAGS)
 AC_SUBST(CM_NP_HOTKEY_LIBS)
 
 
-dnl Third, we now cross the requested plugins and the available dependancies
-dnl If some dependancies are missing and the plugin was explicitely enabled,
+dnl Third, we now cross the requested plugins and the available dependencies
+dnl If some dependencies are missing and the plugin was explicitely enabled,
 dnl we error out, else we only inform.
 
 AC_MSG_CHECKING([whether to build acpi_notifier plugin])
@@ -1279,23 +1268,23 @@ fi
 
 AC_MSG_CHECKING([whether to build archive plugin])
 if test x"$enable_archive_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_ARCHIVE" = xno; then
-               dependancies_missing="libarchive $dependancies_missing"
+               dependencies_missing="libarchive $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS archive"
                AC_MSG_RESULT(yes)
        elif test x"$enable_archive_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin archive will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin archive will not be built; missing $dependencies_missing")
                enable_archive_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS archive"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin archive can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin archive can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS archive"
@@ -1358,26 +1347,26 @@ fi
 
 AC_MSG_CHECKING([whether to build fancy plugin])
 if test x"$enable_fancy_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_WEBKIT" = xno; then
-               dependancies_missing="libwebkit-1.0 $dependancies_missing"
+               dependencies_missing="libwebkit-1.0 $dependencies_missing"
        fi
        if test x"$HAVE_CURL" = xno; then
-               dependancies_missing="libcurl $dependancies_missing"
+               dependencies_missing="libcurl $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS fancy"
                AC_MSG_RESULT(yes)
        elif test x"$enable_fancy_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin fancy will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin fancy will not be built; missing $dependencies_missing")
                enable_fancy_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS fancy"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin fancy can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin fancy can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS fancy"
@@ -1395,23 +1384,23 @@ fi
 
 AC_MSG_CHECKING([whether to build gdata plugin])
 if test x"$enable_gdata_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_GDATA" = xno; then
-               dependancies_missing="libgdata $dependancies_missing"
+               dependencies_missing="libgdata $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS gdata"
                AC_MSG_RESULT(yes)
        elif test x"$enable_gdata_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin gdata will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin gdata will not be built; missing $dependencies_missing")
                enable_gdata_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS gdata"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin gdata can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin gdata can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS gdata"
@@ -1459,23 +1448,23 @@ fi
 
 AC_MSG_CHECKING([whether to build pdf_viewer plugin])
 if test x"$enable_pdf_viewer_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_POPPLER" = xno; then
-               dependancies_missing="libpoppler-glib $dependancies_missing"
+               dependencies_missing="libpoppler-glib $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS pdf_viewer"
                AC_MSG_RESULT(yes)
        elif test x"$enable_pdf_viewer_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin pdf_viewer will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin pdf_viewer will not be built; missing $dependencies_missing")
                enable_pdf_viewer_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pdf_viewer"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin pdf_viewer can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin pdf_viewer can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS pdf_viewer"
@@ -1484,23 +1473,23 @@ fi
 
 AC_MSG_CHECKING([whether to build perl plugin])
 if test x"$enable_perl_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_PERL" = xno; then
-               dependancies_missing="perl $dependancies_missing"
+               dependencies_missing="perl $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS perl"
                AC_MSG_RESULT(yes)
        elif test x"$enable_perl_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin perl will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin perl will not be built; missing $dependencies_missing")
                enable_perl_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS perl"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin perl can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin perl can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS perl"
@@ -1509,23 +1498,23 @@ fi
 
 AC_MSG_CHECKING([whether to build python plugin])
 if test x"$enable_python_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_PYTHON" = xno; then
-               dependancies_missing="python $dependancies_missing"
+               dependencies_missing="python $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS python"
                AC_MSG_RESULT(yes)
        elif test x"$enable_python_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin python will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin python will not be built; missing $dependencies_missing")
                enable_python_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS python"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin python can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin python can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS python"
@@ -1534,23 +1523,23 @@ fi
 
 AC_MSG_CHECKING([whether to build pgpcore plugin])
 if test x"$enable_pgpcore_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_GPGME" = xno; then
-               dependancies_missing="libgpgme $dependancies_missing"
+               dependencies_missing="libgpgme $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS pgpcore"
                AC_MSG_RESULT(yes)
        elif test x"$enable_pgpcore_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin pgpcore will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin pgpcore will not be built; missing $dependencies_missing")
                enable_pgpcore_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pgpcore"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin pgpcore can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin pgpcore can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS pgpcore"
@@ -1559,26 +1548,26 @@ fi
 
 AC_MSG_CHECKING([whether to build pgpmime plugin])
 if test x"$enable_pgpmime_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_GPGME" = xno; then
-               dependancies_missing="libgpgme $dependancies_missing"
+               dependencies_missing="libgpgme $dependencies_missing"
        fi
        if test x"$enable_pgpcore_plugin" = xno; then
-               dependancies_missing="pgpcore plugin $dependancies_missing"
+               dependencies_missing="pgpcore plugin $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS pgpmime"
                AC_MSG_RESULT(yes)
        elif test x"$enable_pgpmime_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin pgpmime will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin pgpmime will not be built; missing $dependencies_missing")
                enable_pgpmime_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pgpmime"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin pgpmime can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin pgpmime can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS pgpmime"
@@ -1587,26 +1576,26 @@ fi
 
 AC_MSG_CHECKING([whether to build pgpinline plugin])
 if test x"$enable_pgpinline_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_GPGME" = xno; then
-               dependancies_missing="libgpgme $dependancies_missing"
+               dependencies_missing="libgpgme $dependencies_missing"
        fi
        if test x"$enable_pgpcore_plugin" = xno; then
-               dependancies_missing="pgpcore plugin $dependancies_missing"
+               dependencies_missing="pgpcore plugin $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS pgpinline"
                AC_MSG_RESULT(yes)
        elif test x"$enable_pgpinline_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin pgpinline will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin pgpinline will not be built; missing $dependencies_missing")
                enable_pgpinline_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS pgpinline"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin pgpinline can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin pgpinline can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS pgpinline"
@@ -1615,26 +1604,26 @@ fi
 
 AC_MSG_CHECKING([whether to build rssyl plugin])
 if test x"$enable_rssyl_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_LIBXML" = xno; then
-               dependancies_missing="libxml2 $dependancies_missing"
+               dependencies_missing="libxml2 $dependencies_missing"
        fi
        if test x"$HAVE_CURL" = xno; then
-               dependancies_missing="libcurl $dependancies_missing"
+               dependencies_missing="libcurl $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS rssyl"
                AC_MSG_RESULT(yes)
        elif test x"$enable_rssyl_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin rssyl will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin rssyl will not be built; missing $dependencies_missing")
                enable_rssyl_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS rssyl"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin rssyl can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin rssyl can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS rssyl"
@@ -1653,26 +1642,26 @@ fi
 
 AC_MSG_CHECKING([whether to build smime plugin])
 if test x"$enable_smime_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_GPGME" = xno; then
-               dependancies_missing="libgpgme $dependancies_missing"
+               dependencies_missing="libgpgme $dependencies_missing"
        fi
        if test x"$enable_pgpcore_plugin" = xno; then
-               dependancies_missing="pgpcore plugin $dependancies_missing"
+               dependencies_missing="pgpcore plugin $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS smime"
                AC_MSG_RESULT(yes)
        elif test x"$enable_smime_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin smime will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin smime will not be built; missing $dependencies_missing")
                enable_smime_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS smime"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin smime can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin smime can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS smime"
@@ -1681,23 +1670,23 @@ fi
 
 AC_MSG_CHECKING([whether to build spam_report plugin])
 if test x"$enable_spam_report_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_CURL" = xno; then
-               dependancies_missing="libcurl $dependancies_missing"
+               dependencies_missing="libcurl $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS spam_report"
                AC_MSG_RESULT(yes)
        elif test x"$enable_spam_report_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin spam_report will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin spam_report will not be built; missing $dependencies_missing")
                enable_spam_report_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS spam_report"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin spam_report can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin spam_report can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS spam_report"
@@ -1715,27 +1704,27 @@ fi
 
 AC_MSG_CHECKING([whether to build vcalendar plugin])
 if test x"$enable_vcalendar_plugin" != xno; then
-       dependancies_missing=""
+       dependencies_missing=""
 
        if test x"$HAVE_CURL" = xno; then
-               dependancies_missing="libcurl $dependancies_missing"
+               dependencies_missing="libcurl $dependencies_missing"
        fi
 
        if test x"$HAVE_PERL" = xno; then
-               dependancies_missing="perl $dependancies_missing"
+               dependencies_missing="perl $dependencies_missing"
        fi
 
-       if test x"$dependancies_missing" = x; then
+       if test x"$dependencies_missing" = x; then
                PLUGINS="$PLUGINS vcalendar"
                AC_MSG_RESULT(yes)
        elif test x"$enable_vcalendar_plugin" = xauto; then
                AC_MSG_RESULT(no)
-               AC_MSG_WARN("Plugin vcalendar will not be built; missing $dependancies_missing")
+               AC_MSG_WARN("Plugin vcalendar will not be built; missing $dependencies_missing")
                enable_vcalendar_plugin=no
                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS vcalendar"
        else
                AC_MSG_RESULT(no)
-               AC_MSG_ERROR("Plugin vcalendar can not be built; missing $dependancies_missing")
+               AC_MSG_ERROR("Plugin vcalendar can not be built; missing $dependencies_missing")
        fi
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS vcalendar"