[gummi] 01/01: Imported Upstream version 0.6.5+20150817.6240b51

Daniel Stender danstender-guest at moszumanska.debian.org
Wed Oct 28 21:15:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch upstream
in repository gummi.

commit bf83c04addfe4cc577e921367c9f272372691106
Author: Daniel Stender <debian at danielstender.com>
Date:   Wed Oct 28 21:44:24 2015 +0100

    Imported Upstream version 0.6.5+20150817.6240b51
---
 AUTHORS                                       |    2 +-
 COPYING                                       |    2 +-
 Makefile.in                                   |  758 ---
 README                                        |    8 -
 README.md                                     |   22 +
 aclocal.m4                                    | 1866 ------
 autogen.sh                                    |   20 +
 compile                                       |  143 -
 config.h.in                                   |  114 -
 configure                                     | 7585 -------------------------
 configure.ac                                  |    2 +-
 data/Makefile.in                              |  581 --
 data/icons/Makefile.in                        |  465 --
 data/icons/gummi.ico                          |  Bin 0 -> 9662 bytes
 data/misc/Makefile.in                         |  530 --
 data/misc/default.tex                         |    4 +-
 data/misc/gummi.1                             |    4 +-
 data/snippets/Makefile.in                     |  439 --
 data/ui/Makefile.in                           |  439 --
 data/ui/gummi.glade                           |   18 +-
 depcomp                                       |  630 --
 dev/chver.sh                                  |   11 +
 dev/control                                   |   13 +
 dev/latest                                    |    1 +
 dev/pkg-utils                                 |  114 +
 dev/stresstest.py                             |   68 +
 dev/update-po                                 |    9 +
 install-sh                                    |  520 --
 lib/Makefile.in                               |  453 --
 missing                                       |  376 --
 po/POTFILES.in                                |    2 -
 po/ar.po                                      |    2 +-
 po/ca.po                                      |    2 +-
 po/cs.po                                      |    2 +-
 po/da.po                                      |    2 +-
 po/de.po                                      |    2 +-
 po/el.po                                      |    2 +-
 po/es.po                                      |  338 +-
 po/fr.po                                      |    2 +-
 po/hu.po                                      |    2 +-
 po/it.po                                      |    2 +-
 po/nl.po                                      |    6 +-
 po/pl.po                                      |    2 +-
 po/pt.po                                      |    2 +-
 po/pt_BR.po                                   |    2 +-
 po/ro.po                                      |    2 +-
 po/ru.po                                      |  255 +-
 po/sv.po                                      |    2 +-
 po/{ar.po => template.pot}                    |  395 +-
 po/zh_CN.po                                   |    2 +-
 po/zh_TW.po                                   |    2 +-
 src/Makefile                                  |   14 +
 src/Makefile.am                               |    3 +-
 src/Makefile.in                               |  816 ---
 src/biblio.c                                  |   45 +-
 src/biblio.h                                  |    4 +-
 src/compile/latexmk.c                         |   16 +-
 src/compile/latexmk.h                         |    4 +-
 src/compile/rubber.c                          |   14 +-
 src/compile/rubber.h                          |    4 +-
 src/compile/texlive.c                         |   42 +-
 src/compile/texlive.h                         |    4 +-
 src/configfile.c                              |   14 +-
 src/configfile.h                              |    4 +-
 src/constants.h                               |    4 +-
 src/editor.c                                  |   95 +-
 src/editor.h                                  |   10 +-
 src/environment.c                             |   16 +-
 src/environment.h                             |   18 +-
 src/external.c                                |   42 +-
 src/external.h                                |    2 +-
 src/gui/gui-import.c                          |   26 +-
 src/gui/gui-import.h                          |    2 +-
 src/gui/gui-infoscreen.c                      |   14 +-
 src/gui/gui-main.c                            |   92 +-
 src/gui/gui-main.h                            |   18 +-
 src/gui/gui-menu.c                            |  149 +-
 src/gui/gui-menu.h                            |    5 +-
 src/gui/gui-prefs.c                           |   90 +-
 src/gui/gui-prefs.h                           |    6 +-
 src/gui/gui-preview.c                         |  306 +-
 src/gui/gui-preview.h                         |   32 +-
 src/gui/gui-project.c                         |   60 +-
 src/gui/gui-project.h                         |    6 +-
 src/gui/gui-snippets.c                        |   14 +-
 src/gui/gui-tabmanager.c                      |   46 +-
 src/gui/gui-tabmanager.h                      |    4 +-
 src/importer.c                                |   18 +-
 src/importer.h                                |    4 +-
 src/iofunctions.c                             |   48 +-
 src/iofunctions.h                             |    4 +-
 src/latex.c                                   |   50 +-
 src/latex.h                                   |    8 +-
 src/main.c                                    |   16 +-
 src/motion.c                                  |   62 +-
 src/motion.h                                  |   12 +-
 src/porting.h                                 |    4 +-
 src/project.c                                 |   44 +-
 src/project.h                                 |   10 +-
 src/signals.c                                 |    2 +-
 src/signals.h                                 |    2 +-
 src/snippets.c                                |    4 +-
 src/snippets.h                                |    4 +-
 src/syncTeX/synctex_parser.c                  |   48 +-
 src/syncTeX/synctex_parser.h                  |    8 +-
 COPYING => src/syncTeX/synctex_parser_local.h |   28 +-
 src/syncTeX/synctex_parser_readme.txt         |  141 +
 src/syncTeX/synctex_parser_utils.c            |   12 +-
 src/syncTeX/synctex_parser_utils.h            |   14 +-
 src/syncTeX/synctex_parser_version.txt        |    1 +
 src/tabmanager.c                              |   43 +-
 src/tabmanager.h                              |    4 +-
 src/template.c                                |   38 +-
 src/template.h                                |    4 +-
 src/update.c                                  |  122 -
 src/update.h                                  |   39 -
 src/utils.c                                   |   28 +-
 src/utils.h                                   |    6 +-
 118 files changed, 1793 insertions(+), 17301 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c145fa1..d429f07 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
 
 Gummi was brought to you by:
 
-Alexander van der Mey <alexvandermey at gmail.com>
+Alexander van der Meij <alexvandermey at gmail.com>
 Wei-Ning Huang <aitjcize at gmail.com>
 Dion Timmermann <dion.timmermann at tu-harburg.de>
 
diff --git a/COPYING b/COPYING
index 83feef3..9b143af 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
+Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
 All Rights reserved.
 
 Permission is hereby granted, free of charge, to any person
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index b32362a..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,758 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile depcomp install-sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = po src data lib
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/README b/README
deleted file mode 100644
index 3c6e2dc..0000000
--- a/README
+++ /dev/null
@@ -1,8 +0,0 @@
-======================================================
-	Gummi - LaTeX editor for GTK+
-======================================================
-
-Latest news, releases and bug reports can be found on:
-
-    http://gummi.midnightcoding.org
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..58d7e5c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# Gummi; the simple LaTeX editor
+Welcome to the new official home for Gummi. It's good to be back. I've decided to make a short FAQ to answer some of the questions you may have had while the original website was offline. 
+
+![Alt text](/../screenshots/screenshots/gummi-065-main.png?raw=true "gummi 0.6.5 main")
+
+##### Are you going to continue development?
+Yes, I will start working on a new bugfix release right away. No release date yet, but it shouldn't take long to fix some of the minor existing annoyances. 
+
+##### What about implementing feature X?
+Unfortunately other projects I am currently working on take priority for the time being. There are some architectural aspects about the Gummi codebase that make popular requests like improved project support difficult to implement properly without some mayor reform. I'd probably do a complete rewrite of Gummi in Python or Vala if I had unlimited time, but unfortunately our reality does not work that way ;) - That said, I'm hopeful that this move to Github will bring in new contributions. 
+
+##### Is there ever going to be a non-beta release of the Windows version?
+That depends if someone wants to pick up the work. I have no personal interest in the Windows platform, and as noted before.. limited time to spend on Gummi development. If you're up for the task, let me know and I'll do my best to help you. 
+
+##### Where can I find the documentation that was available on the original website?
+
+The documentation, written by Guy Edwards, is now available as a Github wiki [here](https://github.com/alexandervdm/gummi/wiki). The menu link in your current version of Gummi may however still point to the wrong URL. 
+
+#### Contact
+
+If you wish to contact me, please use the contact details on my Github profile. I can also usually be found idling on the FreeNode IRC network as 'alexandervdm'. 
+
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 0b45cab..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,1866 +0,0 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-         gio*) 
-             pkg_config_args="$pkg_config_args $module-2.0"
-         ;;
-      esac
-  done
-
-  PKG_PROG_PKG_CONFIG([0.16])
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  unsigned int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.glibtest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     GLIB_COMPILE_RESOURCES=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  AC_SUBST(GLIB_COMPILE_RESOURCES)
-  rm -f conf.glibtest
-])
-
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..69923f2
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+AM_VERSION=-1.14
+AC_VERSION=
+
+set -x
+
+if [ "x${ACLOCAL_DIR}" != "x" ]; then
+  ACLOCAL_ARG=-I ${ACLOCAL_DIR}
+fi
+
+${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
+${AUTOHEADER:-autoheader$AC_VERSION}
+AUTOMAKE=${AUTOMAKE:-automake$AM_VERSION} libtoolize -c --automake
+${AUTOMAKE:-automake$AM_VERSION} --add-missing --copy --include-deps
+${AUTOCONF:-autoconf$AC_VERSION}
+
+# mkinstalldirs was not correctly installed in some cases.
+cp -f /usr/share/automake${AM_VERSION}/mkinstalldirs .
+
+rm -rf autom4te.cache
diff --git a/compile b/compile
deleted file mode 100755
index c0096a7..0000000
--- a/compile
+++ /dev/null
@@ -1,143 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2009-10-06.20; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
-# Written by Tom Tromey <tromey at cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake at gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 82d3a5c..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,114 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* The gettext domain */
-#undef GETTEXT_PACKAGE
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `gethostbyname' function. */
-#undef HAVE_GETHOSTBYNAME
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-#undef USE_GTKSPELL
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/configure b/configure
deleted file mode 100755
index dd3b83b..0000000
--- a/configure
+++ /dev/null
@@ -1,7585 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Gummi 0.6.5.
-#
-# Report bugs to <alexvandermey at gmail.com>.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: alexvandermey at gmail.com about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='Gummi'
-PACKAGE_TARNAME='gummi'
-PACKAGE_VERSION='0.6.5'
-PACKAGE_STRING='Gummi 0.6.5'
-PACKAGE_BUGREPORT='alexvandermey at gmail.com'
-PACKAGE_URL='http://gummi.midnightcoding.org/'
-
-ac_unique_file="src/environment.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-GUI_CFLAGS
-GUI_LIBS
-EGREP
-GREP
-CPP
-gtkspell_LIBS
-gtkspell_CFLAGS
-poppler_LIBS
-poppler_CFLAGS
-gtksourceview_LIBS
-gtksourceview_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-gthread_LIBS
-gthread_CFLAGS
-GLIB_COMPILE_RESOURCES
-GLIB_MKENUMS
-GOBJECT_QUERY
-GLIB_GENMARSHAL
-GLIB_LIBS
-GLIB_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
-USE_GTKSPELL
-DATADIRNAME
-ALL_LINGUAS
-INTLTOOL_PERL
-GMSGFMT
-MSGFMT
-MSGMERGE
-XGETTEXT
-INTLTOOL_POLICY_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_DESKTOP_RULE
-intltool__v_merge_options_0
-intltool__v_merge_options_
-INTLTOOL_V_MERGE_OPTIONS
-INTLTOOL__v_MERGE_0
-INTLTOOL__v_MERGE_
-INTLTOOL_V_MERGE
-AM_DEFAULT_VERBOSITY
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
-USE_NLS
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-GETTEXT_PACKAGE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_dependency_tracking
-enable_nls
-enable_spellcheck
-enable_glibtest
-enable_gtktest
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-gthread_CFLAGS
-gthread_LIBS
-gtksourceview_CFLAGS
-gtksourceview_LIBS
-poppler_CFLAGS
-poppler_LIBS
-gtkspell_CFLAGS
-gtkspell_LIBS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures Gummi 0.6.5 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/gummi]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of Gummi 0.6.5:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-nls           do not use Native Language Support
-  --disable-spellcheck    disable spellcheck support
-  --disable-glibtest      do not try to compile and run a test GLIB program
-  --disable-gtktest       do not try to compile and run a test GTK+ program
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  gthread_CFLAGS
-              C compiler flags for gthread, overriding pkg-config
-  gthread_LIBS
-              linker flags for gthread, overriding pkg-config
-  gtksourceview_CFLAGS
-              C compiler flags for gtksourceview, overriding pkg-config
-  gtksourceview_LIBS
-              linker flags for gtksourceview, overriding pkg-config
-  poppler_CFLAGS
-              C compiler flags for poppler, overriding pkg-config
-  poppler_LIBS
-              linker flags for poppler, overriding pkg-config
-  gtkspell_CFLAGS
-              C compiler flags for gtkspell, overriding pkg-config
-  gtkspell_LIBS
-              linker flags for gtkspell, overriding pkg-config
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <alexvandermey at gmail.com>.
-Gummi home page: <http://gummi.midnightcoding.org/>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-Gummi configure 0.6.5
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
-## Report this to alexvandermey at gmail.com ##
-## -------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by Gummi $as_me 0.6.5, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='gummi'
- VERSION='0.6.5'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-GETTEXT_PACKAGE=gummi
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
-
-# ls po/*.po | sort | sed 's/po\///g;s/.po//g'| sed ':a;N;s/\n/ /g;ta'
-ALL_LINGUAS="ar ca cs da de el es fr hu it nl pl pt pt_BR ro ru sv zh_CN zh_TW"
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-
-case "$am__api_version" in
-    1.01234)
-	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n ""; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
-$as_echo_n "checking for intltool >= ... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error $? "Your intltool is too old.  You need intltool  or later." "$LINENO" 5
-fi
-
-# Extract the first word of "intltool-update", so it can be a program name with args.
-set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_UPDATE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
-$as_echo "$INTLTOOL_UPDATE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-merge", so it can be a program name with args.
-set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_MERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
-$as_echo "$INTLTOOL_MERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-extract", so it can be a program name with args.
-set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_EXTRACT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
-
-
-
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-
-
-
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check the gettext tools to make sure they are GNU
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XGETTEXT=$ac_cv_path_XGETTEXT
-if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGMERGE=$ac_cv_path_MSGMERGE
-if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGFMT=$ac_cv_path_MSGFMT
-if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-$as_echo "$INTLTOOL_PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_PERL"; then
-   as_fn_error $? "perl not found" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
-fi
-if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
-$as_echo_n "checking for XML::Parser... " >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-   else
-       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-
-# Checks for libraries.
-# Check whether --enable-spellcheck was given.
-if test "${enable_spellcheck+set}" = set; then :
-  enableval=$enable_spellcheck; spellcheck=$enableval
-else
-  spellcheck="yes"
-fi
-
-
-if test "$spellcheck" = yes; then
-    $as_echo "#define USE_GTKSPELL 1" >>confdefs.h
-
-fi
-
-
-# Check whether --enable-glibtest was given.
-if test "${enable_glibtest+set}" = set; then :
-  enableval=$enable_glibtest;
-else
-  enable_glibtest=yes
-fi
-
-
-  pkg_config_args=glib-2.0
-  for module in .
-  do
-      case "$module" in
-         gmodule)
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export)
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject)
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-         gio*)
-             pkg_config_args="$pkg_config_args $module-2.0"
-         ;;
-      esac
-  done
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.16
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=2.20.0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
-$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-      rm -f conf.glibtest
-      if test "$cross_compiling" = yes; then :
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  unsigned int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.glibtest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  no_glib=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
-$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
-
-	 GUI_CFLAGS="$GUI_CFLAGS $GLIB_CFLAGS"
-	 GUI_LIBS="$GUI_LIBS $GLIB_LIBS"
-
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <glib.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
-   echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     GLIB_COMPILE_RESOURCES=""
-     as_fn_error $? "You need Glib >= 2.20.0 to build $PACKAGE" "$LINENO" 5
-  fi
-
-
-
-
-
-
-  rm -f conf.glibtest
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread" >&5
-$as_echo_n "checking for gthread... " >&6; }
-
-if test -n "$gthread_CFLAGS"; then
-    pkg_cv_gthread_CFLAGS="$gthread_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gthread_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gthread_LIBS"; then
-    pkg_cv_gthread_LIBS="$gthread_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gthread_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        gthread_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0" 2>&1`
-        else
-	        gthread_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gthread_PKG_ERRORS" >&5
-
-	as_fn_error $? "You need ghread-2.0 to build $PACKAGE" "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "You need ghread-2.0 to build $PACKAGE" "$LINENO" 5
-else
-	gthread_CFLAGS=$pkg_cv_gthread_CFLAGS
-	gthread_LIBS=$pkg_cv_gthread_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-GUI_CFLAGS="$GUI_CFLAGS $gthread_CFLAGS"
-GUI_LIBS="$GUI_LIBS $gthread_LIBS"
-
-# Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then :
-  enableval=$enable_gtktest;
-else
-  enable_gtktest=yes
-fi
-
-
-  pkg_config_args=gtk+-2.0
-  for module in .
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=2.20.0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
-$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then :
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
-
-	 GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
-	 GUI_LIBS="$GUI_LIBS $GTK_LIBS"
-
-  else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-   echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
-   echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     as_fn_error $? "You need Gtk+ >= 2.20.0 to build $PACKAGE" "$LINENO" 5
-  fi
-
-
-  rm -f conf.gtktest
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtksourceview" >&5
-$as_echo_n "checking for gtksourceview... " >&6; }
-
-if test -n "$gtksourceview_CFLAGS"; then
-    pkg_cv_gtksourceview_CFLAGS="$gtksourceview_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtksourceview-2.0 >= 2.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtksourceview-2.0 >= 2.2.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtksourceview_CFLAGS=`$PKG_CONFIG --cflags "gtksourceview-2.0 >= 2.2.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gtksourceview_LIBS"; then
-    pkg_cv_gtksourceview_LIBS="$gtksourceview_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtksourceview-2.0 >= 2.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtksourceview-2.0 >= 2.2.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtksourceview_LIBS=`$PKG_CONFIG --libs "gtksourceview-2.0 >= 2.2.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        gtksourceview_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtksourceview-2.0 >= 2.2.1" 2>&1`
-        else
-	        gtksourceview_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtksourceview-2.0 >= 2.2.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gtksourceview_PKG_ERRORS" >&5
-
-	as_fn_error $? "You need gtksourceview-2 >= 2.2.1 to build $PACKAGE" "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "You need gtksourceview-2 >= 2.2.1 to build $PACKAGE" "$LINENO" 5
-else
-	gtksourceview_CFLAGS=$pkg_cv_gtksourceview_CFLAGS
-	gtksourceview_LIBS=$pkg_cv_gtksourceview_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-GUI_CFLAGS="$GUI_CFLAGS $gtksourceview_CFLAGS"
-GUI_LIBS="$GUI_LIBS $gtksourceview_LIBS"
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
-$as_echo_n "checking for poppler... " >&6; }
-
-if test -n "$poppler_CFLAGS"; then
-    pkg_cv_poppler_CFLAGS="$poppler_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-glib\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "poppler-glib") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_poppler_CFLAGS=`$PKG_CONFIG --cflags "poppler-glib" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$poppler_LIBS"; then
-    pkg_cv_poppler_LIBS="$poppler_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-glib\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "poppler-glib") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_poppler_LIBS=`$PKG_CONFIG --libs "poppler-glib" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        poppler_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-glib" 2>&1`
-        else
-	        poppler_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-glib" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$poppler_PKG_ERRORS" >&5
-
-	as_fn_error $? "You need Poppler to build $PACKAGE" "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "You need Poppler to build $PACKAGE" "$LINENO" 5
-else
-	poppler_CFLAGS=$pkg_cv_poppler_CFLAGS
-	poppler_LIBS=$pkg_cv_poppler_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-GUI_CFLAGS="$GUI_CFLAGS $poppler_CFLAGS"
-GUI_LIBS="$GUI_LIBS $poppler_LIBS"
-
-if test "$spellcheck" = yes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtkspell" >&5
-$as_echo_n "checking for gtkspell... " >&6; }
-
-if test -n "$gtkspell_CFLAGS"; then
-    pkg_cv_gtkspell_CFLAGS="$gtkspell_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkspell-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtkspell-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtkspell_CFLAGS=`$PKG_CONFIG --cflags "gtkspell-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gtkspell_LIBS"; then
-    pkg_cv_gtkspell_LIBS="$gtkspell_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkspell-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtkspell-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtkspell_LIBS=`$PKG_CONFIG --libs "gtkspell-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        gtkspell_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkspell-2.0" 2>&1`
-        else
-	        gtkspell_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkspell-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gtkspell_PKG_ERRORS" >&5
-
-	as_fn_error $? "You need GtkSpell  to build $PACKAGE" "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "You need GtkSpell  to build $PACKAGE" "$LINENO" 5
-else
-	gtkspell_CFLAGS=$pkg_cv_gtkspell_CFLAGS
-	gtkspell_LIBS=$pkg_cv_gtkspell_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-    GUI_CFLAGS="$GUI_CFLAGS $gtkspell_CFLAGS"
-    GUI_LIBS="$GUI_LIBS $gtkspell_LIBS"
-fi
-
-# Add explicit linking flags
-GUI_LIBS="$GUI_LIBS -pthread -lm -lz -lrt"
-
-# Checks for header files.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in libintl.h locale.h netdb.h stdlib.h string.h sys/socket.h sys/time.h unistd.h fcntl.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdbool.h>
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
-
-	struct s { _Bool s: 1; _Bool t; } s;
-
-	char a[true == 1 ? 1 : -1];
-	char b[false == 0 ? 1 : -1];
-	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-	char d[(bool) 0.5 == true ? 1 : -1];
-	/* See body of main program for 'e'.  */
-	char f[(_Bool) 0.0 == false ? 1 : -1];
-	char g[true];
-	char h[sizeof (_Bool)];
-	char i[sizeof s.t];
-	enum { j = false, k = true, l = false * true, m = true * 256 };
-	/* The following fails for
-	   HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-	_Bool n[m];
-	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-	/* Catch a bug in an HP-UX C compiler.  See
-	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-	 */
-	_Bool q = true;
-	_Bool *pq = &q;
-
-int
-main ()
-{
-
-	bool e = &s;
-	*pq |= q;
-	*pq |= ! q;
-	/* Refer to every declared value, to avoid compiler optimizations.  */
-	return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-		+ !m + !n + !o + !p + !q + !pq);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdbool_h=yes
-else
-  ac_cv_header_stdbool_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
-
-
-fi
-
-if test $ac_cv_header_stdbool_h = yes; then
-
-$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-
-# Checks for library functions.
-for ac_func in gethostbyname memset setlocale socket strstr
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/ui/Makefile data/icons/Makefile data/snippets/Makefile data/misc/Makefile lib/Makefile po/Makefile.in data/misc/$PACKAGE.desktop"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by Gummi $as_me 0.6.5, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <alexvandermey at gmail.com>.
-Gummi home page: <http://gummi.midnightcoding.org/>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-Gummi config.status 0.6.5
-configured by $0, generated by GNU Autoconf 2.68,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES data/ui/Makefile" ;;
-    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-    "data/snippets/Makefile") CONFIG_FILES="$CONFIG_FILES data/snippets/Makefile" ;;
-    "data/misc/Makefile") CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;;
-    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "data/misc/$PACKAGE.desktop") CONFIG_FILES="$CONFIG_FILES data/misc/$PACKAGE.desktop" ;;
-    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "po/stamp-it":C)
-    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-    fi
-    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-    >"po/stamp-it.tmp"
-    sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-    sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r po/POTFILES
-	  }
-	 ' "po/Makefile.in" >"po/Makefile"
-    rm -f "po/Makefile.tmp"
-    mv "po/stamp-it.tmp" "po/stamp-it"
-   ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-echo
-echo gummi...................................... : Version $VERSION
-echo
-echo spellcheck support......................... : $spellcheck
-echo
-echo The binary will be installed in $prefix/bin
-echo
-
-echo configure complete, now type \'make\'.
-echo
diff --git a/configure.ac b/configure.ac
index 1613108..f01242f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([Gummi], [0.6.5], [alexvandermey at gmail.com], [gummi], [http://gummi.midnightcoding.org/])
+AC_INIT([Gummi], [svn800], [alexvandermey at gmail.com], [gummi], [https://github.com/alexandervdm/gummi])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
 
 GETTEXT_PACKAGE=gummi
diff --git a/data/Makefile.in b/data/Makefile.in
deleted file mode 100644
index 1cbd628..0000000
--- a/data/Makefile.in
+++ /dev/null
@@ -1,581 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = ui icons snippets misc
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
deleted file mode 100644
index 1f1d354..0000000
--- a/data/icons/Makefile.in
+++ /dev/null
@@ -1,465 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(pixmapsdir)"
-DATA = $(images_DATA) $(pixmaps_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pixmapsdir = $(datadir)/pixmaps
-pixmaps_DATA = $(PACKAGE).png
-imagesdir = $(datadir)/$(PACKAGE)/icons
-images_DATA = $(PACKAGE).png icon.png
-EXTRA_DIST = $(pixmaps_DATA) \
-	     $(images_DATA)
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/icons/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-imagesDATA: $(images_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdir)" || exit $$?; \
-	done
-
-uninstall-imagesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
-install-pixmapsDATA: $(pixmaps_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pixmapsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapsdir)" || exit $$?; \
-	done
-
-uninstall-pixmapsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(pixmapsdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-imagesDATA install-pixmapsDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-imagesDATA uninstall-pixmapsDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-imagesDATA install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pixmapsDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-imagesDATA \
-	uninstall-pixmapsDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/icons/gummi.ico b/data/icons/gummi.ico
new file mode 100644
index 0000000..c5947ec
Binary files /dev/null and b/data/icons/gummi.ico differ
diff --git a/data/misc/Makefile.in b/data/misc/Makefile.in
deleted file mode 100644
index 787292e..0000000
--- a/data/misc/Makefile.in
+++ /dev/null
@@ -1,530 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data/misc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \
-	"$(DESTDIR)$(miscdir)"
-NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(desktop_DATA) $(misc_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-man_MANS = $(PACKAGE).1
-desktopdir = $(datadir)/applications
-desktop_DATA = $(PACKAGE).desktop
-miscdir = $(datadir)/$(PACKAGE)/misc
-misc_DATA = default.tex
-EXTRA_DIST = $(man_MANS) \
-	     $(desktop_DATA).in \
-		 $(misc_DATA)
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/misc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/misc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-desktopDATA: $(desktop_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
-	done
-
-uninstall-desktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-install-miscDATA: $(misc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(misc_DATA)'; test -n "$(miscdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(miscdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(miscdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(miscdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(miscdir)" || exit $$?; \
-	done
-
-uninstall-miscDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(misc_DATA)'; test -n "$(miscdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(miscdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(miscdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-desktopDATA install-man install-miscDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-desktopDATA uninstall-man uninstall-miscDATA
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-desktopDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-miscDATA \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-desktopDATA uninstall-man uninstall-man1 \
-	uninstall-miscDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/misc/default.tex b/data/misc/default.tex
index bf9d3c8..e71559d 100644
--- a/data/misc/default.tex
+++ b/data/misc/default.tex
@@ -1,7 +1,7 @@
 \documentclass[11pt]{article}
 %Gummi|065|=)
 \title{\textbf{Welcome to Gummi 0.6.5}}
-\author{Alexander van der Mey\\
+\author{Alexander van der Meij\\
 		Wei-Ning Huang\\
 		Dion Timmermann}
 \date{}
@@ -18,7 +18,7 @@ Support for two high-level {\LaTeX} building systems, \emph{rubber}\footnote{htt
 Added for your viewing convenience is a continuous preview mode for the PDF. This mode is enabled by default, but can also be disabled through the \emph{(View $\rightarrow$ Page layout in preview)} menu. Complementary to this feature is SyncTeX integration, which allows you to synchronize the position in your editor with the PDF preview. 
 
 \section{Feedback}
-We hope you will enjoy using this release as much as we enjoyed creating it. If you have comments, suggestions or wish to report an issue you are experiencing - contact us at: \emph{http://gummi.midnightcoding.org}.
+We hope you will enjoy using this release as much as we enjoyed creating it. If you have comments, suggestions or wish to report an issue you are experiencing - contact us at: \emph{https://github.com/alexandervdm/gummi}.
 
 \section{One more thing}
 If you are wondering where your old default text is; it has been stored as a template. The template menu can be used to access and restore it. 
diff --git a/data/misc/gummi.1 b/data/misc/gummi.1
index 769700b..82a2bf9 100644
--- a/data/misc/gummi.1
+++ b/data/misc/gummi.1
@@ -13,8 +13,8 @@ run gummi with debug logging enabled.
 display command line options.
 .SH BUGS
 Undoubtedly, please report at: 
-http://gummi.midnightcoding.org
+https://github.com/alexandervdm/gummi
 .SH AUTHORS
-Alexander van der Mey <alexvandermey at gmail.com> 
+Alexander van der Meij <alexandervdm at gliese.me> 
 .PP 
 Wei-Ning Huang <aitjcize at gmail.com>
diff --git a/data/snippets/Makefile.in b/data/snippets/Makefile.in
deleted file mode 100644
index 2ce864c..0000000
--- a/data/snippets/Makefile.in
+++ /dev/null
@@ -1,439 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data/snippets
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(snippetsdir)"
-DATA = $(snippets_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-snippetsdir = $(datadir)/$(PACKAGE)/snippets
-snippets_DATA = snippets.cfg snippets.lang
-EXTRA_DIST = $(snippets_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/snippets/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/snippets/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-snippetsDATA: $(snippets_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(snippets_DATA)'; test -n "$(snippetsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(snippetsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(snippetsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(snippetsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(snippetsdir)" || exit $$?; \
-	done
-
-uninstall-snippetsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(snippets_DATA)'; test -n "$(snippetsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(snippetsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(snippetsdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-snippetsDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-snippetsDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-snippetsDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-snippetsDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/ui/Makefile.in b/data/ui/Makefile.in
deleted file mode 100644
index 3b8a656..0000000
--- a/data/ui/Makefile.in
+++ /dev/null
@@ -1,439 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data/ui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(gladedir)"
-DATA = $(glade_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-gladedir = $(datadir)/$(PACKAGE)/ui
-glade_DATA = gummi.glade prefs.glade snippets.glade
-EXTRA_DIST = $(glade_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/ui/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/ui/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(gladedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(gladedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gladedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gladedir)" || exit $$?; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(gladedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-gladeDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-gladeDATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-gladeDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/ui/gummi.glade b/data/ui/gummi.glade
index 0eccd0d..26510a3 100644
--- a/data/ui/gummi.glade
+++ b/data/ui/gummi.glade
@@ -1592,6 +1592,7 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
+                <signal name="activate" handler="on_menu_edit_activate" swapped="no"/>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
@@ -2086,18 +2087,6 @@ active document to be saved. </property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="menu_update">
-                        <property name="label" translatable="yes">Check _Updates</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">im_updatechk</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_menu_update_activate" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="menu_about">
                         <property name="label">gtk-about</property>
                         <property name="use_action_appearance">False</property>
@@ -2647,7 +2636,6 @@ active document to be saved. </property>
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkComboBox" id="combo_sizes">
-                                    <property name="width_request">125</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="model">list_sizes</property>
@@ -3347,9 +3335,9 @@ bibliography database</property>
                 <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
-                <accelerator key="Return" signal="activate"/>
                 <accelerator key="Escape" signal="activate" modifiers="GDK_SHIFT_MASK"/>
                 <accelerator key="Escape" signal="activate" modifiers="GDK_SHIFT_MASK"/>
+                <accelerator key="Return" signal="activate"/>
                 <signal name="activate" handler="on_button_searchwindow_find_clicked" swapped="no"/>
               </object>
               <packing>
@@ -3815,7 +3803,7 @@ Your feedback on this release is highly appreciated. Should you
 encounter any problems, please create a bug report on our 
 bug tracker or email us on alexvandermey at gmail.com. 
 
-Future updates and new builds will be announced on our website at http://gummi.midnightcoding.org</property>
+Future updates and new builds will be announced on our website at https://github.com/alexandervdm/gummi</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
diff --git a/depcomp b/depcomp
deleted file mode 100755
index df8eea7..0000000
--- a/depcomp
+++ /dev/null
@@ -1,630 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake at gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/dev/chver.sh b/dev/chver.sh
new file mode 100755
index 0000000..39c327f
--- /dev/null
+++ b/dev/chver.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$1" == "" ]; then
+    echo "This script requires a command line argument <version number>"
+fi
+
+absolute_dir=$(cd "$( dirname "$0" )" && pwd)
+cd $absolute_dir/..
+
+sed -i "s/AC_INIT(\([^,]*\), \[\([a-zA-Z0-9.~\-]*\)*\], \(.*$\)/AC_INIT(\1, [$1], \3/g" configure.ac
+autoreconf
diff --git a/dev/control b/dev/control
new file mode 100644
index 0000000..e3dc578
--- /dev/null
+++ b/dev/control
@@ -0,0 +1,13 @@
+Source: gummi
+Section: misc
+Priority: extra
+Maintainer: Wei-Ning Huang (AZ) <aitjcize at gmail.com>
+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, intltool, libgtk2.0-dev, libglib2.0-dev, libpoppler-glib-dev, libgtksourceview2.0-dev, libgtkspell-dev
+Standards-Version: 3.9.1
+Homepage: https://github.com/alexandervdm/gummi
+
+Package: gummi
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-0, libglib2.0-0, libgtksourceview2.0-0, libgtkspell0, libpoppler-glibX, texlive, texlive-extra-utils, texlive-latex-extra
+Description: Simple LaTeX editor for Linux
+ Gummi is a simple light-weight LaTeX editor for GTK+ users written in C.
diff --git a/dev/latest b/dev/latest
new file mode 100644
index 0000000..ef5e445
--- /dev/null
+++ b/dev/latest
@@ -0,0 +1 @@
+0.6.5
diff --git a/dev/pkg-utils b/dev/pkg-utils
new file mode 100755
index 0000000..fc1e887
--- /dev/null
+++ b/dev/pkg-utils
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+echo "packaging utility for ubuntu ppa.."
+
+absolute_dir=$(cd "$( dirname "$0" )" && pwd)
+cd $absolute_dir/..
+
+notex=0
+
+PKG_DIR=$HOME/Public
+mkdir -p $PKG_DIR
+
+owd=`pwd`
+package=${owd##/*/}
+
+if [ "$3" == "notex" ]; then
+    notex=1
+fi
+
+case $2 in
+	lucid)
+		poppler_glib_ver=4
+		;;
+	maverick)
+		poppler_glib_ver=5
+		;;
+	natty)
+		poppler_glib_ver=6
+		;;
+	oneiric)
+		poppler_glib_ver=6
+        ;;
+	precise)
+        	poppler_glib_ver=8
+	;;
+	quantal)
+		poppler_glib_ver=8
+	;;
+esac
+
+if [ -e configure.ac ]; then
+  version=`sed -n 's/AC_INIT([^,]*, \[\([a-zA-Z0-9.~\-]*\)\], .*/\1/p' configure.ac`
+elif [ -e setup.py ]; then
+  version=`sed -n "s/.*version = '\(.*\)'.*/\1/p" setup.py`
+fi
+
+if [ "$1" == "clean" ]; then
+  rm -rf $PKG_DIR/$package*
+  echo "cleaned ~/Public.."
+  exit 0
+fi
+
+
+echo "(1) Wei-Ning Huang"
+echo "(2) Alexander van der Meij"
+echo "Who are you? (1/2)"
+
+read -e WHO
+
+if [ "$WHO" = "1" ]; then
+    export DEBFULLNAME="Wei-Ning Huang (AZ)"
+    export DEBEMAIL="aitjcize at gmail.com"
+else
+    export DEBFULLNAME="Alexander van der Meij"
+    export DEBEMAIL="alexvandermey at gmail.com"
+fi
+
+
+echo "Package  : $package"
+echo "Version  : $version"
+echo "NoTeX    : $notex"
+
+cd ..
+cp -r $package /tmp/$package-$version
+rm -rf /tmp/$package-$version/dev
+mv /tmp/$package-$version $PKG_DIR
+cd $PKG_DIR
+
+if [ "$1" == "sdist" ]; then
+  tar -zcf ${package}-$version.tar.gz $package-$version
+  exit 0
+else
+  tar -zcf ${package}_$version.orig.tar.gz $package-$version
+fi
+
+
+cd $package-$version
+
+dh_make -s
+
+cp $owd/dev/rules $owd/dev/control debian
+cd debian
+
+rm *.ex *.EX README.*
+
+dch -e
+
+if test 1 -eq $notex; then
+    sed -i 's/Source: gummi/Source: gummi-notex/g' control
+    sed -i 's/Package: gummi/Package: gummi-notex/g' control
+    sed -i 's/, texlive, texlive-extra-utils, texlive-latex-extra//g' control
+    sed -i 's/gummi/gummi-notex/g' changelog
+    mv ../../${package}_$version.orig.tar.gz ../../${package}-notex_$version.orig.tar.gz
+fi
+
+sed -i "s/libpoppler-glibX/libpoppler-glib$poppler_glib_ver/g" control
+
+cd ..
+
+if [ "$1" == "deb" ] || [ -z "$1" ]; then
+  dpkg-buildpackage -rfakeroot
+elif [ "$1" == "ppa" ]; then
+  debuild -S
+fi
diff --git a/dev/stresstest.py b/dev/stresstest.py
new file mode 100644
index 0000000..d72c0a2
--- /dev/null
+++ b/dev/stresstest.py
@@ -0,0 +1,68 @@
+# Gummi: stresstest.py
+# Development tool to test stability and memory leakage by simulating a user. 
+
+import os
+import tempfile
+import virtkey
+import sys
+import random
+import time
+import thread
+
+# TODO: write command line argument to enable/disable gummi debug mode
+# TODO: Options for stress test with limited time, typing speed
+# TODO: Start with question whether to proceed, else exit program
+
+# aliases for to be used X.org keysyms, see complete list at:
+# http://wiki.linuxquestions.org/wiki/List_of_Keysyms_Recognised_by_Xmodmap
+ENTER = 0xFF0D
+DOWN = 0xFF54
+UP = 0xFF52
+
+# set up keyboard simulator
+v = virtkey.virtkey()
+
+# create a new document with default text
+_, filenm = tempfile.mkstemp()
+tmp = open(filenm, "w")
+tmp.write("""\\documentclass{article}
+\\begin{document}
+\n!\n
+\\end{document}""")
+tmp.close()
+
+# start a gummi process in a different thread
+thread.start_new_thread(lambda: os.system('gummi %s' % filenm) ,())
+time.sleep(5)
+
+# set the cursor in the right position:
+v.press_keysym(DOWN)
+v.release_keysym(DOWN)
+v.press_keysym(DOWN)
+v.release_keysym(DOWN)
+
+
+# start the stress test
+while True:
+
+	for i in range(1,random.randint(2,20)):
+		character = random.randint(97,122)
+		v.press_unicode(character)
+		v.release_unicode(character)
+		time.sleep(0.1)
+	if random.randint(1,4) == 1:
+		v.press_unicode(ord('\\'))
+		v.release_unicode(ord('\\'))
+		v.press_unicode(ord('\\'))
+		v.release_unicode(ord('\\'))
+	v.press_keysym(ENTER)
+	v.release_keysym(ENTER)
+	time.sleep(random.randint(1,10)/10)
+
+
+
+
+
+
+
+
diff --git a/dev/update-po b/dev/update-po
new file mode 100755
index 0000000..72365cb
--- /dev/null
+++ b/dev/update-po
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+absolute_dir=$(cd "$( dirname "$0" )" && pwd)
+
+cd $absolute_dir/../po
+for i in `ls *.po`; do 
+    echo -e "\nprocessing $i";
+    intltool-update ${i%.po}; 
+done
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 6781b98..0000000
--- a/install-sh
+++ /dev/null
@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/lib/Makefile.in b/lib/Makefile.in
deleted file mode 100644
index c77723c..0000000
--- a/lib/Makefile.in
+++ /dev/null
@@ -1,453 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(latexdir)"
-SCRIPTS = $(latex_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-latexdir = $(libdir)/$(PACKAGE)
-latex_SCRIPTS = latex_dvi.sh
-EXTRA_DIST = $(latex_SCRIPTS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-latexSCRIPTS: $(latex_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(latex_SCRIPTS)'; test -n "$(latexdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(latexdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(latexdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(latexdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(latexdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-latexSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(latex_SCRIPTS)'; test -n "$(latexdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(latexdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(latexdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-latexSCRIPTS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-latexSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-latexSCRIPTS install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-latexSCRIPTS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/missing b/missing
deleted file mode 100755
index 28055d2..0000000
--- a/missing
+++ /dev/null
@@ -1,376 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake at gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ce893ee..6d385fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -59,7 +59,5 @@ src/tabmanager.c
 src/tabmanager.h
 src/template.c
 src/template.h
-src/update.c
-src/update.h
 src/utils.c
 src/utils.h
diff --git a/po/ar.po b/po/ar.po
index c1d0b68..ce64043 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-03-22 17:7+0300\n"
 "Last-Translator: Hamad Mohammad\n"
 "Language-Team: www.linuxac.org\n"
diff --git a/po/ca.po b/po/ca.po
index 395fc58..528ff55 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-11-07 22:16+0100\n"
 "Last-Translator: Marc Vinyals <marcvinyals at velodius.com>\n"
 "Language-Team: Català <marcvinyals at velodius.com>\n"
diff --git a/po/cs.po b/po/cs.po
index c0b0368..031778e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gummi SVN700\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-03-03 19:15+0100\n"
 "Last-Translator: Přemysl Janouch <p.janouch at gmail.com>\n"
 "Language-Team: Czech <p.janouch at gmail.com>\n"
diff --git a/po/da.po b/po/da.po
index beb582d..417c67e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2010-05-23 23:05+0100\n"
 "Last-Translator: Jack Olsen jackolsendk at gmail.com\n"
 "Language-Team: Jack Olsen jackolsendk at gmail.com\n"
diff --git a/po/de.po b/po/de.po
index 421dca2..42dc5d3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gummi 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-11-07 21:59+0100\n"
 "Last-Translator: Max Bruckner <max.w8chtel at googlemail.com>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
diff --git a/po/el.po b/po/el.po
index 80dd9f9..4ed4bfb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2010-05-24 14:43+0200\n"
 "Last-Translator: Dimitris Leventeas <mydimle at gmail.com>\n"
 "Language-Team: EL <mydimle at gmail.com>>\n"
diff --git a/po/es.po b/po/es.po
index 9988e9e..f993b3b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,29 +1,29 @@
 # Gummi Spanish language file.
-# Copyright (C) 2010
-# Carlos Salas Contreras <csalasc at gmail.com>, 2010.
+# Copyright (C) 2012
+# Francisco Javier F. Serrador <fserrador at gmail.com>, 2012.
+# Carlos Salas Contreras <csalasc at gmail.com>, 2010, 2012.
+# Fco. Javier Fde. Serrador <fserrador at gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gummi ES Language\n"
+"Project-Id-Version: 0.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
-"PO-Revision-Date: 2011-12-17 17:06-0300\n"
-"Last-Translator: Carlos Salas C. <csalasc at gmail.com>\n"
-"Language-Team: Carlos Salas Contreras <csalasc at gmail.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
+"PO-Revision-Date: 2012-11-12 13:24+0100\n"
+"Last-Translator: Fco. Javier Fde. Serrador <fserrador at gmail.com>\n"
+"Language-Team: Spanish <fserrador at gmail.com>\n"
+"Language: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: Chile\n"
 
 #: ../data/ui/gummi.glade.h:1
 msgid "Document statistics"
-msgstr "Estadísticas del Documento"
+msgstr "Estadísticas del documento"
 
 #: ../data/ui/gummi.glade.h:2
 msgid "Document name"
-msgstr "Nombre del Documento"
+msgstr "Nombre del documento"
 
 #: ../data/ui/gummi.glade.h:3
 msgid "Words in:"
@@ -43,11 +43,11 @@ msgstr "0"
 
 #: ../data/ui/gummi.glade.h:7
 msgid "headers"
-msgstr "Cabeceras"
+msgstr "cabeceras"
 
 #: ../data/ui/gummi.glade.h:8
 msgid "float captions"
-msgstr "Leyendas flotantes"
+msgstr "títulos flotantes"
 
 #: ../data/ui/gummi.glade.h:9
 msgid "Number of:"
@@ -59,11 +59,11 @@ msgstr "flotantes"
 
 #: ../data/ui/gummi.glade.h:11
 msgid "math environments"
-msgstr "Ambientes Matemáticos"
+msgstr "Entorno matemático"
 
 #: ../data/ui/gummi.glade.h:12
 msgid "PDF Preview could not initialise."
-msgstr "No se pudo inicializar vista preliminar PDF"
+msgstr "Imposible inicializar la vista preliminar PDF."
 
 #: ../data/ui/gummi.glade.h:13
 msgid "File:"
@@ -75,7 +75,7 @@ msgstr "Estilo:"
 
 #: ../data/ui/gummi.glade.h:15
 msgid "Caption:"
-msgstr "Leyenda"
+msgstr "Títulos:"
 
 #: ../data/ui/gummi.glade.h:16
 msgid "Label:"
@@ -95,11 +95,11 @@ msgstr "Columnas:"
 
 #: ../data/ui/gummi.glade.h:20
 msgid "Bracket:"
-msgstr "Símbolo Cierre:"
+msgstr "Corchete:"
 
 #: ../data/ui/gummi.glade.h:21
 msgid "Unbracketed"
-msgstr "Sin Corchetes"
+msgstr "Sin corchete"
 
 #: ../data/ui/gummi.glade.h:22
 msgid "Parentheses"
@@ -119,15 +119,15 @@ msgstr "Línea simple"
 
 #: ../data/ui/gummi.glade.h:26
 msgid "Double line"
-msgstr "Doble línea"
+msgstr "Línea doble"
 
 #: ../data/ui/gummi.glade.h:27
 msgid "Best Fit"
-msgstr "Mejor Forma"
+msgstr "Mejor anchura"
 
 #: ../data/ui/gummi.glade.h:28
 msgid "Fit Page Width"
-msgstr "Ajustar al ancho de página"
+msgstr "Ajusta al ancho de página"
 
 #: ../data/ui/gummi.glade.h:30
 #, no-c-format
@@ -176,19 +176,19 @@ msgstr "400%"
 
 #: ../data/ui/gummi.glade.h:47
 msgid "Align left"
-msgstr "Alinear a la Izquierda"
+msgstr "Alineación izquierda"
 
 #: ../data/ui/gummi.glade.h:48
 msgid "Align center"
-msgstr "Centrar"
+msgstr "Alineación central"
 
 #: ../data/ui/gummi.glade.h:49
 msgid "Align right"
-msgstr "Alinear a la derecha"
+msgstr "Alineación derecha"
 
 #: ../data/ui/gummi.glade.h:50
 msgid "No borders"
-msgstr "Sin Bordes"
+msgstr "Sin bordes"
 
 #: ../data/ui/gummi.glade.h:51
 msgid "Border outline"
@@ -220,11 +220,11 @@ msgstr "Guard_ar como..."
 
 #: ../data/ui/gummi.glade.h:58
 msgid "_Export to PDF"
-msgstr "_Exportar como PDF"
+msgstr "_Exportar a PDF"
 
 #: ../data/ui/gummi.glade.h:59
 msgid "shouldnotseeme"
-msgstr "nomeves"
+msgstr "nodebeverme"
 
 #: ../data/ui/gummi.glade.h:60
 msgid "_Edit"
@@ -236,55 +236,55 @@ msgstr "_Ver"
 
 #: ../data/ui/gummi.glade.h:62
 msgid "_Statusbar"
-msgstr "_Barra de Estado"
+msgstr "Barra de e_stado"
 
 #: ../data/ui/gummi.glade.h:63
 msgid "_Toolbar"
-msgstr "_Barra de Herramientas"
+msgstr "Barra de herramien_tas"
 
 #: ../data/ui/gummi.glade.h:64
 msgid "_Right Pane"
-msgstr "_Panel Derecho"
+msgstr "Panel de_recho"
 
 #: ../data/ui/gummi.glade.h:65
 msgid ""
 "Use SyncTeX to scroll preview to the part of the document that was last "
 "edited."
 msgstr ""
-"Usar SyncTex para desplazar la vista previa a la parte del documento que fué "
+"Usar SyncTex para arrastrar la vista previa a la parte del documento que fue "
 "editado por última vez."
 
 #: ../data/ui/gummi.glade.h:66
 msgid "Sync Preview with Editor"
-msgstr "Sincronizar previsualización  con Editor"
+msgstr "Presincronización con el editor"
 
 #: ../data/ui/gummi.glade.h:67
 msgid "Page Layout in Preview"
-msgstr "Diseño de página en la vista previa"
+msgstr "Prevista del diseño de página"
 
 #: ../data/ui/gummi.glade.h:68
 msgid "Single Page"
-msgstr "Página Simple"
+msgstr "Página simple"
 
 #: ../data/ui/gummi.glade.h:69
 msgid "Continuous, One Column"
-msgstr "Continuo, Una Columna"
+msgstr "Continuo, una columna"
 
 #: ../data/ui/gummi.glade.h:70
 msgid "_Fullscreen"
-msgstr "_Pantalla Completa"
+msgstr "Pantalla _completa"
 
 #: ../data/ui/gummi.glade.h:71
 msgid "_Search"
-msgstr "_Buscar"
+msgstr "Bú_squeda"
 
 #: ../data/ui/gummi.glade.h:72
 msgid "Find Ne_xt"
-msgstr "Buscar Sigui_ente"
+msgstr "Buscar _siguiente"
 
 #: ../data/ui/gummi.glade.h:73
 msgid "Find Pre_vious"
-msgstr "Buscar _Anterior"
+msgstr "Buscar _anterior"
 
 #: ../data/ui/gummi.glade.h:74
 msgid "_Document"
@@ -292,25 +292,27 @@ msgstr "_Documento"
 
 #: ../data/ui/gummi.glade.h:75
 msgid "Compile _Document"
-msgstr "Compilar _Documento"
+msgstr "Compilar _documento"
 
 #: ../data/ui/gummi.glade.h:76
 msgid ""
 "Compile LaTeX document\n"
 "and update preview."
-msgstr "Compilar documento LaTeX"
+msgstr ""
+"Compilar documento LaTeX\n"
+"y actualizar vista previa."
 
 #: ../data/ui/gummi.glade.h:78
 msgid "Set Compilation Options"
-msgstr "Ver Opciones de Compilación"
+msgstr "Ver opciones de compilación"
 
 #: ../data/ui/gummi.glade.h:79
 msgid "_Cleanup Build Files"
-msgstr ""
+msgstr "Limpiar ficheros de _compilación"
 
 #: ../data/ui/gummi.glade.h:80
 msgid "Run _Makeindex"
-msgstr "Ejecutar _MakeIndex"
+msgstr "Ejecutar _Makeindex"
 
 #: ../data/ui/gummi.glade.h:81
 msgid "Run _BibTeX"
@@ -318,16 +320,15 @@ msgstr "Ejecutar _BibTeX"
 
 #: ../data/ui/gummi.glade.h:82
 msgid "Document _Statistics"
-msgstr "E_stadísticas del Documento"
+msgstr "E_stadísticas del documento"
 
 #: ../data/ui/gummi.glade.h:83
-#, fuzzy
 msgid "Enable S_pell Checking"
-msgstr "Habilitar revisión ortográfica:"
+msgstr "Activar _revisión ortográfica"
 
 #: ../data/ui/gummi.glade.h:84
 msgid "Enable S_nippets"
-msgstr "S_nippets"
+msgstr "Activar fragme_ntos"
 
 #: ../data/ui/gummi.glade.h:85
 msgid "_Project"
@@ -335,7 +336,7 @@ msgstr "_Proyecto"
 
 #: ../data/ui/gummi.glade.h:86
 msgid "Create new Project"
-msgstr "Crear Proyecto nuevo"
+msgstr "Crear proyecto nuevo"
 
 #: ../data/ui/gummi.glade.h:87 ../src/gui/gui-menu.c:606
 msgid ""
@@ -347,23 +348,23 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:89
 msgid "Open Project"
-msgstr "Abrir Proyecto"
+msgstr "Abrir proyecto"
 
 #: ../data/ui/gummi.glade.h:90
 msgid "Close Project"
-msgstr "Cerrar Proyecto"
+msgstr "Cerrar proyecto"
 
 #: ../data/ui/gummi.glade.h:91
 msgid "_Help"
-msgstr "_Ayuda"
+msgstr "Ay_uda"
 
 #: ../data/ui/gummi.glade.h:92
 msgid "User _Guide"
-msgstr ""
+msgstr "_Guía de usuarios"
 
 #: ../data/ui/gummi.glade.h:93
 msgid "Check _Updates"
-msgstr "Buscar _Actualizaciones"
+msgstr "Buscar act_ualizaciones"
 
 #: ../data/ui/gummi.glade.h:94
 msgid "New"
@@ -379,32 +380,31 @@ msgstr "Guardar"
 
 #: ../data/ui/gummi.glade.h:97
 msgid "toolbutton5"
-msgstr "toolbutton5"
+msgstr "herramienta5"
 
 #: ../data/ui/gummi.glade.h:98
 msgid "toolbutton6"
-msgstr "toolbutton6"
+msgstr "herramienta6"
 
 #: ../data/ui/gummi.glade.h:99
 msgid "toolbutton7"
-msgstr "toolbutton7"
+msgstr "herramienta7"
 
 #: ../data/ui/gummi.glade.h:100
 msgid "toolbutton1"
-msgstr "toolbutton1"
+msgstr "herramienta1"
 
 #: ../data/ui/gummi.glade.h:101
 msgid "toolbutton2"
-msgstr "toolbutton2"
+msgstr "herramienta2"
 
 #: ../data/ui/gummi.glade.h:102
 msgid "toolbutton3"
-msgstr "toolbutton3"
+msgstr "herramienta3"
 
 #: ../data/ui/gummi.glade.h:103
-#, fuzzy
 msgid "  "
-msgstr "   "
+msgstr "  "
 
 #: ../data/ui/gummi.glade.h:104
 msgid "Image"
@@ -436,23 +436,23 @@ msgstr "de 0"
 
 #: ../data/ui/gummi.glade.h:111
 msgid "Preview Pane"
-msgstr "Previsualización Panel"
+msgstr "Panel de previsualización"
 
 #: ../data/ui/gummi.glade.h:112
 msgid "Build Log"
-msgstr "Registro de Compilación"
+msgstr "Registro de compilación"
 
 #: ../data/ui/gummi.glade.h:113
 msgid "Nr of files:"
-msgstr "Nro. de Archivos"
+msgstr "Nº de archivos:"
 
 #: ../data/ui/gummi.glade.h:114
 msgid "Root path:"
-msgstr "Ruta raíz"
+msgstr "Ruta raíz:"
 
 #: ../data/ui/gummi.glade.h:115
 msgid "Project name:"
-msgstr "Nombre del Proyecto"
+msgstr "Nombre del proyecto:"
 
 #: ../data/ui/gummi.glade.h:116 ../data/ui/prefs.glade.h:9
 msgid "   "
@@ -464,23 +464,23 @@ msgstr "Documento"
 
 #: ../data/ui/gummi.glade.h:118
 msgid "File path"
-msgstr "Directorio del Archivo"
+msgstr "Ruta del archivo"
 
 #: ../data/ui/gummi.glade.h:119
 msgid ""
 "Select a file to add it \n"
 "to the active project. "
 msgstr ""
-"Seleccione un archivo para agregarlo \n"
-"al proyecto actual"
+"Seleccione un archivo para \n"
+"añadirlo al proyecto actual."
 
 #: ../data/ui/gummi.glade.h:121
 msgid ""
 "Remove the selected\n"
 "file from the project."
 msgstr ""
-"Quitar archivo\n"
-"seleccionado del proyecto."
+"Quitar del proyecto el\n"
+"archivo seleccionado."
 
 #: ../data/ui/gummi.glade.h:123
 msgid "Project"
@@ -488,7 +488,7 @@ msgstr "Proyecto"
 
 #: ../data/ui/gummi.glade.h:124
 msgid "Filename:"
-msgstr "Nombre de Archivo:"
+msgstr "Nombre del archivo:"
 
 #: ../data/ui/gummi.glade.h:125 ../src/gui/gui-main.c:644
 msgid "none"
@@ -500,7 +500,7 @@ msgstr "Referencia:"
 
 #: ../data/ui/gummi.glade.h:127 ../src/gui/gui-main.c:645
 msgid "N/A"
-msgstr "N/A"
+msgstr "N/D"
 
 #: ../data/ui/gummi.glade.h:128
 msgid "Detect"
@@ -510,7 +510,9 @@ msgstr "Detectar"
 msgid ""
 "Detect mention of a bibtex\n"
 "file in the current document"
-msgstr "Detectar la mención de bibtex"
+msgstr ""
+"Detectar la mención de un archivo\n"
+"bibtex en el documento actual"
 
 #: ../data/ui/gummi.glade.h:131
 msgid "Compile"
@@ -521,7 +523,7 @@ msgid ""
 "Compile the active \n"
 "bibliography database"
 msgstr ""
-"Compilar la base de datos \n"
+"Compilar la base de datos\n"
 "de bibliografía activa"
 
 #: ../data/ui/gummi.glade.h:134 ../src/gui/gui-main.c:643
@@ -542,7 +544,7 @@ msgstr "Año"
 
 #: ../data/ui/gummi.glade.h:138
 msgid "filter:"
-msgstr "Filtro:"
+msgstr "filtrar:"
 
 #: ../data/ui/gummi.glade.h:139
 msgid "Find"
@@ -550,15 +552,15 @@ msgstr "Buscar"
 
 #: ../data/ui/gummi.glade.h:140
 msgid "Search for:"
-msgstr "Buscar por:"
+msgstr "Encontrar por:"
 
 #: ../data/ui/gummi.glade.h:141
 msgid "Replace with:"
-msgstr "Reemplazar con:"
+msgstr "Reemplazar por:"
 
 #: ../data/ui/gummi.glade.h:142
 msgid "Match entire word only"
-msgstr "Coincidir solo palabra completa"
+msgstr "Coincide solo palabra completa"
 
 #: ../data/ui/gummi.glade.h:143
 msgid "Search backwards"
@@ -574,11 +576,11 @@ msgstr "_Reemplazar"
 
 #: ../data/ui/gummi.glade.h:146
 msgid "Replace _All"
-msgstr "Reemplaz_ar Todos"
+msgstr "Reemplaz_ar todos"
 
 #: ../data/ui/gummi.glade.h:147
 msgid "Save early.. save often!"
-msgstr "Guardar temprano.. guardar frecuentemente!"
+msgstr "Guarde precozmente... ¡guarde a menudo!"
 
 #: ../data/ui/gummi.glade.h:148
 msgid "Create new document from template.."
@@ -590,7 +592,7 @@ msgid ""
 "current active document."
 msgstr ""
 "Hacer plantilla desde \n"
-"el documento activo"
+"el documento activo."
 
 #: ../data/ui/gummi.glade.h:151
 msgid "Deletes the selected template"
@@ -601,13 +603,12 @@ msgid "Open the selected template"
 msgstr "Abrir plantilla seleccionada"
 
 #: ../data/ui/gummi.glade.h:153
-#, fuzzy
 msgid "10"
-msgstr "0"
+msgstr "10"
 
 #: ../data/ui/prefs.glade.h:1
 msgid "compile when idle for "
-msgstr "compilar cuando este inactivo por"
+msgstr "compilar cuando este inactivo por "
 
 #: ../data/ui/prefs.glade.h:2
 msgid "compile every"
@@ -635,23 +636,23 @@ msgstr "Preferencias de Gummi"
 
 #: ../data/ui/prefs.glade.h:8
 msgid "Text wrapping"
-msgstr "Ajuste de texto:"
+msgstr "Envoltura de texto"
 
 #: ../data/ui/prefs.glade.h:10
 msgid "Enable text wrapping"
-msgstr "Activar ajuste del texto"
+msgstr "Activar envoltura del texto"
 
 #: ../data/ui/prefs.glade.h:11
 msgid "Do not split words over two lines"
-msgstr "No dividir palabras sobre 2 lineas"
+msgstr "No partir palabras mayores de dos líneas"
 
 #: ../data/ui/prefs.glade.h:12
 msgid "Line numbers"
-msgstr "Número de Línea:"
+msgstr "Número de líneas"
 
 #: ../data/ui/prefs.glade.h:13
 msgid "Display line numbers"
-msgstr "Ver número de líneas"
+msgstr "Mostrar números de líneas"
 
 #: ../data/ui/prefs.glade.h:14
 msgid "Highlighting"
@@ -667,7 +668,7 @@ msgstr "Ver"
 
 #: ../data/ui/prefs.glade.h:17
 msgid "Tab stops"
-msgstr "Tabulaciones:"
+msgstr "Tabulación de parada"
 
 #: ../data/ui/prefs.glade.h:18
 msgid "Tab width:"
@@ -679,23 +680,23 @@ msgstr "Insertar e_spacios en lugar de tabulaciones"
 
 #: ../data/ui/prefs.glade.h:20
 msgid "Automatic Indentation"
-msgstr "Indentación Automática"
+msgstr "Autoindentación"
 
 #: ../data/ui/prefs.glade.h:21
 msgid "_Enable automatic indentation"
-msgstr "_Habilitar indentación automática"
+msgstr "_Habilitar autoindentación"
 
 #: ../data/ui/prefs.glade.h:22
 msgid "Snippets"
-msgstr "Snippets"
+msgstr "Fragmentos"
 
 #: ../data/ui/prefs.glade.h:23
 msgid "Configure snippets"
-msgstr "Configurar snippets"
+msgstr "Configurar fragmentos"
 
 #: ../data/ui/prefs.glade.h:24
 msgid "File saving"
-msgstr "Guardando archivo:"
+msgstr "Guardando archivo"
 
 #: ../data/ui/prefs.glade.h:25
 msgid "_Autosave files every"
@@ -711,7 +712,7 @@ msgstr "Editor"
 
 #: ../data/ui/prefs.glade.h:28
 msgid "Editor font"
-msgstr "Fuente del Editor:"
+msgstr "Fuente del editor"
 
 #: ../data/ui/prefs.glade.h:29
 msgid "Color Scheme"
@@ -719,11 +720,11 @@ msgstr "Combinación de colores"
 
 #: ../data/ui/prefs.glade.h:30
 msgid "Font & Colors"
-msgstr "Color & Fuente"
+msgstr "Color y tipografismo"
 
 #: ../data/ui/prefs.glade.h:31
 msgid "Default Text"
-msgstr "Texto Predeterminado"
+msgstr "Texto predeterminado"
 
 #: ../data/ui/prefs.glade.h:32
 msgid "Typesetter command"
@@ -743,7 +744,7 @@ msgstr "TeXLive con XeTeX"
 
 #: ../data/ui/prefs.glade.h:36
 msgid "Rubber"
-msgstr "Rubber"
+msgstr "Goma"
 
 #: ../data/ui/prefs.glade.h:37
 msgid "Latexmk"
@@ -763,7 +764,7 @@ msgstr "Activar SyncTeX"
 
 #: ../data/ui/prefs.glade.h:41
 msgid "Compilation steps"
-msgstr "Pasos de Compilación"
+msgstr "Pasos de compilación"
 
 #: ../data/ui/prefs.glade.h:42
 msgid "TeX → PDF"
@@ -783,7 +784,7 @@ msgstr "Compilación"
 
 #: ../data/ui/prefs.glade.h:46
 msgid "PDF Compiling"
-msgstr "Compilando PDF:"
+msgstr "Compilando PDF"
 
 #: ../data/ui/prefs.glade.h:47
 msgid "seconds"
@@ -795,7 +796,7 @@ msgstr "Usar desplazamiento animado"
 
 #: ../data/ui/prefs.glade.h:49
 msgid "Cache size"
-msgstr "Tamaño de Caché"
+msgstr "Tamaño de caché"
 
 #: ../data/ui/prefs.glade.h:50
 msgid "MB"
@@ -803,19 +804,19 @@ msgstr "MB"
 
 #: ../data/ui/prefs.glade.h:51
 msgid "Preview"
-msgstr "Vista Previa"
+msgstr "Vista previa"
 
 #: ../data/ui/prefs.glade.h:52
 msgid "Spell check language"
-msgstr "Lenguaje de revisión ortográfica:"
+msgstr "Revisión ortográfica idiomática"
 
 #: ../data/ui/prefs.glade.h:53
 msgid "PDF Exporting"
-msgstr "Exportando PDF:"
+msgstr "Exportando PDF"
 
 #: ../data/ui/prefs.glade.h:54
 msgid "Automatically export PDF on document save"
-msgstr "Exportar automáticamente a PDF al guardar"
+msgstr "Autoexportar PDF al guardar documentos"
 
 #: ../data/ui/prefs.glade.h:55
 msgid "Miscellaneous"
@@ -823,11 +824,11 @@ msgstr "Misceláneo:"
 
 #: ../data/ui/prefs.glade.h:56
 msgid "_Reset defaults"
-msgstr "_Restablecer predeterminados"
+msgstr "_Restablecer predeterminado"
 
 #: ../data/ui/snippets.glade.h:1
 msgid "Snippets Manager"
-msgstr "Administrador de Snippets"
+msgstr "Administrador de fragmentos"
 
 #: ../data/ui/snippets.glade.h:2
 msgid "_Reset"
@@ -835,11 +836,11 @@ msgstr "_Restablecer"
 
 #: ../data/ui/snippets.glade.h:3
 msgid "Reset all snippets"
-msgstr "_Restablecer predeterminados"
+msgstr "Restablecer todos los fragmentos"
 
 #: ../data/ui/snippets.glade.h:4
 msgid "Snippets:"
-msgstr "Snippets:"
+msgstr "Fragmentos:"
 
 #: ../data/ui/snippets.glade.h:5
 #, fuzzy
@@ -849,29 +850,27 @@ msgstr "Crear documento nuevo"
 #: ../data/ui/snippets.glade.h:6
 #, fuzzy
 msgid "Remove selected snippet"
-msgstr "_Restablecer predeterminados"
+msgstr "Restablecer todos los fragmentos"
 
 #: ../data/ui/snippets.glade.h:7
 msgid "Edit:"
-msgstr "_Editar"
+msgstr "Edición:"
 
 #: ../data/ui/snippets.glade.h:8
 msgid "Insert macro"
-msgstr ""
+msgstr "Insertar macro"
 
 #: ../data/ui/snippets.glade.h:9
-#, fuzzy
 msgid "selected text"
-msgstr "Texto centrado"
+msgstr "seleccionar texto"
 
 #: ../data/ui/snippets.glade.h:10
-#, fuzzy
 msgid "filename"
-msgstr "Nombre de Archivo:"
+msgstr "nombre de archivo"
 
 #: ../data/ui/snippets.glade.h:11
 msgid "basename"
-msgstr ""
+msgstr "nombre de base"
 
 #: ../data/ui/snippets.glade.h:12
 msgid "Activation"
@@ -883,7 +882,7 @@ msgstr "    "
 
 #: ../data/ui/snippets.glade.h:14
 msgid "Tab trigger:"
-msgstr "Disparador de tabulación"
+msgstr "Disparador de tabulación:"
 
 #: ../data/ui/snippets.glade.h:15
 msgid "Shortcut key:"
@@ -892,15 +891,15 @@ msgstr "Tecla de acceso directo:"
 #: ../src/gui/gui-import.c:229
 #, c-format
 msgid "%s: No such file or directory\n"
-msgstr "%s: No existe el archio o el directorio\n"
+msgstr "%s: No existe el fichero o directorio\n"
 
 #: ../src/gui/gui-infoscreen.c:117
 msgid "PDF preview could not initialise."
-msgstr "No se puede inicializar vista previa PDF"
+msgstr "No se puede inicializar vista previa PDF."
 
 #: ../src/gui/gui-infoscreen.c:118
 msgid "Document appears to be empty or invalid."
-msgstr "El documento está vacío o es inválido"
+msgstr "El documento está vacío o es inválido."
 
 #: ../src/gui/gui-infoscreen.c:119
 msgid "Compilation program is missing."
@@ -950,31 +949,29 @@ msgstr "Existe archivo de intercambio para %s, ¿quiere recuperarlo desde ahí?"
 
 #: ../src/gui/gui-main.c:420 ../src/latex.c:270
 msgid "The file already exists. Overwrite?"
-msgstr "El archivo ya existe, ¿Sobrescribir?"
+msgstr "El archivo ya existe. ¿Sobrescribir?"
 
 #. add Loading message to status bar
 #: ../src/gui/gui-main.c:524
 #, c-format
 msgid "Loading template ..."
-msgstr "Cargando Plantilla ..."
+msgstr "Cargando plantilla..."
 
 #: ../src/gui/gui-main.c:593
 msgid "Compiling bibliography file..."
 msgstr "Compilando archivo de bibliografía..."
 
 #: ../src/gui/gui-main.c:595
-#, fuzzy
 msgid "Bibliography compiled without errors"
-msgstr "bibliografía compilada con errores"
+msgstr "Bibliografía compilada sin errores"
 
 #: ../src/gui/gui-main.c:599
 msgid "Error compiling bibliography file or none detected..."
-msgstr "Error compilando la bibliografía o archivo no detectado..."
+msgstr "Error compilando el archivo de bibliografía o ninguno detectado..."
 
 #: ../src/gui/gui-main.c:601
-#, fuzzy
 msgid "Error compiling bibliography file"
-msgstr "error compilando archivo de bibliografía"
+msgstr "Error compilando archivo de bibliografía"
 
 #: ../src/gui/gui-main.c:634
 #, c-format
@@ -997,7 +994,7 @@ msgstr ""
 
 #: ../src/gui/gui-main.c:775
 msgid "Open LaTeX document"
-msgstr "Crear documento nuevo"
+msgstr "Abrir documento LaTeX"
 
 #: ../src/gui/gui-main.c:778
 msgid "Select an image to insert"
@@ -1005,19 +1002,19 @@ msgstr "Seleccione una imagen para insertar"
 
 #: ../src/gui/gui-main.c:779
 msgid "Select bibliography file"
-msgstr "Compilando archivo de bibliografía..."
+msgstr "seleccionar archivo de bibliografía"
 
 #: ../src/gui/gui-main.c:812
 msgid "Save LaTeX document"
-msgstr "Crear documento nuevo"
+msgstr "Guardar documento LaTeX"
 
 #: ../src/gui/gui-main.c:813
 msgid "Save as LaTeX document"
-msgstr "Crear documento nuevo"
+msgstr "Guardar como documento LaTeX"
 
 #: ../src/gui/gui-main.c:814
 msgid "Export to PDF"
-msgstr "_Exportar como PDF"
+msgstr "Exportar como PDF"
 
 #: ../src/gui/gui-main.c:817
 msgid "Create project"
@@ -1025,23 +1022,22 @@ msgstr "Crear proyecto"
 
 #: ../src/gui/gui-main.c:862
 msgid "LaTeX files"
-msgstr "Archivo LaTeX"
+msgstr "Archivos LaTeX"
 
 #: ../src/gui/gui-main.c:867
 msgid "Text files"
-msgstr "Archivo de Texto"
+msgstr "Archivo de texto"
 
 #. Only \insertgraphics uses this section now. Make sure
 #. * the patterns & mimes are correct before assigning it
 #. * for other functions
 #: ../src/gui/gui-main.c:883
-#, fuzzy
 msgid "Supported Image files"
-msgstr "Imagen"
+msgstr "Ficheros de imágenes soportados"
 
 #: ../src/gui/gui-main.c:898
 msgid "Bibtex files"
-msgstr "Archivo BibTeX"
+msgstr "Archivos BibTeX"
 
 #: ../src/gui/gui-main.c:904
 msgid "Gummi project files"
@@ -1054,20 +1050,19 @@ msgstr "Error cargando archivo reciente: %s"
 
 #: ../src/gui/gui-menu.c:413
 msgid "Succesfully removed build files.."
-msgstr ""
+msgstr "Archivos de construcción eliminado con éxito."
 
 #: ../src/gui/gui-menu.c:416
-#, fuzzy
 msgid "Error removing build files.."
-msgstr "Error ejecutando MakeIndex.."
+msgstr "Error quitando archivos de compilación"
 
 #: ../src/gui/gui-menu.c:423
 msgid "Running Makeindex.."
-msgstr "Ejecutando MakeIndex.."
+msgstr "Ejecutando Makeindex..."
 
 #: ../src/gui/gui-menu.c:426
 msgid "Error running Makeindex.."
-msgstr "Error ejecutando MakeIndex.."
+msgstr "Error ejecutando Makeindex..."
 
 #: ../src/gui/gui-menu.c:450
 msgid "Words in text"
@@ -1079,7 +1074,7 @@ msgstr "Palabras en cabeceras"
 
 #: ../src/gui/gui-menu.c:452
 msgid "Words in float captions"
-msgstr "Palabras en leyenda flotante"
+msgstr "Palabras en epígrafes flotantes"
 
 #: ../src/gui/gui-menu.c:453
 msgid "Number of headers"
@@ -1091,18 +1086,15 @@ msgstr "Número de flotantes"
 
 #: ../src/gui/gui-menu.c:455
 msgid "Number of math inlines"
-msgstr "Número de math en líneas"
+msgstr "Número de en líneas matemáticas"
 
 #: ../src/gui/gui-menu.c:456
 msgid "Number of math displayed"
-msgstr "Número de math mostrados"
+msgstr "Número de matemáticas mostrados"
 
 #: ../src/gui/gui-menu.c:591
-#, fuzzy
 msgid "This function requires an active document"
-msgstr ""
-"Esta función requiere que el\n"
-"documento actual sea guardado."
+msgstr "Esta función requiere un documento activo"
 
 #: ../src/gui/gui-preview.c:904
 #, c-format
@@ -1112,30 +1104,28 @@ msgstr "de %d"
 #: ../src/gui/gui-snippets.c:329
 msgid ""
 "Duplicate activation tab trigger dectected! Please choose another one.\n"
-msgstr ""
-"Se ha detectado disparador de tabulación duplicado! Por favor seleccione "
-"otro.\n"
+msgstr "¡Detectado un disparador de tabulación duplicado! Debe elegir otro.\n"
 
 #: ../src/gui/gui-snippets.c:343
 msgid "Type a new shortcut"
-msgstr "Crear documento nuevo"
+msgstr "Teclee un enlace nuevo"
 
 #: ../src/gui/gui-snippets.c:346
 msgid "Type a new shortcut, or press Backspace to clear"
-msgstr "Escriba nuevo acceso directo, o presione retroceso para borrar"
+msgstr "Teclee un acceso directo nuevo, o pulse Retroceso para borrar"
 
 #: ../src/editor.c:573
 msgid "Top reached, search from bottom?"
-msgstr "Parte superior alcanzada, ¿Buscar desde abajo?"
+msgstr "Parte superior alcanzada, ¿busco desde abajo?"
 
 #: ../src/editor.c:580
 msgid "Bottom reached, search from top?"
-msgstr "Parte inferior alcanzada, ¿Buscar desde arriba?"
+msgstr "Parte inferior alcanzada, ¿busco desde arriba?"
 
 #: ../src/iofunctions.c:130
 #, c-format
 msgid "Saving %s..."
-msgstr "Guardando %s"
+msgstr "Guardando %s..."
 
 #: ../src/iofunctions.c:166
 #, c-format
@@ -1143,25 +1133,28 @@ msgid ""
 "%s\n"
 "Please try again later."
 msgstr ""
-"%S \n"
-"Por favor intente de nuevo después."
+"%s \n"
+"Intente de nuevo más tarde."
 
 #: ../src/iofunctions.c:239
 msgid "Can not convert text to UTF-8!\n"
-msgstr "No se puede convertir texto a UTF-8!\n"
+msgstr "¡No se puede convertir texto a UTF-8!\n"
 
 #: ../src/latex.c:277
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to export PDF file.\n"
 "\n"
 "%s"
-msgstr "Imposible exportar PDF.. \n"
+msgstr ""
+"Imposible exportar PDF.\n"
+"\n"
+"%s"
 
 #: ../src/tabmanager.c:73
 #, c-format
 msgid "Unsaved Document %d"
-msgstr "Documento sin Guardar %d"
+msgstr "Documento sin guardar %d"
 
 #: ../src/update.c:114
 #, c-format
@@ -1174,12 +1167,13 @@ msgid ""
 msgstr ""
 "Actualmente instalado:\n"
 "%s\n"
+"\n"
 "Actualmente disponible:\n"
 "%s"
 
 #: ../src/update.c:116
 msgid "Update Check"
-msgstr "Buscar Actualizaciones"
+msgstr "Comprobar actualizaciones"
 
 #: ../src/utils.c:122
 #, c-format
@@ -1188,9 +1182,9 @@ msgid ""
 "data will be restored when you reload your document. Please report bugs at: "
 "http://dev.midnightcoding.org"
 msgstr ""
-"%s ha encontrado un error grave y requiere ser reiniciado. Su trabajo será "
-"recuperado cuando cargue el documento nuevamente. Por favor reporte los "
-"errores en: http://dev.midnightcoding.org"
+"%s ha encontrado un error serio y requerirá un reinicio. Sus datos de "
+"trabajo serán recuperado cuando cargue el documento nuevamente. Por favor "
+"informe los errores en: http://dev.midnightcoding.org"
 
 #: ../src/utils.c:168
 msgid "Confirmation"
diff --git a/po/fr.po b/po/fr.po
index 89eb43f..98a2739 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-11-07 20:44+0100\n"
 "Last-Translator: Yvan Duron <yvan.duron at gmail.com>, Olivier Brousse "
 "<obrousse at gmail.com>\n"
diff --git a/po/hu.po b/po/hu.po
index 9a68beb..6d2cac2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gummi 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2012-08-13 13:39+0200\n"
 "Last-Translator: Meskó Balázs <meskobalazs at gmail.com>\n"
 "Language-Team: magyar <>\n"
diff --git a/po/it.po b/po/it.po
index 1699aea..2414751 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2010-10-27 20:28+0100\n"
 "Last-Translator: Salvatore Vassallo <vassallosalvatore at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index df9ccda..b582a8c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alexander van der Mey <alexvandermey at gmail.com>\n"
+"Last-Translator: Alexander van der Meij <alexvandermey at gmail.com>\n"
 "Language-Team: Dutch <LL at li.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -1336,7 +1336,7 @@ msgstr "Onderschrift:"
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 # Add your name to msgstr to have it included in the credits:
 #~ msgid "translator"
-#~ msgstr "Alexander van der Mey"
+#~ msgstr "Alexander van der Meij"
 
 #, fuzzy
 #~ msgid "Save?"
diff --git a/po/pl.po b/po/pl.po
index 7a59f13..57bf57e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gummi 0.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2010-11-11 01:08+0100\n"
 "Last-Translator: Hubert Kowalski <johnnybit at gmail.com>\n"
 "Language-Team: Polish Translation <johnnybit at gmail.com>\n"
diff --git a/po/pt.po b/po/pt.po
index f6d30d1..07a5063 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gummi 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-11-08 13:19-0300\n"
 "Last-Translator: Alexandre Guimarães <alexandre.guimaraes at campus.ul.pt>\n"
 "Language-Team: Portuguese\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c4f4b2..bc31369 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gummi 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-10-11 14:35-0300\n"
 "Last-Translator: Alexandre Guimarães <alexandre.guimaraes at campus.ul.pt>\n"
 "Language-Team: Brazilian Portuguese\n"
diff --git a/po/ro.po b/po/ro.po
index 5bccb17..112c9d7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2010-09-07 16:25+0200\n"
 "Last-Translator: Alexandru-Eugen Ichim <eugen at alexichim.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 59dc706..b9eddc0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Gummi 0.6.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
-"PO-Revision-Date: 2010-05-23 16:18+0400\n"
-"Last-Translator: kruvalig <kruvalig at gmail.com>\n"
-"Language-Team: fedora-trans-ru\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
+"PO-Revision-Date: 2012-10-22 20:42+0300\n"
+"Last-Translator: Musatov M. <m1kc at yandex.ru>\n"
+"Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,56 +16,57 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:1
 msgid "Document statistics"
-msgstr ""
+msgstr "Статистика документа"
 
 #: ../data/ui/gummi.glade.h:2
-#, fuzzy
 msgid "Document name"
-msgstr "Скомпилировать"
+msgstr "Имя документа"
 
 #: ../data/ui/gummi.glade.h:3
 #, fuzzy
 msgid "Words in:"
-msgstr "Жирный текст"
+msgstr "Слова в:"
 
 #: ../data/ui/gummi.glade.h:4
-#, fuzzy
 msgid "       "
-msgstr "        "
+msgstr "       "
 
 #: ../data/ui/gummi.glade.h:5
-#, fuzzy
 msgid "text"
-msgstr "Жирный текст"
+msgstr "текст"
 
 #: ../data/ui/gummi.glade.h:6
 msgid "0"
 msgstr "0"
 
 #: ../data/ui/gummi.glade.h:7
+#, fuzzy
 msgid "headers"
-msgstr ""
+msgstr "заголовки"
 
 #: ../data/ui/gummi.glade.h:8
 #, fuzzy
 msgid "float captions"
-msgstr "Шаблон настроек:"
+msgstr "плавающие заголовки"
 
 #: ../data/ui/gummi.glade.h:9
+#, fuzzy
 msgid "Number of:"
-msgstr ""
+msgstr "Количество:"
 
 #: ../data/ui/gummi.glade.h:10
+#, fuzzy
 msgid "floats"
-msgstr ""
+msgstr "плавающие"
 
 #: ../data/ui/gummi.glade.h:11
+#, fuzzy
 msgid "math environments"
-msgstr ""
+msgstr "окружения math"
 
 #: ../data/ui/gummi.glade.h:12
 msgid "PDF Preview could not initialise."
-msgstr ""
+msgstr "Не удалось инициализировать предпросмотр PDF."
 
 #: ../data/ui/gummi.glade.h:13
 msgid "File:"
@@ -73,7 +74,7 @@ msgstr "Файл:"
 
 #: ../data/ui/gummi.glade.h:14
 msgid "Style:"
-msgstr ""
+msgstr "Стиль:"
 
 #: ../data/ui/gummi.glade.h:15
 msgid "Caption:"
@@ -215,15 +216,17 @@ msgstr "Документ из _шаблона"
 #: ../data/ui/gummi.glade.h:56
 #, fuzzy
 msgid "_Open..."
-msgstr "Открыть"
+msgstr "Открыть..."
 
 #: ../data/ui/gummi.glade.h:57
+#, fuzzy
 msgid "Save _As..."
-msgstr ""
+msgstr "Сохранить как..."
 
 #: ../data/ui/gummi.glade.h:58
+#, fuzzy
 msgid "_Export to PDF"
-msgstr ""
+msgstr "Экспортировать в PDF"
 
 #: ../data/ui/gummi.glade.h:59
 msgid "shouldnotseeme"
@@ -246,31 +249,35 @@ msgid "_Toolbar"
 msgstr "_Инструменты"
 
 #: ../data/ui/gummi.glade.h:64
+#, fuzzy
 msgid "_Right Pane"
-msgstr ""
+msgstr "Правая панель"
 
 #: ../data/ui/gummi.glade.h:65
+#, fuzzy
 msgid ""
 "Use SyncTeX to scroll preview to the part of the document that was last "
 "edited."
 msgstr ""
+"Использовать SyncTeX для прокрутки окна предпросмотра к той части документа, "
+"которая редактировалась последней."
 
 #: ../data/ui/gummi.glade.h:66
 msgid "Sync Preview with Editor"
-msgstr ""
+msgstr "Синхронизировать предпросмотр с редактором"
 
 #: ../data/ui/gummi.glade.h:67
 msgid "Page Layout in Preview"
-msgstr ""
+msgstr "Расположение страниц в предпросмотре"
 
 #: ../data/ui/gummi.glade.h:68
-#, fuzzy
 msgid "Single Page"
-msgstr "Однострочный"
+msgstr "Одна страница"
 
 #: ../data/ui/gummi.glade.h:69
+#, fuzzy
 msgid "Continuous, One Column"
-msgstr ""
+msgstr "Непрерывно, в один столбец"
 
 #: ../data/ui/gummi.glade.h:70
 msgid "_Fullscreen"
@@ -291,18 +298,20 @@ msgstr "_Обратный поиск"
 #: ../data/ui/gummi.glade.h:74
 #, fuzzy
 msgid "_Document"
-msgstr "Скомпилировать"
+msgstr "Документ"
 
 #: ../data/ui/gummi.glade.h:75
 #, fuzzy
 msgid "Compile _Document"
-msgstr "Скомпилировать"
+msgstr "Скомпилировать документ"
 
 #: ../data/ui/gummi.glade.h:76
 msgid ""
 "Compile LaTeX document\n"
 "and update preview."
 msgstr ""
+"Скомпилировать документ LaTeX\n"
+"и обновить предпросмотр."
 
 #: ../data/ui/gummi.glade.h:78
 #, fuzzy
@@ -310,20 +319,24 @@ msgid "Set Compilation Options"
 msgstr "Шаблон настроек:"
 
 #: ../data/ui/gummi.glade.h:79
+#, fuzzy
 msgid "_Cleanup Build Files"
-msgstr ""
+msgstr "Очистить файлы сборки"
 
 #: ../data/ui/gummi.glade.h:80
+#, fuzzy
 msgid "Run _Makeindex"
-msgstr ""
+msgstr "Запустить Makeindex"
 
 #: ../data/ui/gummi.glade.h:81
+#, fuzzy
 msgid "Run _BibTeX"
-msgstr ""
+msgstr "Запустить BibTeX"
 
 #: ../data/ui/gummi.glade.h:82
+#, fuzzy
 msgid "Document _Statistics"
-msgstr ""
+msgstr "Статистика документа"
 
 #: ../data/ui/gummi.glade.h:83
 #, fuzzy
@@ -331,12 +344,14 @@ msgid "Enable S_pell Checking"
 msgstr "Проверка орфографии для зыка:"
 
 #: ../data/ui/gummi.glade.h:84
+#, fuzzy
 msgid "Enable S_nippets"
-msgstr ""
+msgstr "Разрешить сниппеты"
 
 #: ../data/ui/gummi.glade.h:85
+#, fuzzy
 msgid "_Project"
-msgstr ""
+msgstr "Проект"
 
 #: ../data/ui/gummi.glade.h:86
 #, fuzzy
@@ -348,10 +363,12 @@ msgid ""
 "This function requires the current\n"
 "active document to be saved. "
 msgstr ""
+"Эта функция требует, чтобы активный\n"
+"документ был сохранён. "
 
 #: ../data/ui/gummi.glade.h:89
 msgid "Open Project"
-msgstr ""
+msgstr "Открыть проект"
 
 #: ../data/ui/gummi.glade.h:90
 #, fuzzy
@@ -363,16 +380,18 @@ msgid "_Help"
 msgstr "_Справка"
 
 #: ../data/ui/gummi.glade.h:92
+#, fuzzy
 msgid "User _Guide"
-msgstr ""
+msgstr "Руководство пользователя"
 
 #: ../data/ui/gummi.glade.h:93
 msgid "Check _Updates"
 msgstr "Проверить _обновления"
 
 #: ../data/ui/gummi.glade.h:94
+#, fuzzy
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #: ../data/ui/gummi.glade.h:95
 msgid "Open"
@@ -445,15 +464,16 @@ msgstr "Область предпросмотра"
 
 #: ../data/ui/gummi.glade.h:112
 msgid "Build Log"
-msgstr ""
+msgstr "Журнал сборки"
 
 #: ../data/ui/gummi.glade.h:113
 msgid "Nr of files:"
-msgstr ""
+msgstr "Кол-во файлов:"
 
 #: ../data/ui/gummi.glade.h:114
+#, fuzzy
 msgid "Root path:"
-msgstr ""
+msgstr "Корневой путь:"
 
 #: ../data/ui/gummi.glade.h:115
 #, fuzzy
@@ -462,7 +482,7 @@ msgstr "Скомпилировать"
 
 #: ../data/ui/gummi.glade.h:116 ../data/ui/prefs.glade.h:9
 msgid "   "
-msgstr ""
+msgstr "   "
 
 #: ../data/ui/gummi.glade.h:117
 #, fuzzy
@@ -479,16 +499,20 @@ msgid ""
 "Select a file to add it \n"
 "to the active project. "
 msgstr ""
+"Выбрать файл и добавить его \n"
+"в активный проект. "
 
 #: ../data/ui/gummi.glade.h:121
 msgid ""
 "Remove the selected\n"
 "file from the project."
 msgstr ""
+"Удалить выбранный\n"
+"файл из проекта."
 
 #: ../data/ui/gummi.glade.h:123
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #: ../data/ui/gummi.glade.h:124
 msgid "Filename:"
@@ -507,14 +531,17 @@ msgid "N/A"
 msgstr "N/A"
 
 #: ../data/ui/gummi.glade.h:128
+#, fuzzy
 msgid "Detect"
-msgstr ""
+msgstr "Определить автоматически"
 
 #: ../data/ui/gummi.glade.h:129
 msgid ""
 "Detect mention of a bibtex\n"
 "file in the current document"
 msgstr ""
+"Определить, упоминается ли файл bibtex\n"
+"в текущем документе"
 
 #: ../data/ui/gummi.glade.h:131
 msgid "Compile"
@@ -537,11 +564,11 @@ msgstr "Заголовок"
 
 #: ../data/ui/gummi.glade.h:136
 msgid "Author"
-msgstr ""
+msgstr "Автор"
 
 #: ../data/ui/gummi.glade.h:137
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #: ../data/ui/gummi.glade.h:138
 msgid "filter:"
@@ -557,7 +584,7 @@ msgstr "Искать в:"
 
 #: ../data/ui/gummi.glade.h:141
 msgid "Replace with:"
-msgstr ""
+msgstr "Заменить на:"
 
 #: ../data/ui/gummi.glade.h:142
 msgid "Match entire word only"
@@ -572,16 +599,18 @@ msgid "Match case"
 msgstr "Учитывать регистр"
 
 #: ../data/ui/gummi.glade.h:145
+#, fuzzy
 msgid "_Replace"
-msgstr ""
+msgstr "Заменить"
 
 #: ../data/ui/gummi.glade.h:146
+#, fuzzy
 msgid "Replace _All"
-msgstr ""
+msgstr "Заменить все"
 
 #: ../data/ui/gummi.glade.h:147
 msgid "Save early.. save often!"
-msgstr ""
+msgstr "Сохраняйтесь чаще!"
 
 #: ../data/ui/gummi.glade.h:148
 #, fuzzy
@@ -593,19 +622,20 @@ msgid ""
 "Make a template from the \n"
 "current active document."
 msgstr ""
+"Создать шаблон из \n"
+"текущего документа."
 
 #: ../data/ui/gummi.glade.h:151
 msgid "Deletes the selected template"
-msgstr ""
+msgstr "Удаляет выбранный шаблон"
 
 #: ../data/ui/gummi.glade.h:152
 msgid "Open the selected template"
-msgstr ""
+msgstr "Открыть выбранный шаблон"
 
 #: ../data/ui/gummi.glade.h:153
-#, fuzzy
 msgid "10"
-msgstr "0"
+msgstr "10"
 
 #: ../data/ui/prefs.glade.h:1
 #, fuzzy
@@ -623,15 +653,15 @@ msgstr "None"
 
 #: ../data/ui/prefs.glade.h:4
 msgid "Always"
-msgstr ""
+msgstr "Всегда"
 
 #: ../data/ui/prefs.glade.h:5
 msgid "Only when syncing preview with editor"
-msgstr ""
+msgstr "Только во время синхронизации предпросмотра с редактором"
 
 #: ../data/ui/prefs.glade.h:6
 msgid "Never"
-msgstr ""
+msgstr "Никогда"
 
 #: ../data/ui/prefs.glade.h:7
 msgid "Gummi Preferences"
@@ -673,24 +703,27 @@ msgid "View"
 msgstr "Вид"
 
 #: ../data/ui/prefs.glade.h:17
+#, fuzzy
 msgid "Tab stops"
-msgstr ""
+msgstr "Абзацы"
 
 #: ../data/ui/prefs.glade.h:18
 msgid "Tab width:"
-msgstr ""
+msgstr "Ширина табуляции:"
 
 #: ../data/ui/prefs.glade.h:19
+#, fuzzy
 msgid "Insert _spaces instead of tabs"
-msgstr ""
+msgstr "Вставлять пробелы вместо знаков табуляции"
 
 #: ../data/ui/prefs.glade.h:20
 msgid "Automatic Indentation"
 msgstr "Автоматический отступ"
 
 #: ../data/ui/prefs.glade.h:21
+#, fuzzy
 msgid "_Enable automatic indentation"
-msgstr ""
+msgstr "Разрешить автоматическую расстановку отступов"
 
 #: ../data/ui/prefs.glade.h:22
 msgid "Snippets"
@@ -698,7 +731,7 @@ msgstr "Фрагменты текста"
 
 #: ../data/ui/prefs.glade.h:23
 msgid "Configure snippets"
-msgstr ""
+msgstr "Настроить сниппеты"
 
 #: ../data/ui/prefs.glade.h:24
 #, fuzzy
@@ -728,7 +761,7 @@ msgstr "Цветовая схема"
 
 #: ../data/ui/prefs.glade.h:30
 msgid "Font & Colors"
-msgstr ""
+msgstr "Шрифты и цвета"
 
 #: ../data/ui/prefs.glade.h:31
 msgid "Default Text"
@@ -741,15 +774,15 @@ msgstr "Верстка команд:"
 
 #: ../data/ui/prefs.glade.h:33
 msgid "TeXLive with PdfTeX"
-msgstr ""
+msgstr "TeXLive с PdfTeX"
 
 #: ../data/ui/prefs.glade.h:34
 msgid "This program was not found on your system."
-msgstr ""
+msgstr "Данная программа не была найдена в вашей системе."
 
 #: ../data/ui/prefs.glade.h:35
 msgid "TeXLive with XeTeX"
-msgstr ""
+msgstr "TeXLive с XeTeX"
 
 #: ../data/ui/prefs.glade.h:36
 msgid "Rubber"
@@ -765,28 +798,30 @@ msgid "Typesetter options"
 msgstr "Верстка команд:"
 
 #: ../data/ui/prefs.glade.h:39
+#, fuzzy
 msgid "Use shell-escape"
-msgstr ""
+msgstr "Использовать экранирование"
 
 #: ../data/ui/prefs.glade.h:40
 msgid "Enable SyncTeX"
-msgstr ""
+msgstr "Разрешить использование SyncTeX"
 
 #: ../data/ui/prefs.glade.h:41
+#, fuzzy
 msgid "Compilation steps"
-msgstr ""
+msgstr "Шаги компиляции"
 
 #: ../data/ui/prefs.glade.h:42
 msgid "TeX → PDF"
-msgstr ""
+msgstr "TeX → PDF"
 
 #: ../data/ui/prefs.glade.h:43
 msgid "TeX → DVI → PDF"
-msgstr ""
+msgstr "TeX → DVI → PDF"
 
 #: ../data/ui/prefs.glade.h:44
 msgid "TeX → DVI → PS → PDF"
-msgstr ""
+msgstr "TeX → DVI → PS → PDF"
 
 #: ../data/ui/prefs.glade.h:45
 #, fuzzy
@@ -803,15 +838,15 @@ msgstr "секунд"
 
 #: ../data/ui/prefs.glade.h:48
 msgid "Use animated scroll"
-msgstr ""
+msgstr "Использовать анимированную прокрутку"
 
 #: ../data/ui/prefs.glade.h:49
 msgid "Cache size"
-msgstr ""
+msgstr "Размер кэша"
 
 #: ../data/ui/prefs.glade.h:50
 msgid "MB"
-msgstr ""
+msgstr "Мб"
 
 #: ../data/ui/prefs.glade.h:51
 #, fuzzy
@@ -830,11 +865,11 @@ msgstr "Компиляция PDF"
 
 #: ../data/ui/prefs.glade.h:54
 msgid "Automatically export PDF on document save"
-msgstr ""
+msgstr "Автоматически экспортировать в PDF при сохранении"
 
 #: ../data/ui/prefs.glade.h:55
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Разное"
 
 #: ../data/ui/prefs.glade.h:56
 msgid "_Reset defaults"
@@ -845,8 +880,9 @@ msgid "Snippets Manager"
 msgstr "Обозреватель фрагментов"
 
 #: ../data/ui/snippets.glade.h:2
+#, fuzzy
 msgid "_Reset"
-msgstr ""
+msgstr "Сброс"
 
 #: ../data/ui/snippets.glade.h:3
 #, fuzzy
@@ -855,7 +891,7 @@ msgstr "_Сбросить по умолчанию"
 
 #: ../data/ui/snippets.glade.h:4
 msgid "Snippets:"
-msgstr ""
+msgstr "Сниппеты:"
 
 #: ../data/ui/snippets.glade.h:5
 #, fuzzy
@@ -874,7 +910,7 @@ msgstr "_Изменить"
 
 #: ../data/ui/snippets.glade.h:8
 msgid "Insert macro"
-msgstr ""
+msgstr "Вставить макрос"
 
 #: ../data/ui/snippets.glade.h:9
 #, fuzzy
@@ -887,8 +923,9 @@ msgid "filename"
 msgstr "Имя файла:"
 
 #: ../data/ui/snippets.glade.h:11
+#, fuzzy
 msgid "basename"
-msgstr ""
+msgstr "базовое имя"
 
 #: ../data/ui/snippets.glade.h:12
 msgid "Activation"
@@ -905,24 +942,24 @@ msgstr ""
 
 #: ../data/ui/snippets.glade.h:15
 msgid "Shortcut key:"
-msgstr ""
+msgstr "Горячая клавиша:"
 
 #: ../src/gui/gui-import.c:229
 #, c-format
 msgid "%s: No such file or directory\n"
-msgstr ""
+msgstr "%s: Нет такого файла или каталога\n"
 
 #: ../src/gui/gui-infoscreen.c:117
 msgid "PDF preview could not initialise."
-msgstr ""
+msgstr "Не удалось инициализировать предпросмотр PDF."
 
 #: ../src/gui/gui-infoscreen.c:118
 msgid "Document appears to be empty or invalid."
-msgstr ""
+msgstr "Документ пуст или повреждён."
 
 #: ../src/gui/gui-infoscreen.c:119
 msgid "Compilation program is missing."
-msgstr ""
+msgstr "Отсутствует программа для компиляции."
 
 #: ../src/gui/gui-infoscreen.c:128
 msgid ""
@@ -931,6 +968,10 @@ msgid ""
 "are resolved. Additional information is available on\n"
 "the Build log tab.\n"
 msgstr ""
+"В активном документе есть ошибки. Функция синхронного предпросмотра\n"
+"продолжит работу автоматически, когда эти ошибки\n"
+"будет исправлены. Дополнительная информация доступна на вкладке\n"
+"\"Журнал сборки\".\n"
 
 #: ../src/gui/gui-infoscreen.c:133
 msgid ""
@@ -962,7 +1003,7 @@ msgstr ""
 #: ../src/gui/gui-main.c:524
 #, c-format
 msgid "Loading template ..."
-msgstr ""
+msgstr "Загрузка шаблона..."
 
 #: ../src/gui/gui-main.c:593
 #, fuzzy
@@ -985,14 +1026,14 @@ msgid "Error compiling bibliography file"
 msgstr "_Скомпилировать библиографию"
 
 #: ../src/gui/gui-main.c:634
-#, c-format
+#, fuzzy, c-format
 msgid "%s loaded"
-msgstr ""
+msgstr "%s загружен"
 
 #: ../src/gui/gui-main.c:744
 #, c-format
 msgid "Do you want to save the changes to %s?"
-msgstr ""
+msgstr "Вы хотите сохранить изменения в %s?"
 
 #: ../src/gui/gui-main.c:745
 #, fuzzy
@@ -1001,7 +1042,7 @@ msgstr "Создать новый документ"
 
 #: ../src/gui/gui-main.c:753
 msgid "Unsaved Changes"
-msgstr ""
+msgstr "Несохранённые изменения"
 
 #: ../src/gui/gui-main.c:775
 #, fuzzy
@@ -1010,7 +1051,7 @@ msgstr "Создать новый документ"
 
 #: ../src/gui/gui-main.c:778
 msgid "Select an image to insert"
-msgstr ""
+msgstr "Выберите изображение для вставки"
 
 #: ../src/gui/gui-main.c:779
 #, fuzzy
@@ -1029,7 +1070,7 @@ msgstr "Создать новый документ"
 
 #: ../src/gui/gui-main.c:814
 msgid "Export to PDF"
-msgstr ""
+msgstr "Экспортировать в PDF"
 
 #: ../src/gui/gui-main.c:817
 #, fuzzy
@@ -1043,7 +1084,7 @@ msgstr "Открыть файл"
 
 #: ../src/gui/gui-main.c:867
 msgid "Text files"
-msgstr ""
+msgstr "Текстовые файлы"
 
 #. Only \insertgraphics uses this section now. Make sure
 #. * the patterns & mimes are correct before assigning it
@@ -1055,7 +1096,7 @@ msgstr "Изображение"
 
 #: ../src/gui/gui-main.c:898
 msgid "Bibtex files"
-msgstr ""
+msgstr "Файлы Bibtex"
 
 #: ../src/gui/gui-main.c:904
 #, fuzzy
@@ -1069,19 +1110,19 @@ msgstr ""
 
 #: ../src/gui/gui-menu.c:413
 msgid "Succesfully removed build files.."
-msgstr ""
+msgstr "Файлы сборки успешно удалены."
 
 #: ../src/gui/gui-menu.c:416
 msgid "Error removing build files.."
-msgstr ""
+msgstr "Ошибка при удалении файлов сборки."
 
 #: ../src/gui/gui-menu.c:423
 msgid "Running Makeindex.."
-msgstr ""
+msgstr "Запуск Makeindex..."
 
 #: ../src/gui/gui-menu.c:426
 msgid "Error running Makeindex.."
-msgstr ""
+msgstr "Ошибка при запуске Makeindex."
 
 #: ../src/gui/gui-menu.c:450
 #, fuzzy
@@ -1089,16 +1130,18 @@ msgid "Words in text"
 msgstr "Жирный текст"
 
 #: ../src/gui/gui-menu.c:451
+#, fuzzy
 msgid "Words in headers"
-msgstr ""
+msgstr "Слова в заголовках"
 
 #: ../src/gui/gui-menu.c:452
+#, fuzzy
 msgid "Words in float captions"
-msgstr ""
+msgstr "Слова в плавающих заголовках"
 
 #: ../src/gui/gui-menu.c:453
 msgid "Number of headers"
-msgstr ""
+msgstr "Число заголовков"
 
 #: ../src/gui/gui-menu.c:454
 msgid "Number of floats"
@@ -1117,9 +1160,9 @@ msgid "This function requires an active document"
 msgstr ""
 
 #: ../src/gui/gui-preview.c:904
-#, c-format
+#, fuzzy, c-format
 msgid "of %d"
-msgstr ""
+msgstr "из %d"
 
 #: ../src/gui/gui-snippets.c:329
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index a1155c4..30e4f6c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2011-11-07 20:48+0100\n"
 "Last-Translator: Kess Vargavind <vargavind at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/ar.po b/po/template.pot
similarity index 84%
copy from po/ar.po
copy to po/template.pot
index c1d0b68..82b7538 100644
--- a/po/ar.po
+++ b/po/template.pot
@@ -8,57 +8,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
-"PO-Revision-Date: 2011-03-22 17:7+0300\n"
-"Last-Translator: Hamad Mohammad\n"
-"Language-Team: www.linuxac.org\n"
-"Language: ar\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/ui/gummi.glade.h:1
-#, fuzzy
 msgid "Document statistics"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:2
-#, fuzzy
 msgid "Document name"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:3
-#, fuzzy
 msgid "Words in:"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:4
-#, fuzzy
 msgid "       "
-msgstr "        "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:5
-#, fuzzy
 msgid "text"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:6
 msgid "0"
-msgstr "0"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:7
-#, fuzzy
 msgid "headers"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:8
 msgid "float captions"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:9
-#, fuzzy
 msgid "Number of:"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:10
 msgid "floats"
@@ -74,7 +67,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:13
 msgid "File:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:14
 msgid "Style:"
@@ -82,27 +75,27 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:15
 msgid "Caption:"
-msgstr " :"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:16
 msgid "Label:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:17
 msgid "Scale:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:18
 msgid "Rows:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:19
 msgid "Columns:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:20
 msgid "Bracket:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:21
 msgid "Unbracketed"
@@ -122,92 +115,92 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:25
 msgid "Single line"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:26
 msgid "Double line"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:27
 msgid "Best Fit"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:28
 msgid "Fit Page Width"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:30
 #, no-c-format
 msgid "50%"
-msgstr "50%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:32
 #, no-c-format
 msgid "70%"
-msgstr "70%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:34
 #, no-c-format
 msgid "85%"
-msgstr "85%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:36
 #, no-c-format
 msgid "100%"
-msgstr "100%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:38
 #, no-c-format
 msgid "125%"
-msgstr "125%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:40
 #, no-c-format
 msgid "150%"
-msgstr "150%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:42
 #, no-c-format
 msgid "200%"
-msgstr "200%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:44
 #, no-c-format
 msgid "300%"
-msgstr "300%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:46
 #, no-c-format
 msgid "400%"
-msgstr "400%"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:47
 msgid "Align left"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:48
 msgid "Align center"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:49
 msgid "Align right"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:50
 msgid "No borders"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:51
 msgid "Border outline"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:52
 msgid "Border all cells"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:53
 msgid "Gummi - LaTeX Editor"
-msgstr "Gummi -  LaTeX"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:54
 msgid "_File"
@@ -215,19 +208,19 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:55
 msgid "New from _Template"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:56
 msgid "_Open..."
-msgstr "..."
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:57
 msgid "Save _As..."
-msgstr " ..."
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:58
 msgid "_Export to PDF"
-msgstr "  PDF"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:59
 msgid "shouldnotseeme"
@@ -243,15 +236,15 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:62
 msgid "_Statusbar"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:63
 msgid "_Toolbar"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:64
 msgid "_Right Pane"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:65
 msgid ""
@@ -268,9 +261,8 @@ msgid "Page Layout in Preview"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:68
-#, fuzzy
 msgid "Single Page"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:69
 msgid "Continuous, One Column"
@@ -278,7 +270,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:70
 msgid "_Fullscreen"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:71
 msgid "_Search"
@@ -286,21 +278,19 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:72
 msgid "Find Ne_xt"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:73
 msgid "Find Pre_vious"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:74
-#, fuzzy
 msgid "_Document"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:75
-#, fuzzy
 msgid "Compile _Document"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:76
 msgid ""
@@ -325,9 +315,8 @@ msgid "Run _BibTeX"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:82
-#, fuzzy
 msgid "Document _Statistics"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:83
 msgid "Enable S_pell Checking"
@@ -342,9 +331,8 @@ msgid "_Project"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:86
-#, fuzzy
 msgid "Create new Project"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:87 ../src/gui/gui-menu.c:606
 msgid ""
@@ -357,9 +345,8 @@ msgid "Open Project"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:90
-#, fuzzy
 msgid "Close Project"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:91
 msgid "_Help"
@@ -371,7 +358,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:93
 msgid "Check _Updates"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:94
 msgid "New"
@@ -379,11 +366,11 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:95
 msgid "Open"
-msgstr "افتح"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:96
 msgid "Save"
-msgstr "احفظ"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:97
 msgid "toolbutton5"
@@ -410,17 +397,16 @@ msgid "toolbutton3"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:103
-#, fuzzy
 msgid "  "
-msgstr "   "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:104
 msgid "Image"
-msgstr "صورة"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:105
 msgid "Table"
-msgstr "جدول"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:106
 msgid "Matrix"
@@ -444,7 +430,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:111
 msgid "Preview Pane"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:112
 msgid "Build Log"
@@ -459,23 +445,20 @@ msgid "Root path:"
 msgstr ""
 
 #: ../data/ui/gummi.glade.h:115
-#, fuzzy
 msgid "Project name:"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:116 ../data/ui/prefs.glade.h:9
 msgid "   "
-msgstr "   "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:117
-#, fuzzy
 msgid "Document"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:118
-#, fuzzy
 msgid "File path"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:119
 msgid ""
@@ -495,15 +478,15 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:124
 msgid "Filename:"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:125 ../src/gui/gui-main.c:644
 msgid "none"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:126
 msgid "References:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:127 ../src/gui/gui-main.c:645
 msgid "N/A"
@@ -535,7 +518,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:135
 msgid "Title"
-msgstr "العنوان"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:136
 msgid "Author"
@@ -547,31 +530,31 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:138
 msgid "filter:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:139
 msgid "Find"
-msgstr "ابحث"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:140
 msgid "Search for:"
-msgstr " :"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:141
 msgid "Replace with:"
-msgstr " :"
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:142
 msgid "Match entire word only"
-msgstr "   "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:143
 msgid "Search backwards"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:144
 msgid "Match case"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:145
 msgid "_Replace"
@@ -579,7 +562,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:146
 msgid "Replace _All"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:147
 msgid "Save early.. save often!"
@@ -587,7 +570,7 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:148
 msgid "Create new document from template.."
-msgstr "    .."
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:149
 msgid ""
@@ -597,16 +580,15 @@ msgstr ""
 
 #: ../data/ui/gummi.glade.h:151
 msgid "Deletes the selected template"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:152
 msgid "Open the selected template"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/gummi.glade.h:153
-#, fuzzy
 msgid "10"
-msgstr "0"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:1
 msgid "compile when idle for "
@@ -614,7 +596,7 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:2
 msgid "compile every"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:3
 msgid "None"
@@ -634,15 +616,15 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:7
 msgid "Gummi Preferences"
-msgstr " Gummi"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:8
 msgid "Text wrapping"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:10
 msgid "Enable text wrapping"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:11
 msgid "Do not split words over two lines"
@@ -650,11 +632,11 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:12
 msgid "Line numbers"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:13
 msgid "Display line numbers"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:14
 msgid "Highlighting"
@@ -662,11 +644,11 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:15
 msgid "Highlight current line"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:16
 msgid "View"
-msgstr "اعرض"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:17
 msgid "Tab stops"
@@ -674,31 +656,31 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:18
 msgid "Tab width:"
-msgstr " :"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:19
 msgid "Insert _spaces instead of tabs"
-msgstr "    "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:20
 msgid "Automatic Indentation"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:21
 msgid "_Enable automatic indentation"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:22
 msgid "Snippets"
-msgstr "قصاصات"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:23
 msgid "Configure snippets"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:24
 msgid "File saving"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:25
 msgid "_Autosave files every"
@@ -710,27 +692,27 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:27
 msgid "Editor"
-msgstr "المحرر"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:28
 msgid "Editor font"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:29
 msgid "Color Scheme"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:30
 msgid "Font & Colors"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:31
 msgid "Default Text"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:32
 msgid "Typesetter command"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:33
 msgid "TeXLive with PdfTeX"
@@ -753,9 +735,8 @@ msgid "Latexmk"
 msgstr ""
 
 #: ../data/ui/prefs.glade.h:38
-#, fuzzy
 msgid "Typesetter options"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:39
 msgid "Use shell-escape"
@@ -782,13 +763,12 @@ msgid "TeX → DVI → PS → PDF"
 msgstr ""
 
 #: ../data/ui/prefs.glade.h:45
-#, fuzzy
 msgid "Compilation"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:46
 msgid "PDF Compiling"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:47
 msgid "seconds"
@@ -807,18 +787,16 @@ msgid "MB"
 msgstr ""
 
 #: ../data/ui/prefs.glade.h:51
-#, fuzzy
 msgid "Preview"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:52
 msgid "Spell check language"
 msgstr ""
 
 #: ../data/ui/prefs.glade.h:53
-#, fuzzy
 msgid "PDF Exporting"
-msgstr " PDF"
+msgstr ""
 
 #: ../data/ui/prefs.glade.h:54
 msgid "Automatically export PDF on document save"
@@ -830,11 +808,11 @@ msgstr ""
 
 #: ../data/ui/prefs.glade.h:56
 msgid "_Reset defaults"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:1
 msgid "Snippets Manager"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:2
 msgid "_Reset"
@@ -842,39 +820,35 @@ msgstr ""
 
 #: ../data/ui/snippets.glade.h:3
 msgid "Reset all snippets"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:4
 msgid "Snippets:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:5
-#, fuzzy
 msgid "Create a new snippet"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:6
-#, fuzzy
 msgid "Remove selected snippet"
-msgstr "  "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:7
 msgid "Edit:"
-msgstr ":"
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:8
 msgid "Insert macro"
 msgstr ""
 
 #: ../data/ui/snippets.glade.h:9
-#, fuzzy
 msgid "selected text"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:10
-#, fuzzy
 msgid "filename"
-msgstr " "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:11
 msgid "basename"
@@ -882,11 +856,11 @@ msgstr ""
 
 #: ../data/ui/snippets.glade.h:12
 msgid "Activation"
-msgstr "تنشيط"
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:13
 msgid "    "
-msgstr "    "
+msgstr ""
 
 #: ../data/ui/snippets.glade.h:14
 msgid "Tab trigger:"
@@ -894,7 +868,7 @@ msgstr ""
 
 #: ../data/ui/snippets.glade.h:15
 msgid "Shortcut key:"
-msgstr " :"
+msgstr ""
 
 #: ../src/gui/gui-import.c:229
 #, c-format
@@ -945,7 +919,7 @@ msgstr ""
 
 #: ../src/gui/gui-main.c:420 ../src/latex.c:270
 msgid "The file already exists. Overwrite?"
-msgstr "      "
+msgstr ""
 
 #. add Loading message to status bar
 #: ../src/gui/gui-main.c:524
@@ -955,36 +929,33 @@ msgstr ""
 
 #: ../src/gui/gui-main.c:593
 msgid "Compiling bibliography file..."
-msgstr "  ..."
+msgstr ""
 
 #: ../src/gui/gui-main.c:595
-#, fuzzy
 msgid "Bibliography compiled without errors"
-msgstr "   "
+msgstr ""
 
 #: ../src/gui/gui-main.c:599
 msgid "Error compiling bibliography file or none detected..."
 msgstr ""
 
 #: ../src/gui/gui-main.c:601
-#, fuzzy
 msgid "Error compiling bibliography file"
-msgstr "   "
+msgstr ""
 
 #: ../src/gui/gui-main.c:634
 #, c-format
 msgid "%s loaded"
-msgstr "%s "
+msgstr ""
 
 #: ../src/gui/gui-main.c:744
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to save the changes to %s?"
-msgstr "   "
+msgstr ""
 
 #: ../src/gui/gui-main.c:745
-#, fuzzy
 msgid "this document"
-msgstr "  LaTeX"
+msgstr ""
 
 #: ../src/gui/gui-main.c:753
 msgid "Unsaved Changes"
@@ -992,37 +963,35 @@ msgstr ""
 
 #: ../src/gui/gui-main.c:775
 msgid "Open LaTeX document"
-msgstr "  LaTeX"
+msgstr ""
 
 #: ../src/gui/gui-main.c:778
 msgid "Select an image to insert"
-msgstr "  "
+msgstr ""
 
 #: ../src/gui/gui-main.c:779
 msgid "Select bibliography file"
-msgstr "  "
+msgstr ""
 
 #: ../src/gui/gui-main.c:812
 msgid "Save LaTeX document"
-msgstr "  LaTeX"
+msgstr ""
 
 #: ../src/gui/gui-main.c:813
 msgid "Save as LaTeX document"
-msgstr "  LaTeX"
+msgstr ""
 
 #: ../src/gui/gui-main.c:814
 msgid "Export to PDF"
-msgstr "  PDF"
+msgstr ""
 
 #: ../src/gui/gui-main.c:817
-#, fuzzy
 msgid "Create project"
-msgstr "  "
+msgstr ""
 
 #: ../src/gui/gui-main.c:862
-#, fuzzy
 msgid "LaTeX files"
-msgstr " "
+msgstr ""
 
 #: ../src/gui/gui-main.c:867
 msgid "Text files"
@@ -1040,9 +1009,8 @@ msgid "Bibtex files"
 msgstr ""
 
 #: ../src/gui/gui-main.c:904
-#, fuzzy
 msgid "Gummi project files"
-msgstr " Gummi"
+msgstr ""
 
 #: ../src/gui/gui-menu.c:184
 #, c-format
@@ -1067,11 +1035,11 @@ msgstr ""
 
 #: ../src/gui/gui-menu.c:450
 msgid "Words in text"
-msgstr "  "
+msgstr ""
 
 #: ../src/gui/gui-menu.c:451
 msgid "Words in headers"
-msgstr "  "
+msgstr ""
 
 #: ../src/gui/gui-menu.c:452
 msgid "Words in float captions"
@@ -1079,7 +1047,7 @@ msgstr ""
 
 #: ../src/gui/gui-menu.c:453
 msgid "Number of headers"
-msgstr " "
+msgstr ""
 
 #: ../src/gui/gui-menu.c:454
 msgid "Number of floats"
@@ -1109,7 +1077,7 @@ msgstr ""
 
 #: ../src/gui/gui-snippets.c:343
 msgid "Type a new shortcut"
-msgstr "   "
+msgstr ""
 
 #: ../src/gui/gui-snippets.c:346
 msgid "Type a new shortcut, or press Backspace to clear"
@@ -1126,14 +1094,14 @@ msgstr ""
 #: ../src/iofunctions.c:130
 #, c-format
 msgid "Saving %s..."
-msgstr " %s..."
+msgstr ""
 
 #: ../src/iofunctions.c:166
 #, c-format
 msgid ""
 "%s\n"
 "Please try again later."
-msgstr "   ."
+msgstr ""
 
 #: ../src/iofunctions.c:239
 msgid "Can not convert text to UTF-8!\n"
@@ -1164,7 +1132,7 @@ msgstr ""
 
 #: ../src/update.c:116
 msgid "Update Check"
-msgstr " "
+msgstr ""
 
 #: ../src/utils.c:122
 #, c-format
@@ -1177,76 +1145,3 @@ msgstr ""
 #: ../src/utils.c:168
 msgid "Confirmation"
 msgstr ""
-
-#, fuzzy
-#~ msgid "         "
-#~ msgstr "        "
-
-#~ msgid "Bold text"
-#~ msgstr " "
-
-#~ msgid "Center text"
-#~ msgstr " "
-
-#~ msgid "Italic text"
-#~ msgstr " "
-
-#~ msgid "Load a file"
-#~ msgstr " "
-
-#~ msgid "Save the current file"
-#~ msgstr "  "
-
-#~ msgid "Underline text"
-#~ msgstr "  "
-
-#~ msgid "Hello svn user!"
-#~ msgstr "  svn"
-
-#, fuzzy
-#~ msgid "Include document"
-#~ msgstr "  LaTeX"
-
-#, fuzzy
-#~ msgid "New document"
-#~ msgstr "  "
-
-#, fuzzy
-#~ msgid "Open file"
-#~ msgstr " "
-
-#~ msgid ""
-#~ "Alignment of the\n"
-#~ "cell content."
-#~ msgstr "  "
-
-#~ msgid "Error output"
-#~ msgstr "  "
-
-#~ msgid "_Compile Bibliography"
-#~ msgstr " "
-
-#~ msgid "_Insert Bibliography"
-#~ msgstr " "
-
-#~ msgid "Command: "
-#~ msgstr ": "
-
-#~ msgid "Extra flags:"
-#~ msgstr " :"
-
-#~ msgid "pdflatex"
-#~ msgstr "pdflatex"
-
-#~ msgid "xelatex"
-#~ msgstr "xelatex"
-
-#~ msgid "Autosaving file %s"
-#~ msgstr "  %s "
-
-#, fuzzy
-#~ msgid "The active tab is not a valid LaTeX document"
-#~ msgstr "  LaTeX"
-
-#~ msgid "_Document Statistics"
-#~ msgstr " "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5003e64..7b2e9ca 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2012-03-14 22:17+0800\n"
 "Last-Translator: mathlab <mathlab at sina.com>\n"
 "Language-Team: \n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 62480e9..cc688eb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 14:23+0200\n"
+"POT-Creation-Date: 2012-11-13 07:54+0100\n"
 "PO-Revision-Date: 2010-05-21 22:11+0800\n"
 "Last-Translator: AZ Huang <aitjcize at gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..4a79744
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,14 @@
+# Releases use autotools, this makefile is for development purposes. 
+
+TARGET=gummi
+
+OBJS = main.o gui/gui-main.o syncTeX/synctex_parser.o syncTeX/synctex_parser_utils.o gui/gui-prefs.o gui/gui-menu.o gui/gui-search.o gui/gui-import.o gui/gui-preview.o gui/gui-tabmanager.o gui/gui-project.o gui/gui-snippets.o gui/gui-infoscreen.o compile/texlive.o compile/rubber.o compile/latexmk.o motion.o external.o latex.o editor.o utils.o configfile.o iofunctions.o environment.o project.o importer.o tabmanager.o template.o biblio.o snippets.o signals.o 
+
+
+CFLAGS=-g -Wall -export-dynamic -I. `pkg-config --cflags --libs gtk+-2.0 gthread-2.0 gtksourceview-2.0 cairo poppler-glib gtkspell-2.0 zlib` -lm -DUSE_GTKSPELL -DGUMMI_LOCALES="\"/usr/share/locale\"" -DGUMMI_DATA="\"$$PWD/../data\"" -DGUMMI_LIBS="\"$$PWD/../lib\""
+
+gummi: $(OBJS)
+	$(CC) -o $(TARGET) $(OBJS) $(CFLAGS)
+
+clean:
+	rm -f $(TARGET) $(OBJS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3b7b6d4..0311655 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 bin_PROGRAMS = gummi
 AM_CFLAGS = $(GUI_CFLAGS) \
 	    -export-dynamic -Wall -O2 \
@@ -36,7 +38,6 @@ gummi_SOURCES = biblio.c  biblio.h \
 		signals.c signals.h \
 		snippets.c snippets.h \
 		template.c template.h \
-		update.c update.h \
 		utils.c utils.h \
 		tabmanager.c tabmanager.h \
 		constants.h porting.h \
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index ecc11e1..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,816 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-bin_PROGRAMS = gummi$(EXEEXT)
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_gummi_OBJECTS = biblio.$(OBJEXT) configfile.$(OBJEXT) \
-	editor.$(OBJEXT) environment.$(OBJEXT) texlive.$(OBJEXT) \
-	latexmk.$(OBJEXT) rubber.$(OBJEXT) gui-menu.$(OBJEXT) \
-	gui-tabmanager.$(OBJEXT) gui-import.$(OBJEXT) \
-	gui-main.$(OBJEXT) gui-prefs.$(OBJEXT) gui-preview.$(OBJEXT) \
-	gui-search.$(OBJEXT) gui-snippets.$(OBJEXT) \
-	gui-infoscreen.$(OBJEXT) gui-project.$(OBJEXT) \
-	synctex_parser.$(OBJEXT) synctex_parser_utils.$(OBJEXT) \
-	importer.$(OBJEXT) iofunctions.$(OBJEXT) external.$(OBJEXT) \
-	project.$(OBJEXT) latex.$(OBJEXT) motion.$(OBJEXT) \
-	signals.$(OBJEXT) snippets.$(OBJEXT) template.$(OBJEXT) \
-	update.$(OBJEXT) utils.$(OBJEXT) tabmanager.$(OBJEXT) \
-	main.$(OBJEXT)
-gummi_OBJECTS = $(am_gummi_OBJECTS)
-am__DEPENDENCIES_1 =
-gummi_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(gummi_SOURCES)
-DIST_SOURCES = $(gummi_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GUI_CFLAGS = @GUI_CFLAGS@
-GUI_LIBS = @GUI_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_GTKSPELL = @USE_GTKSPELL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtksourceview_CFLAGS = @gtksourceview_CFLAGS@
-gtksourceview_LIBS = @gtksourceview_LIBS@
-gtkspell_CFLAGS = @gtkspell_CFLAGS@
-gtkspell_LIBS = @gtkspell_LIBS@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-poppler_CFLAGS = @poppler_CFLAGS@
-poppler_LIBS = @poppler_LIBS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = $(GUI_CFLAGS) \
-	    -export-dynamic -Wall -O2 \
-	    -DGUMMI_LIBS=\"$(libdir)/$(PACKAGE)\" \
-	    -DGUMMI_DATA=\"$(datadir)/$(PACKAGE)\" \
-	    -DGUMMI_LOCALES=\"$(datadir)/locale\"
-
-gummi_LDADD = $(GUI_LIBS) \
-	      $(LIBINTL)
-
-gummi_SOURCES = biblio.c  biblio.h \
-		configfile.c configfile.h \
-		editor.c editor.h \
-		environment.c environment.h \
-		compile/texlive.c compile/texlive.h \
-		compile/latexmk.c compile/latexmk.h \
-		compile/rubber.c compile/rubber.h \
-		gui/gui-menu.c gui/gui-menu.h \
-		gui/gui-tabmanager.c gui/gui-tabmanager.h \
-		gui/gui-import.c gui/gui-import.h \
-		gui/gui-main.c gui/gui-main.h \
-		gui/gui-prefs.c gui/gui-prefs.h \
-		gui/gui-preview.c gui/gui-preview.h \
-		gui/gui-search.c gui/gui-search.h \
-		gui/gui-snippets.c gui/gui-snippets.h \
-		gui/gui-infoscreen.c gui/gui-infoscreen.h \
-		gui/gui-project.c gui/gui-project.h \
-		syncTeX/synctex_parser.c syncTeX/synctex_parser.h \
-		syncTeX/synctex_parser_utils.c syncTeX/synctex_parser_utils.h \
-		importer.c importer.h \
-		iofunctions.c iofunctions.h \
-		external.c external.h \
-		project.c project.h \
-		latex.c latex.h \
-		motion.c motion.h \
-		signals.c signals.h \
-		snippets.c snippets.h \
-		template.c template.h \
-		update.c update.h \
-		utils.c utils.h \
-		tabmanager.c tabmanager.h \
-		constants.h porting.h \
-		main.c
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-gummi$(EXEEXT): $(gummi_OBJECTS) $(gummi_DEPENDENCIES) $(EXTRA_gummi_DEPENDENCIES) 
-	@rm -f gummi$(EXEEXT)
-	$(LINK) $(gummi_OBJECTS) $(gummi_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/biblio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/configfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/editor.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/environment.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/external.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-import.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-infoscreen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-menu.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-prefs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-preview.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-project.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-search.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-snippets.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gui-tabmanager.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/importer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iofunctions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/latex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/latexmk.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/motion.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/project.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rubber.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signals.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snippets.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/synctex_parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/synctex_parser_utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tabmanager.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/template.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/texlive.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/update.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Po at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-texlive.o: compile/texlive.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT texlive.o -MD -MP -MF $(DEPDIR)/texlive.Tpo -c -o texlive.o `test -f 'compile/texlive.c' || echo '$(srcdir)/'`compile/texlive.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/texlive.Tpo $(DEPDIR)/texlive.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='compile/texlive.c' object='texlive.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o texlive.o `test -f 'compile/texlive.c' || echo '$(srcdir)/'`compile/texlive.c
-
-texlive.obj: compile/texlive.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT texlive.obj -MD -MP -MF $(DEPDIR)/texlive.Tpo -c -o texlive.obj `if test -f 'compile/texlive.c'; then $(CYGPATH_W) 'compile/texlive.c'; else $(CYGPATH_W) '$(srcdir)/compile/texlive.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/texlive.Tpo $(DEPDIR)/texlive.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='compile/texlive.c' object='texlive.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o texlive.obj `if test -f 'compile/texlive.c'; then $(CYGPATH_W) 'compile/texlive.c'; else $(CYGPATH_W) '$(srcdir)/compile/texlive.c'; fi`
-
-latexmk.o: compile/latexmk.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT latexmk.o -MD -MP -MF $(DEPDIR)/latexmk.Tpo -c -o latexmk.o `test -f 'compile/latexmk.c' || echo '$(srcdir)/'`compile/latexmk.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/latexmk.Tpo $(DEPDIR)/latexmk.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='compile/latexmk.c' object='latexmk.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o latexmk.o `test -f 'compile/latexmk.c' || echo '$(srcdir)/'`compile/latexmk.c
-
-latexmk.obj: compile/latexmk.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT latexmk.obj -MD -MP -MF $(DEPDIR)/latexmk.Tpo -c -o latexmk.obj `if test -f 'compile/latexmk.c'; then $(CYGPATH_W) 'compile/latexmk.c'; else $(CYGPATH_W) '$(srcdir)/compile/latexmk.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/latexmk.Tpo $(DEPDIR)/latexmk.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='compile/latexmk.c' object='latexmk.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o latexmk.obj `if test -f 'compile/latexmk.c'; then $(CYGPATH_W) 'compile/latexmk.c'; else $(CYGPATH_W) '$(srcdir)/compile/latexmk.c'; fi`
-
-rubber.o: compile/rubber.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rubber.o -MD -MP -MF $(DEPDIR)/rubber.Tpo -c -o rubber.o `test -f 'compile/rubber.c' || echo '$(srcdir)/'`compile/rubber.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rubber.Tpo $(DEPDIR)/rubber.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='compile/rubber.c' object='rubber.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rubber.o `test -f 'compile/rubber.c' || echo '$(srcdir)/'`compile/rubber.c
-
-rubber.obj: compile/rubber.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rubber.obj -MD -MP -MF $(DEPDIR)/rubber.Tpo -c -o rubber.obj `if test -f 'compile/rubber.c'; then $(CYGPATH_W) 'compile/rubber.c'; else $(CYGPATH_W) '$(srcdir)/compile/rubber.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rubber.Tpo $(DEPDIR)/rubber.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='compile/rubber.c' object='rubber.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rubber.obj `if test -f 'compile/rubber.c'; then $(CYGPATH_W) 'compile/rubber.c'; else $(CYGPATH_W) '$(srcdir)/compile/rubber.c'; fi`
-
-gui-menu.o: gui/gui-menu.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-menu.o -MD -MP -MF $(DEPDIR)/gui-menu.Tpo -c -o gui-menu.o `test -f 'gui/gui-menu.c' || echo '$(srcdir)/'`gui/gui-menu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-menu.Tpo $(DEPDIR)/gui-menu.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-menu.c' object='gui-menu.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-menu.o `test -f 'gui/gui-menu.c' || echo '$(srcdir)/'`gui/gui-menu.c
-
-gui-menu.obj: gui/gui-menu.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-menu.obj -MD -MP -MF $(DEPDIR)/gui-menu.Tpo -c -o gui-menu.obj `if test -f 'gui/gui-menu.c'; then $(CYGPATH_W) 'gui/gui-menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-menu.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-menu.Tpo $(DEPDIR)/gui-menu.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-menu.c' object='gui-menu.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-menu.obj `if test -f 'gui/gui-menu.c'; then $(CYGPATH_W) 'gui/gui-menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-menu.c'; fi`
-
-gui-tabmanager.o: gui/gui-tabmanager.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-tabmanager.o -MD -MP -MF $(DEPDIR)/gui-tabmanager.Tpo -c -o gui-tabmanager.o `test -f 'gui/gui-tabmanager.c' || echo '$(srcdir)/'`gui/gui-tabmanager.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-tabmanager.Tpo $(DEPDIR)/gui-tabmanager.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-tabmanager.c' object='gui-tabmanager.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-tabmanager.o `test -f 'gui/gui-tabmanager.c' || echo '$(srcdir)/'`gui/gui-tabmanager.c
-
-gui-tabmanager.obj: gui/gui-tabmanager.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-tabmanager.obj -MD -MP -MF $(DEPDIR)/gui-tabmanager.Tpo -c -o gui-tabmanager.obj `if test -f 'gui/gui-tabmanager.c'; then $(CYGPATH_W) 'gui/gui-tabmanager.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-tabmanager.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-tabmanager.Tpo $(DEPDIR)/gui-tabmanager.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-tabmanager.c' object='gui-tabmanager.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-tabmanager.obj `if test -f 'gui/gui-tabmanager.c'; then $(CYGPATH_W) 'gui/gui-tabmanager.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-tabmanager.c'; fi`
-
-gui-import.o: gui/gui-import.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-import.o -MD -MP -MF $(DEPDIR)/gui-import.Tpo -c -o gui-import.o `test -f 'gui/gui-import.c' || echo '$(srcdir)/'`gui/gui-import.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-import.Tpo $(DEPDIR)/gui-import.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-import.c' object='gui-import.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-import.o `test -f 'gui/gui-import.c' || echo '$(srcdir)/'`gui/gui-import.c
-
-gui-import.obj: gui/gui-import.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-import.obj -MD -MP -MF $(DEPDIR)/gui-import.Tpo -c -o gui-import.obj `if test -f 'gui/gui-import.c'; then $(CYGPATH_W) 'gui/gui-import.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-import.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-import.Tpo $(DEPDIR)/gui-import.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-import.c' object='gui-import.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-import.obj `if test -f 'gui/gui-import.c'; then $(CYGPATH_W) 'gui/gui-import.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-import.c'; fi`
-
-gui-main.o: gui/gui-main.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-main.o -MD -MP -MF $(DEPDIR)/gui-main.Tpo -c -o gui-main.o `test -f 'gui/gui-main.c' || echo '$(srcdir)/'`gui/gui-main.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-main.Tpo $(DEPDIR)/gui-main.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-main.c' object='gui-main.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-main.o `test -f 'gui/gui-main.c' || echo '$(srcdir)/'`gui/gui-main.c
-
-gui-main.obj: gui/gui-main.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-main.obj -MD -MP -MF $(DEPDIR)/gui-main.Tpo -c -o gui-main.obj `if test -f 'gui/gui-main.c'; then $(CYGPATH_W) 'gui/gui-main.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-main.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-main.Tpo $(DEPDIR)/gui-main.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-main.c' object='gui-main.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-main.obj `if test -f 'gui/gui-main.c'; then $(CYGPATH_W) 'gui/gui-main.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-main.c'; fi`
-
-gui-prefs.o: gui/gui-prefs.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-prefs.o -MD -MP -MF $(DEPDIR)/gui-prefs.Tpo -c -o gui-prefs.o `test -f 'gui/gui-prefs.c' || echo '$(srcdir)/'`gui/gui-prefs.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-prefs.Tpo $(DEPDIR)/gui-prefs.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-prefs.c' object='gui-prefs.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-prefs.o `test -f 'gui/gui-prefs.c' || echo '$(srcdir)/'`gui/gui-prefs.c
-
-gui-prefs.obj: gui/gui-prefs.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-prefs.obj -MD -MP -MF $(DEPDIR)/gui-prefs.Tpo -c -o gui-prefs.obj `if test -f 'gui/gui-prefs.c'; then $(CYGPATH_W) 'gui/gui-prefs.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-prefs.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-prefs.Tpo $(DEPDIR)/gui-prefs.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-prefs.c' object='gui-prefs.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-prefs.obj `if test -f 'gui/gui-prefs.c'; then $(CYGPATH_W) 'gui/gui-prefs.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-prefs.c'; fi`
-
-gui-preview.o: gui/gui-preview.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-preview.o -MD -MP -MF $(DEPDIR)/gui-preview.Tpo -c -o gui-preview.o `test -f 'gui/gui-preview.c' || echo '$(srcdir)/'`gui/gui-preview.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-preview.Tpo $(DEPDIR)/gui-preview.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-preview.c' object='gui-preview.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-preview.o `test -f 'gui/gui-preview.c' || echo '$(srcdir)/'`gui/gui-preview.c
-
-gui-preview.obj: gui/gui-preview.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-preview.obj -MD -MP -MF $(DEPDIR)/gui-preview.Tpo -c -o gui-preview.obj `if test -f 'gui/gui-preview.c'; then $(CYGPATH_W) 'gui/gui-preview.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-preview.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-preview.Tpo $(DEPDIR)/gui-preview.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-preview.c' object='gui-preview.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-preview.obj `if test -f 'gui/gui-preview.c'; then $(CYGPATH_W) 'gui/gui-preview.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-preview.c'; fi`
-
-gui-search.o: gui/gui-search.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-search.o -MD -MP -MF $(DEPDIR)/gui-search.Tpo -c -o gui-search.o `test -f 'gui/gui-search.c' || echo '$(srcdir)/'`gui/gui-search.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-search.Tpo $(DEPDIR)/gui-search.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-search.c' object='gui-search.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-search.o `test -f 'gui/gui-search.c' || echo '$(srcdir)/'`gui/gui-search.c
-
-gui-search.obj: gui/gui-search.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-search.obj -MD -MP -MF $(DEPDIR)/gui-search.Tpo -c -o gui-search.obj `if test -f 'gui/gui-search.c'; then $(CYGPATH_W) 'gui/gui-search.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-search.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-search.Tpo $(DEPDIR)/gui-search.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-search.c' object='gui-search.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-search.obj `if test -f 'gui/gui-search.c'; then $(CYGPATH_W) 'gui/gui-search.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-search.c'; fi`
-
-gui-snippets.o: gui/gui-snippets.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-snippets.o -MD -MP -MF $(DEPDIR)/gui-snippets.Tpo -c -o gui-snippets.o `test -f 'gui/gui-snippets.c' || echo '$(srcdir)/'`gui/gui-snippets.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-snippets.Tpo $(DEPDIR)/gui-snippets.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-snippets.c' object='gui-snippets.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-snippets.o `test -f 'gui/gui-snippets.c' || echo '$(srcdir)/'`gui/gui-snippets.c
-
-gui-snippets.obj: gui/gui-snippets.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-snippets.obj -MD -MP -MF $(DEPDIR)/gui-snippets.Tpo -c -o gui-snippets.obj `if test -f 'gui/gui-snippets.c'; then $(CYGPATH_W) 'gui/gui-snippets.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-snippets.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-snippets.Tpo $(DEPDIR)/gui-snippets.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-snippets.c' object='gui-snippets.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-snippets.obj `if test -f 'gui/gui-snippets.c'; then $(CYGPATH_W) 'gui/gui-snippets.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-snippets.c'; fi`
-
-gui-infoscreen.o: gui/gui-infoscreen.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-infoscreen.o -MD -MP -MF $(DEPDIR)/gui-infoscreen.Tpo -c -o gui-infoscreen.o `test -f 'gui/gui-infoscreen.c' || echo '$(srcdir)/'`gui/gui-infoscreen.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-infoscreen.Tpo $(DEPDIR)/gui-infoscreen.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-infoscreen.c' object='gui-infoscreen.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-infoscreen.o `test -f 'gui/gui-infoscreen.c' || echo '$(srcdir)/'`gui/gui-infoscreen.c
-
-gui-infoscreen.obj: gui/gui-infoscreen.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-infoscreen.obj -MD -MP -MF $(DEPDIR)/gui-infoscreen.Tpo -c -o gui-infoscreen.obj `if test -f 'gui/gui-infoscreen.c'; then $(CYGPATH_W) 'gui/gui-infoscreen.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-infoscreen.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-infoscreen.Tpo $(DEPDIR)/gui-infoscreen.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-infoscreen.c' object='gui-infoscreen.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-infoscreen.obj `if test -f 'gui/gui-infoscreen.c'; then $(CYGPATH_W) 'gui/gui-infoscreen.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-infoscreen.c'; fi`
-
-gui-project.o: gui/gui-project.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-project.o -MD -MP -MF $(DEPDIR)/gui-project.Tpo -c -o gui-project.o `test -f 'gui/gui-project.c' || echo '$(srcdir)/'`gui/gui-project.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-project.Tpo $(DEPDIR)/gui-project.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-project.c' object='gui-project.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-project.o `test -f 'gui/gui-project.c' || echo '$(srcdir)/'`gui/gui-project.c
-
-gui-project.obj: gui/gui-project.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gui-project.obj -MD -MP -MF $(DEPDIR)/gui-project.Tpo -c -o gui-project.obj `if test -f 'gui/gui-project.c'; then $(CYGPATH_W) 'gui/gui-project.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-project.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gui-project.Tpo $(DEPDIR)/gui-project.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui/gui-project.c' object='gui-project.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gui-project.obj `if test -f 'gui/gui-project.c'; then $(CYGPATH_W) 'gui/gui-project.c'; else $(CYGPATH_W) '$(srcdir)/gui/gui-project.c'; fi`
-
-synctex_parser.o: syncTeX/synctex_parser.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctex_parser.o -MD -MP -MF $(DEPDIR)/synctex_parser.Tpo -c -o synctex_parser.o `test -f 'syncTeX/synctex_parser.c' || echo '$(srcdir)/'`syncTeX/synctex_parser.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/synctex_parser.Tpo $(DEPDIR)/synctex_parser.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='syncTeX/synctex_parser.c' object='synctex_parser.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctex_parser.o `test -f 'syncTeX/synctex_parser.c' || echo '$(srcdir)/'`syncTeX/synctex_parser.c
-
-synctex_parser.obj: syncTeX/synctex_parser.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctex_parser.obj -MD -MP -MF $(DEPDIR)/synctex_parser.Tpo -c -o synctex_parser.obj `if test -f 'syncTeX/synctex_parser.c'; then $(CYGPATH_W) 'syncTeX/synctex_parser.c'; else $(CYGPATH_W) '$(srcdir)/syncTeX/synctex_parser.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/synctex_parser.Tpo $(DEPDIR)/synctex_parser.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='syncTeX/synctex_parser.c' object='synctex_parser.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctex_parser.obj `if test -f 'syncTeX/synctex_parser.c'; then $(CYGPATH_W) 'syncTeX/synctex_parser.c'; else $(CYGPATH_W) '$(srcdir)/syncTeX/synctex_parser.c'; fi`
-
-synctex_parser_utils.o: syncTeX/synctex_parser_utils.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctex_parser_utils.o -MD -MP -MF $(DEPDIR)/synctex_parser_utils.Tpo -c -o synctex_parser_utils.o `test -f 'syncTeX/synctex_parser_utils.c' || echo '$(srcdir)/'`syncTeX/synctex_parser_utils.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/synctex_parser_utils.Tpo $(DEPDIR)/synctex_parser_utils.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='syncTeX/synctex_parser_utils.c' object='synctex_parser_utils.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctex_parser_utils.o `test -f 'syncTeX/synctex_parser_utils.c' || echo '$(srcdir)/'`syncTeX/synctex_parser_utils.c
-
-synctex_parser_utils.obj: syncTeX/synctex_parser_utils.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctex_parser_utils.obj -MD -MP -MF $(DEPDIR)/synctex_parser_utils.Tpo -c -o synctex_parser_utils.obj `if test -f 'syncTeX/synctex_parser_utils.c'; then $(CYGPATH_W) 'syncTeX/synctex_parser_utils.c'; else $(CYGPATH_W) '$(srcdir)/syncTeX/synctex_parser_utils.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/synctex_parser_utils.Tpo $(DEPDIR)/synctex_parser_utils.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='syncTeX/synctex_parser_utils.c' object='synctex_parser_utils.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctex_parser_utils.obj `if test -f 'syncTeX/synctex_parser_utils.c'; then $(CYGPATH_W) 'syncTeX/synctex_parser_utils.c'; else $(CYGPATH_W) '$(srcdir)/syncTeX/synctex_parser_utils.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/biblio.c b/src/biblio.c
index 9f038bb..4d25f8d 100644
--- a/src/biblio.c
+++ b/src/biblio.c
@@ -28,8 +28,8 @@
  */
 
 #include <gtk/gtk.h>
-#include <string.h> 
-#include <sys/stat.h> 
+#include <string.h>
+#include <sys/stat.h>
 
 #include "biblio.h"
 #include "constants.h"
@@ -47,11 +47,11 @@ GuBiblio* biblio_init (GtkBuilder* builder) {
         GTK_PROGRESS_BAR (gtk_builder_get_object (builder, "bibprogressbar"));
     b->progressmon =
         GTK_ADJUSTMENT (gtk_builder_get_object (builder, "bibprogressmon"));
-    b->list_biblios = 
+    b->list_biblios =
         GTK_LIST_STORE (gtk_builder_get_object (builder, "list_biblios"));
-    b->filenm_label = 
+    b->filenm_label =
         GTK_LABEL (gtk_builder_get_object (builder, "bibfilenm"));
-    b->refnr_label = 
+    b->refnr_label =
         GTK_LABEL (gtk_builder_get_object (builder, "bibrefnr"));
     b->list_filter =
         GTK_ENTRY (gtk_builder_get_object (builder, "biblio_filter"));
@@ -68,9 +68,10 @@ gboolean biblio_detect_bibliography (GuBiblio* bc, GuEditor* ec) {
     GMatchInfo *match_info;
     GRegex* bib_regex = NULL;
     gboolean state = FALSE;
-    
+
     content = editor_grab_buffer (ec);
-    bib_regex = g_regex_new ("\\\\bibliography{\\s*([^{}\\s]*)\\s*}", 0,0,NULL);
+    bib_regex = g_regex_new ("^\\\\bibliography{\\s*([^{}\\s]*)\\s*}",
+        G_REGEX_MULTILINE, 0, NULL);
     if (g_regex_match (bib_regex, content, 0, &match_info)) {
         result = g_match_info_fetch_all (match_info);
         if (result[1]) {
@@ -104,7 +105,7 @@ gboolean biblio_compile_bibliography (GuBiblio* bc, GuEditor* ec, GuLatex* lc) {
         gboolean success = FALSE;
         char* command = g_strdup_printf ("%s bibtex \"%s\"",
                                          C_TEXSEC, auxname);
-                                         
+
         g_free (auxname);
         latex_update_workfile (lc, ec);
         latex_update_auxfile (lc, ec);
@@ -125,7 +126,7 @@ gboolean biblio_compile_bibliography (GuBiblio* bc, GuEditor* ec, GuLatex* lc) {
 
 int biblio_parse_entries (GuBiblio* bc, gchar *bib_content) {
     int entry_total = 0;
-    
+
     GtkTreeIter iter;
     GRegex* regex_entry;
     GRegex* subregex_ident;
@@ -137,28 +138,28 @@ int biblio_parse_entries (GuBiblio* bc, gchar *bib_content) {
     gchar* author_out = NULL;
     gchar* title_out = NULL;
 
-    GMatchInfo *match_entry; 
-    
+    GMatchInfo *match_entry;
+
     regex_entry = g_regex_new (
         "(@article|@book|@booklet|@conference|@inbook|@incollection|"
         "@inproceedings|@manual|@mastersthesis|@misc|@phdthesis|"
-        "@proceedings|@techreport|@unpublished)([^@]*)", 
+        "@proceedings|@techreport|@unpublished)([^@]*)",
         (G_REGEX_CASELESS | G_REGEX_DOTALL), 0, NULL);
-      
+
     subregex_ident = g_regex_new ("@.+{([^,]+),", 0, 0, NULL);
-    subregex_title = g_regex_new 
+    subregex_title = g_regex_new
 		("[^book]title[\\s]*=[\\s]*(.*)", G_REGEX_CASELESS, 0, NULL);
-    subregex_author = g_regex_new 
+    subregex_author = g_regex_new
 		("author[\\s]*=[\\s]*(.*)", G_REGEX_CASELESS, 0, NULL);
-    subregex_year = g_regex_new 
+    subregex_year = g_regex_new
 		("year[\\s]*=[\\s]*[{|\"]?([1|2][0-9]{3})", G_REGEX_CASELESS, 0, NULL);
     regex_formatting = g_regex_new ("[{|}|\"|,|\\$]", 0, 0, NULL);
-    
-    
+
+
     g_regex_match (regex_entry, bib_content, 0, &match_entry);
-    
+
     while (g_match_info_matches (match_entry)) {
-        
+
         gchar *entry = g_match_info_fetch (match_entry, 0);
 
         gchar **ident_res = g_regex_split (subregex_ident, entry, 0);
@@ -175,7 +176,7 @@ int biblio_parse_entries (GuBiblio* bc, gchar *bib_content) {
             title_out = g_regex_replace (regex_formatting, title_res[1],
                                          -1, 0, "", 0, 0);
         else title_out = NULL;
-        
+
         gtk_list_store_append (bc->list_biblios, &iter);
         gtk_list_store_set (bc->list_biblios, &iter, 0, ident_res[1],
                                                     1, title_out,
@@ -199,6 +200,6 @@ int biblio_parse_entries (GuBiblio* bc, gchar *bib_content) {
     g_regex_unref (subregex_author);
     g_regex_unref (subregex_year);
     g_regex_unref (regex_formatting);
-    
+
     return entry_total;
 }
diff --git a/src/biblio.h b/src/biblio.h
index 5ddf420..a54476a 100644
--- a/src/biblio.h
+++ b/src/biblio.h
@@ -1,10 +1,10 @@
 /**
  * @file    biblio.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/compile/latexmk.c b/src/compile/latexmk.c
index 9cf8d5f..30b5e8d 100644
--- a/src/compile/latexmk.c
+++ b/src/compile/latexmk.c
@@ -1,10 +1,10 @@
 /**
  * @file   latexmk.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -37,10 +37,10 @@
 gboolean lmk_detected = FALSE;
 
 void latexmk_init (void) {
-    
+
     if (external_exists (C_LATEXMK)) {
         // TODO: check if supported version
-        slog (L_INFO, "Typesetter detected: Latexmk %s\n", 
+        slog (L_INFO, "Typesetter detected: Latexmk %s\n",
                        external_version (C_LATEXMK));
         lmk_detected = TRUE;
     }
@@ -66,10 +66,10 @@ gchar* latexmk_get_command (const gchar* method, gchar* workfile, gchar* basenam
         base = g_path_get_basename (basename);
         outdir = g_strdup_printf ("-jobname=\"%s/%s\"", C_TMPDIR, base);
     }
-    
+
     const gchar* flags = latexmk_get_flags (method);
     gchar* lmkcmd;
-    
+
     lmkcmd = g_strdup_printf("latexmk %s %s \"%s\"", flags, outdir, workfile);
     return lmkcmd;
 }
@@ -95,7 +95,7 @@ gchar* latexmk_get_flags (const gchar *method) {
             lmkflags = g_strdup_printf("-e \"\\$latex = 'latex -synctex=0'\" -silent");
         }
     }
-    
+
     if (STR_EQU (method, "texpdf")) {
         lmkwithoutput = g_strconcat (lmkflags, " -pdf", NULL);
     }
@@ -105,7 +105,7 @@ gchar* latexmk_get_flags (const gchar *method) {
     else {
         lmkwithoutput = g_strconcat (lmkflags, " -pdfps", NULL);
     }
-    
+
     g_free (lmkflags);
     return lmkwithoutput;
 }
diff --git a/src/compile/latexmk.h b/src/compile/latexmk.h
index 3f6d629..56aa357 100644
--- a/src/compile/latexmk.h
+++ b/src/compile/latexmk.h
@@ -1,10 +1,10 @@
 /**
  * @file   latexmk.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/compile/rubber.c b/src/compile/rubber.c
index f903445..7471135 100644
--- a/src/compile/rubber.c
+++ b/src/compile/rubber.c
@@ -1,10 +1,10 @@
 /**
  * @file   rubber.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -37,10 +37,10 @@
 gboolean rub_detected = FALSE;
 
 void rubber_init (void) {
-    
+
     if (external_exists (C_RUBBER)) {
         // TODO: check if supported version
-        slog (L_INFO, "Typesetter detected: Rubber %s\n", 
+        slog (L_INFO, "Typesetter detected: Rubber %s\n",
                        external_version (C_RUBBER));
         rub_detected = TRUE;
     }
@@ -58,13 +58,13 @@ gboolean rubber_detected (void) {
 }
 
 gchar* rubber_get_command (const gchar* method, gchar* workfile) {
-    
+
     const gchar* outdir = g_strdup_printf ("--into=\"%s\"", C_TMPDIR);
     const gchar* flags = rubber_get_flags (method);
     gchar* rubcmd;
-    
+
     rubcmd = g_strdup_printf("rubber %s %s \"%s\"", flags, outdir, workfile);
-    
+
     return rubcmd;
 }
 
diff --git a/src/compile/rubber.h b/src/compile/rubber.h
index fe72618..aac81e1 100644
--- a/src/compile/rubber.h
+++ b/src/compile/rubber.h
@@ -1,10 +1,10 @@
 /**
  * @file   rubber.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/compile/texlive.c b/src/compile/texlive.c
index 0eb5e35..cfc0492 100644
--- a/src/compile/texlive.c
+++ b/src/compile/texlive.c
@@ -1,10 +1,10 @@
 /**
  * @file   texlive.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -44,18 +44,18 @@ gboolean xel_detected = FALSE;
 
 int texlive_init (void) {
     int texversion = 0;
-    
+
     if (external_exists (C_LATEX)) {
         texversion = external_version2 (EX_TEXLIVE);
         slog (L_INFO, "Texlive %d was found installed..\n", texversion);
     }
-    
+
     if (external_exists (C_PDFLATEX)) {
         slog (L_INFO, "Typesetter detected: %s\n",
               external_version (C_PDFLATEX));
         pdf_detected = TRUE;
     }
-    
+
     if (external_exists (C_XELATEX)) {
         slog (L_INFO, "Typesetter detected: %s\n",
               external_version (C_XELATEX));
@@ -94,43 +94,43 @@ gboolean xelatex_detected (void) {
 }
 
 gchar* texlive_get_command (const gchar* method, gchar* workfile, gchar* basename) {
-    
+
     const gchar* outdir = g_strdup_printf("-output-directory=\"%s\"", C_TMPDIR);
-    
-    
+
+
     gchar *typesetter = NULL;
     gchar *texcmd = NULL;
-    
+
     if (pdflatex_active()) typesetter = C_PDFLATEX;
     else typesetter = C_XELATEX;
-    
+
     gchar *flags = texlive_get_flags("texpdf");
-    
+
     gchar *dviname = g_strdup_printf("%s.dvi", g_path_get_basename (basename));
     gchar *psname = g_strdup_printf("%s.ps", g_path_get_basename (basename));
-    
+
     #ifdef WIN32
     gchar *script = g_build_filename (GUMMI_LIBS, "latex_dvi.cmd", NULL);
     #else
     gchar *script = g_build_filename (GUMMI_LIBS, "latex_dvi.sh", NULL);
     #endif
-    
+
     if (STR_EQU (method, "texpdf")) {
 
-        texcmd = g_strdup_printf("%s %s %s \"%s\"", typesetter, 
+        texcmd = g_strdup_printf("%s %s %s \"%s\"", typesetter,
                                                 flags,
-                                                outdir, 
+                                                outdir,
                                                 workfile);
     } else if (STR_EQU (method, "texdvipdf")) {
         texcmd = g_strdup_printf("%s pdf "
-                "\"%s\" \"%s\" \"%s\" \"%s\" \"%s\"", script, 
+                "\"%s\" \"%s\" \"%s\" \"%s\" \"%s\"", script,
                 flags, outdir, workfile, C_TMPDIR, dviname);
     } else {
         texcmd = g_strdup_printf("%s ps "
-                "\"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"", script, 
+                "\"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"", script,
                 flags, outdir, workfile, C_TMPDIR, dviname, psname);
     }
-    
+
     g_free(script);
     g_free(dviname);
     g_free(psname);
@@ -142,7 +142,7 @@ gchar* texlive_get_flags (const gchar* method) {
     gchar* flags = g_strdup_printf("-interaction=nonstopmode "
                                       "-file-line-error "
                                       "-halt-on-error");
-                                          
+
     if (!latex_use_shellescaping()) {
         gchar* tmp = g_strconcat(flags, " -no-shell-escape", NULL);
         g_free(flags);
@@ -153,12 +153,12 @@ gchar* texlive_get_flags (const gchar* method) {
         g_free(flags);
         flags = tmp;
     }
-    
+
     if (config_get_value("synctex")) {
         gchar* tmp = g_strconcat(flags, " -synctex=1", NULL);
         g_free(flags);
         flags = tmp;
     }
-    
+
     return flags;
 }
diff --git a/src/compile/texlive.h b/src/compile/texlive.h
index 4aac99e..84209bd 100644
--- a/src/compile/texlive.h
+++ b/src/compile/texlive.h
@@ -1,10 +1,10 @@
 /**
  * @file   texlive.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2010-2011 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/configfile.c b/src/configfile.c
index 7796d5d..bf1875e 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -114,8 +114,8 @@ void config_init (const gchar* filename) {
 
     config_load ();
     config_version = config_get_value ("config_version");
-    
-    
+
+
     /* Migration from earlier version to newer version (first run only) */
     if (utils_subinstr("0.5", (gchar*)config_version, FALSE)) {
         const gchar* text = config_get_value ("welcome");
@@ -123,7 +123,7 @@ void config_init (const gchar* filename) {
         gchar* filename = g_build_filename (g_get_user_config_dir (),
             "gummi", "templates", templname, NULL);
         gchar* filepath = g_path_get_dirname (filename);
-            
+
         if (!g_file_test (filepath, G_FILE_TEST_IS_DIR)) {
             slog (L_WARNING, "Template directory does not exist, creating..\n");
             g_mkdir_with_parents (filepath, DIR_PERMS);
@@ -165,7 +165,7 @@ void config_set_default (void) {
 
 /**
  *  Returns the String assigned to a config parameter.
- *  If the String is "False", NULL is returned, thus in the case of a boolean 
+ *  If the String is "False", NULL is returned, thus in the case of a boolean
  *  parameter it is possible to write
  *      if (config_get_value("parameter_name")) {...}
  */
@@ -215,7 +215,7 @@ void config_load (void) {
         config_set_default ();
         return config_load ();
     }
-    
+
     /* In the occurence of a crash, the config file can be left open and the
      * contents wiped. Gummi segfaults at the start when the file is empty */
     gchar* contents;
@@ -225,7 +225,7 @@ void config_load (void) {
         config_set_default ();
         return config_load ();
     }
-    
+
     current = config_head = prev = g_new0 (slist, 1);
 
     while (fgets (buf, BUFSIZ, fh)) {
diff --git a/src/configfile.h b/src/configfile.h
index 240e398..cd4eac8 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -26,7 +26,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
- 
+
 #ifndef __GUMMI_CONFIGFILE__
 #define __GUMMI_CONFIGFILE__
 
diff --git a/src/constants.h b/src/constants.h
index f586011..32c7b00 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -37,7 +37,7 @@
 #define C_DEFAULTTEXT g_build_filename (GUMMI_DATA, "misc", "default.tex", NULL)
 
 /* URL constants */
-#define C_GUMMIGUIDE "http://dev.midnightcoding.org/projects/gummi/wiki/UserGuide"
+#define C_GUMMIGUIDE "https://github.com/alexandervdm/gummi/wiki"
 
 
 #define C_LATEX "latex"
diff --git a/src/editor.c b/src/editor.c
index 5156d62..6087c9e 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,10 +1,10 @@
 /**
  * @file    editor.c
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -54,7 +54,7 @@ static void on_inserted_text(GtkTextBuffer *textbuffer,GtkTextIter *location,
                              gchar *text,gint len, gpointer user_data);
 static void on_delete_range(GtkTextBuffer *textbuffer,GtkTextIter *start,
                              GtkTextIter *end, gpointer user_data);
-                             
+
 const gchar style[][3][20] = {
     { "tool_bold", "\\textbf{", "}" },
     { "tool_italic", "\\emph{", "}" },
@@ -76,7 +76,7 @@ GuEditor* editor_new (GuMotion* mc) {
     ec->workfile = NULL;
     ec->bibfile = NULL;
     ec->projfile = NULL;
-    
+
     GtkSourceLanguageManager* manager = gtk_source_language_manager_new ();
     GtkSourceLanguage* lang = gtk_source_language_manager_get_language (manager,
             "latex");
@@ -88,7 +88,7 @@ GuEditor* editor_new (GuMotion* mc) {
     ec->editortags = gtk_text_buffer_get_tag_table (ec_buffer);
     ec->replace_activated = FALSE;
     ec->term = NULL;
-    
+
     gtk_source_view_set_tab_width (ec->view,
             atoi (config_get_value ("tabwidth")));
     gtk_source_view_set_insert_spaces_instead_of_tabs (ec->view,
@@ -112,9 +112,9 @@ GuEditor* editor_new (GuMotion* mc) {
     ec->sigid[2] = g_signal_connect (ec->buffer, "changed",
                 G_CALLBACK (check_preview_timer), NULL);
 
-    ec->sigid[3] = g_signal_connect_after(ec->buffer, "insert-text", 
+    ec->sigid[3] = g_signal_connect_after(ec->buffer, "insert-text",
                 G_CALLBACK(on_inserted_text), ec);
-    ec->sigid[4] = g_signal_connect_after(ec->buffer, "delete-range", 
+    ec->sigid[4] = g_signal_connect_after(ec->buffer, "delete-range",
                 G_CALLBACK(on_delete_range), ec);
 
     return ec;
@@ -122,7 +122,7 @@ GuEditor* editor_new (GuMotion* mc) {
 
 void editor_destroy (GuEditor* ec) {
     gint i = 0;
-    
+
     for (i = 0; i < 2; ++i) {
         if (g_signal_handler_is_connected (ec->view, ec->sigid[i])) {
             g_signal_handler_disconnect (ec->view, ec->sigid[i]);
@@ -145,7 +145,7 @@ static void on_inserted_text(GtkTextBuffer *textbuffer,GtkTextIter *location,
         return;
     }
     GuEditor* e = GU_EDITOR(user_data);
-    
+
     e->last_edit = *location;
     e->sync_to_last_edit = TRUE;
 }
@@ -157,7 +157,7 @@ static void on_delete_range(GtkTextBuffer *textbuffer,GtkTextIter *start,
         return;
     }
     GuEditor* e = GU_EDITOR(user_data);
-    
+
     e->last_edit = *start;
     e->sync_to_last_edit = TRUE;
 }
@@ -192,7 +192,7 @@ void editor_fileinfo_update (GuEditor* ec, const gchar* filename) {
 
     ec->fdname = g_build_filename (C_TMPDIR, "gummi_XXXXXX", NULL);
     ec->workfd = g_mkstemp (ec->fdname);
-    
+
     // This is required for Windows 7, but not for Linux. It may also
     // be the proper way for *nix, but I don't want to change this
     // crucial piece of code at this stage of development -alexander
@@ -201,13 +201,22 @@ void editor_fileinfo_update (GuEditor* ec, const gchar* filename) {
 	#endif
 
     if (filename) {
-        gchar* base = g_path_get_basename (filename);
-        gchar* dir = g_path_get_dirname (filename);
-        ec->filename = g_strdup (filename);
+        gchar* fname = NULL;
+        if (!g_path_is_absolute (filename)) {
+            fname = g_strdup_printf ("%s%c%s", g_get_current_dir(),
+                                     G_DIR_SEPARATOR, filename);
+        } else {
+            fname = g_strdup (filename);
+        }
+
+        gchar* base = g_path_get_basename (fname);
+        gchar* dir = g_path_get_dirname (fname);
+        ec->filename = g_strdup (fname);
         ec->basename = g_strdup_printf ("%s%c.%s", dir, G_DIR_SEPARATOR, base);
         ec->workfile = g_strdup_printf ("%s.swp", ec->basename);
         ec->pdffile =  g_strdup_printf ("%s%c.%s.pdf", C_TMPDIR,
                                        G_DIR_SEPARATOR, base);
+        g_free (fname);
         g_free (base);
         g_free (dir);
     } else {
@@ -233,7 +242,7 @@ void editor_fileinfo_cleanup (GuEditor* ec) {
     gchar* auxfile = NULL;
     gchar* logfile = NULL;
     gchar* syncfile = NULL;
-    
+
     if (ec->filename) {
         gchar* dirname = g_path_get_dirname (ec->filename);
         gchar* basename = g_path_get_basename (ec->filename);
@@ -255,7 +264,7 @@ void editor_fileinfo_cleanup (GuEditor* ec) {
         g_free (dirname);
     }
 
-    // TODO: make a loop or maybe make register of created files? proc? 
+    // TODO: make a loop or maybe make register of created files? proc?
 
     close (ec->workfd);
     ec->workfd = -1;
@@ -367,9 +376,17 @@ gboolean editor_buffer_changed (GuEditor* ec) {
     return FALSE;
 }
 
-void editor_insert_package (GuEditor* ec, const gchar* package) {
+void editor_insert_package (GuEditor* ec, const gchar* package, const gchar* options) {
     GtkTextIter start, mstart, mend, sstart, send;
-    gchar* pkgstr = g_strdup_printf ("\\usepackage{%s}\n", package);
+
+    gchar* pkgstr = NULL;
+    if (options == NULL) {
+        pkgstr = g_strdup_printf ("\\usepackage{%s}\n", package);
+    }
+    else {
+        pkgstr = g_strdup_printf ("\\usepackage[%s]{%s}\n", options, package);
+    }
+
     gtk_text_buffer_get_start_iter (ec_buffer, &start);
     gtk_text_iter_forward_search (&start, (gchar*)"\\begin{document}", 0,
             &mstart, &mend, NULL);
@@ -690,7 +707,7 @@ void editor_redo_change (GuEditor* ec) {
 }
 
 void editor_set_style_scheme_by_id (GuEditor* ec, const gchar* id) {
-    
+
     GtkSourceStyleScheme* scheme =
         gtk_source_style_scheme_manager_get_scheme (ec->stylemanager, id);
     slog (L_INFO, "setting styles scheme to %s\n", id);
@@ -701,7 +718,7 @@ void editor_set_style_scheme_by_id (GuEditor* ec, const gchar* id) {
                 "classic");
     }
     gtk_source_buffer_set_style_scheme (ec->buffer, scheme);
-    
+
     set_style_fg_bg(G_OBJECT (ec->searchtag), scheme, "search-match", "yellow");
     set_style_fg_bg(G_OBJECT (ec->errortag), scheme,"def:error",  "red");
 }
@@ -713,17 +730,17 @@ static inline gdouble gdkcolor_luminance(GdkColor c) {
 
 
 /**
- *  Sets a object's fore- and background color to that of scheme's style 
- *  "styleName". If no background color is defined in the style, defaultBG is 
+ *  Sets a object's fore- and background color to that of scheme's style
+ *  "styleName". If no background color is defined in the style, defaultBG is
  *  used. defaultBG can be any valid parameter to gdk_color_parse().
  *  If only a foreground color was defined and it has not enough contrast to the
  *  default background, it will be overwritten. The foreground color will either
  *  be white or black, which has more contrast.
  */
-void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme, 
+void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme,
                       gchar* styleName, gchar* defaultBG) {
     GtkSourceStyle *style = NULL;
-    
+
     gchar *bg = NULL;
     gchar *fg = NULL;
     gboolean foreground_set;
@@ -735,18 +752,18 @@ void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme,
     if (scheme == NULL) {
         goto set_style_fg_bg_return_defaults;
     }
-    
+
     style = gtk_source_style_scheme_get_style (scheme, styleName);
-    
+
     if (style == NULL) {
         goto set_style_fg_bg_return_defaults;
     }
-    
+
     // Get properties of style
-    g_object_get (style, 
-                  "foreground-set", &foreground_set, 
+    g_object_get (style,
+                  "foreground-set", &foreground_set,
                   "foreground", &fg,
-                  "background-set", &background_set, 
+                  "background-set", &background_set,
                   "background", &bg,
                   NULL);
 
@@ -758,11 +775,11 @@ void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme,
     if (background_set) {
         if (bg == NULL || !gdk_color_parse (bg, &background))
             background_set = FALSE;
-    }    
+    }
 
     g_free(fg);
     g_free(bg);
-    
+
     if (background_set && foreground_set) {
         // We trust the style to set both to good values
         // Do nothing
@@ -783,7 +800,7 @@ void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme,
             }
         }
     } else if (background_set && !foreground_set) {
-        // Choose a fg = white or black, which has more contrast   
+        // Choose a fg = white or black, which has more contrast
         if (gdkcolor_luminance(background) > 0.5) {
             gdk_color_parse("black", &foreground);
         } else {
@@ -793,11 +810,11 @@ void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme,
         // none set, set defaults
         goto set_style_fg_bg_return_defaults;
     }
-    
-    g_object_set (obj, "foreground-gdk", &foreground, 
+
+    g_object_set (obj, "foreground-gdk", &foreground,
                         "background-gdk", &background, NULL);
     return;
-                        
+
 set_style_fg_bg_return_defaults:
 
     // No valid style, set defaults
@@ -807,10 +824,10 @@ set_style_fg_bg_return_defaults:
     } else {
         gdk_color_parse("white", &foreground);
     }
-    
-    g_object_set (obj, "foreground-gdk", &foreground, 
+
+    g_object_set (obj, "foreground-gdk", &foreground,
                         "background-gdk", &background, NULL);
-                        
+
 }
 
 /* The following functions are taken from gedit and partially modified */
diff --git a/src/editor.h b/src/editor.h
index 58f2f5b..665b9b9 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -1,10 +1,10 @@
 /**
  * @file    editor.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -73,7 +73,7 @@ struct _GuEditor {
     gboolean wholeword;
     gboolean matchcase;
     gint sigid[5];
-    
+
     GtkTextIter last_edit;
     gboolean sync_to_last_edit;
 };
@@ -91,7 +91,7 @@ void editor_fill_buffer (GuEditor* ec, const gchar* text);
 
 /* editor_grab_buffer will return a newly allocated string */
 gchar* editor_grab_buffer (GuEditor* ec);
-void editor_insert_package (GuEditor* ec, const gchar* package);
+void editor_insert_package (GuEditor* ec, const gchar* package, const gchar* options);
 void editor_insert_bib (GuEditor* ec, const gchar* package);
 void editor_set_selection_textstyle (GuEditor* ec, const gchar* type);
 void editor_apply_errortags (GuEditor* ec, gint* lines);
@@ -112,7 +112,7 @@ void editor_scroll_to_line (GuEditor* ec, gint line);
 void editor_undo_change (GuEditor* ec);
 void editor_redo_change (GuEditor* ec);
 void editor_set_style_scheme_by_id (GuEditor* ec, const gchar* id);
-void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme, 
+void set_style_fg_bg (GObject* obj, GtkSourceStyleScheme* scheme,
                       gchar* styleName, gchar* defaultBG);
 gint schemes_compare (gconstpointer a, gconstpointer b);
 GList* editor_list_style_scheme_sorted (void);
diff --git a/src/environment.c b/src/environment.c
index d5c972a..e6b8123 100644
--- a/src/environment.c
+++ b/src/environment.c
@@ -1,10 +1,10 @@
 /**
  * @file    environment.c
- * @brief    
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -38,7 +38,7 @@ GummiGui* gui = 0;
 Gummi* gummi_init (GuMotion* mo, GuIOFunc* io, GuLatex* latex, GuBiblio* bib,
                    GuTemplate* tpl, GuSnippets* snip, GuTabmanager* tabm,
                    GuProject* proj) {
-    
+
     Gummi* g = g_new0 (Gummi, 1);
     g->io = io;
     g->motion = mo;
@@ -48,7 +48,7 @@ Gummi* gummi_init (GuMotion* mo, GuIOFunc* io, GuLatex* latex, GuBiblio* bib,
     g->snippets = snip;
     g->tabmanager = tabm;
     g->project = proj;
-    
+
     return g;
 }
 
@@ -64,12 +64,12 @@ gchar* gummi_get_projectfile (void) {
 GuEditor* gummi_new_environment (const gchar* filename) {
     GuEditor* ec = editor_new (gummi->motion);
     editor_fileinfo_update (ec, filename);
-    
+
     slog (L_INFO, "\n");
     slog (L_INFO, "Environment created for:\n");
     slog (L_INFO, "TEX: %s\n", ec->filename);
     slog (L_INFO, "TMP: %s\n", ec->workfile);
-    slog (L_INFO, "PDF: %s\n", ec->pdffile); 
+    slog (L_INFO, "PDF: %s\n", ec->pdffile);
     return ec;
 }
 
@@ -89,10 +89,10 @@ GList* gummi_get_all_editors (void) {
     int tabtotal, i;
     GuEditor* ec;
     GList* editors = NULL;
-    
+
     GList *tabs = gummi_get_all_tabs();
     tabtotal = g_list_length(tabs);
-    
+
     for (i = 0; i < tabtotal; ++i) {
         ec = GU_TAB_CONTEXT (g_list_nth_data (tabs, i))->editor;
         editors = g_list_append (editors, ec);
diff --git a/src/environment.h b/src/environment.h
index 46d1746..71c708f 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -1,10 +1,10 @@
 /**
  * @file    environment.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -36,12 +36,12 @@
 #   define PACKAGE "gummi"
 #   define PACKAGE_NAME "Gummi"
 #   define PACKAGE_VERSION "svn"
-#   define PACKAGE_URL "http://gummi.midnightcoding.org/"
+#   define PACKAGE_URL "https://github.com/alexandervdm/gummi"
 #endif
 
 #define PACKAGE_COMMENTS "Simple LaTeX Editor for GTK+"
 #define PACKAGE_COPYRIGHT "Copyright \xc2\xa9 2009-2012\n\n"\
-                        "Alexander van der Mey\n"\
+                        "Alexander van der Meij\n"\
                         "Wei-Ning Huang\n"\
                         "Dion Timmermann\n"\
                         "Robert Schroll"
@@ -109,8 +109,8 @@ struct _Gummi {
     GuProject* project;
 };
 
-Gummi* gummi_init (GuMotion* mo, GuIOFunc* io, GuLatex* latex, GuBiblio* bib, 
-                   GuTemplate* tpl, GuSnippets* snip, GuTabmanager* tabm, 
+Gummi* gummi_init (GuMotion* mo, GuIOFunc* io, GuLatex* latex, GuBiblio* bib,
+                   GuTemplate* tpl, GuSnippets* snip, GuTabmanager* tabm,
                    GuProject* proj);
 GuEditor* gummi_new_environment (const gchar* filename);
 
@@ -119,9 +119,9 @@ GuEditor* gummi_new_environment (const gchar* filename);
  * non-GUI classes.
  * Please only use this functions if not avoidable.
  */
- 
-gboolean gummi_project_active (void); 
- 
+
+gboolean gummi_project_active (void);
+
 GummiGui* gummi_get_gui (void);
 GuEditor* gummi_get_active_editor (void);
 GuIOFunc* gummi_get_io (void);
diff --git a/src/external.c b/src/external.c
index d68d04f..23c62b2 100644
--- a/src/external.c
+++ b/src/external.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -26,7 +26,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
- 
+
 #include "external.h"
 
 #include "constants.h"
@@ -44,7 +44,7 @@ static gdouble get_texlive_version (void);
 gboolean external_exists (const gchar* program) {
     gchar *fullpath = g_find_program_in_path (program);
     if (fullpath == NULL) return FALSE;
-    
+
     gboolean result = g_file_test (fullpath, G_FILE_TEST_EXISTS);
     g_free(fullpath);
     return result;
@@ -55,24 +55,24 @@ gboolean external_hasflag (const gchar* program, const gchar* flag) {
 }
 
 static gchar* get_version_output (const gchar* command, int linenr) {
-    const gchar* getversion = g_strdup_printf("%s --version", command); 
+    const gchar* getversion = g_strdup_printf("%s --version", command);
     Tuple2 cmdgetv = utils_popen_r (getversion, NULL);
     gchar* output = (gchar*)cmdgetv.second;
     gchar* result = g_strdup ("Unknown");
-    
+
     if (output == NULL) {
         slog (L_ERROR, "Error detecting version for %s. "
                        "Please report a bug\n", command);
         return result;
     }
-    
+
     gchar** splitted = g_strsplit(output, "\n", BUFSIZ);
     result = splitted[linenr];
     return result;
 }
 
 gdouble external_version2 (ExternalProg program) {
-    
+
     switch(program) {
         case EX_TEXLIVE: return get_texlive_version ();
         default: return -1;
@@ -80,17 +80,17 @@ gdouble external_version2 (ExternalProg program) {
 }
 
 gchar* external_version (const gchar* program) {
-    const gchar* getversion = g_strdup_printf("%s --version", program); 
+    const gchar* getversion = g_strdup_printf("%s --version", program);
     Tuple2 cmdgetv = utils_popen_r (getversion, NULL);
     gchar* output = (gchar*)cmdgetv.second;
 
     gchar* result = g_strdup ("Unknown, please report a bug");
-    
+
     if (output == NULL) return result;
-    
+
     gchar** lines = g_strsplit(output, "\n", BUFSIZ);
     result = lines[0];
-    
+
     /* pdfTeX 3.1415926-1.40.10 (TeX Live 2009)
        pdfTeX 3.1415926-1.40.11-2.2 (TeX Live 2010)
        pdfTeX 3.1415926-2.3-1.40.12 (TeX Live 2011)
@@ -101,44 +101,44 @@ gchar* external_version (const gchar* program) {
     else if (STR_EQU (program, C_LATEXMK)) {
         result = version_latexmk (lines[1]);
     }
-    
+
     return result;
 }
 
 static gdouble get_texlive_version (void) {
     gdouble version = 0;
     gchar* output = get_version_output (C_LATEX, 0);
-    
+
     /* Keep in mind that some distros like themselves a lot:
      * pdfTeX 3.1415926-1.40.11-2.2 (TeX Live 2010)
      * pdfTeX 3.1415926-1.40.11-2.2 (TeX Live 2009/Debian)
      * pdfTeX 3.1415926-2.3-1.40.12 (TeX Live 2012/dev/Arch Linux)
      * pdfTeX 3.1415926-2.3-1.40.12 (Web2C 2011)
-     * 
-     * Also, TeXLive utilities from versions before 2008 do not 
+     *
+     * Also, TeXLive utilities from versions before 2008 do not
      * mention the year in the --version tag. */
-     
+
     if ((!utils_subinstr ("TeX Live", output, FALSE)) &&
         (!utils_subinstr ("Web2C", output, FALSE))) {
         return version;
     }
-    
+
     gchar** splitted = g_strsplit (output, "(", BUFSIZ);
     guint size = g_strv_length (splitted);
-    
+
     gchar* segment = g_strdup (splitted[size-1]);
     segment = g_strjoinv("", g_strsplit(segment, "Web2C", -1));
     gchar* resultstr = "";
-    
+
     // make sure to only allow numeric characters in the result:
     int n;
-    for (n=0;n<g_utf8_strlen(segment, -1);n++) {    
+    for (n=0;n<g_utf8_strlen(segment, -1);n++) {
         if (g_ascii_isdigit (segment[n])) {
            gchar* addchar = g_strdup_printf("%c", segment[n]);
            resultstr = g_strconcat (resultstr, addchar, NULL);
         }
     }
-    
+
     version = g_ascii_strtod (resultstr, NULL);
     return version;
 }
diff --git a/src/external.h b/src/external.h
index e3d9140..7bd7ca1 100644
--- a/src/external.h
+++ b/src/external.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/gui/gui-import.c b/src/gui/gui-import.c
index c75798c..8f14d25 100644
--- a/src/gui/gui-import.c
+++ b/src/gui/gui-import.c
@@ -45,17 +45,17 @@ GuImportGui* importgui_init (GtkBuilder* builder) {
     g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 
     GuImportGui* i = g_new0 (GuImportGui, 1);
-    
+
     i->import_panel =
         GTK_HBOX (gtk_builder_get_object (builder, "import_panel"));
-        
+
     i->image_pane =
         GTK_VIEWPORT (gtk_builder_get_object (builder, "imp_pane_image"));
     i->table_pane =
         GTK_VIEWPORT (gtk_builder_get_object (builder, "imp_pane_table"));
     i->matrix_pane =
         GTK_VIEWPORT (gtk_builder_get_object (builder, "imp_pane_matrix"));
-    i->biblio_pane = 
+    i->biblio_pane =
         GTK_VIEWPORT (gtk_builder_get_object (builder, "imp_pane_biblio"));
 
     i->image_file =
@@ -84,9 +84,9 @@ GuImportGui* importgui_init (GtkBuilder* builder) {
         GTK_ADJUSTMENT (gtk_builder_get_object (builder, "matrix_cols"));
     i->matrix_combobracket =
         GTK_COMBO_BOX (gtk_builder_get_object (builder,"matrix_combobracket"));
-        
-    i->biblio_file = 
-         GTK_ENTRY (gtk_builder_get_object (builder, "biblio_file"));   
+
+    i->biblio_file =
+         GTK_ENTRY (gtk_builder_get_object (builder, "biblio_file"));
 
     gtk_adjustment_set_value (i->table_cols, 3);
     gtk_adjustment_set_value (i->table_rows, 3);
@@ -102,7 +102,7 @@ void on_import_tabs_switch_page (GtkNotebook* notebook, GtkNotebookPage* page,
     GList* list = NULL;
     list = gtk_container_get_children (
             GTK_CONTAINER (g_importgui->box_image));
-            
+
 
     while (list) {
         gtk_container_remove (GTK_CONTAINER (g_importgui->box_image),
@@ -153,7 +153,7 @@ void on_import_tabs_switch_page (GtkNotebook* notebook, GtkNotebookPage* page,
 
 void importgui_remove_all_panels () {
     GList* list = NULL;
-    
+
     list = gtk_container_get_children (
             GTK_CONTAINER (g_importgui->import_panel));
     while (list) {
@@ -232,7 +232,7 @@ void on_import_image_apply_clicked (GtkWidget* widget, void* user) {
                 root_path = g_path_get_dirname (g_active_editor->filename);
             relative_path = utils_path_to_relative (root_path, imagefile);
             text =importer_generate_image(relative_path, caption, label, scale);
-            editor_insert_package (g_active_editor, "graphicx");
+            editor_insert_package (g_active_editor, "graphicx", NULL);
             editor_get_current_iter (g_active_editor, &current);
             gtk_text_buffer_begin_user_action (g_e_buffer);
             gtk_text_buffer_insert (g_e_buffer, &current,text,strlen (text));
@@ -254,7 +254,7 @@ void on_import_matrix_apply_clicked (GtkWidget* widget, void* user) {
     gint rows = gtk_adjustment_get_value (g_importgui->matrix_rows);
     gint cols = gtk_adjustment_get_value (g_importgui->matrix_cols);
     const gchar* text = importer_generate_matrix (bracket, rows, cols);
-    editor_insert_package (g_active_editor, "amsmath");
+    editor_insert_package (g_active_editor, "amsmath", NULL);
     editor_get_current_iter (g_active_editor, &current);
     gtk_text_buffer_begin_user_action (g_e_buffer);
     gtk_text_buffer_insert (g_e_buffer, &current, text, strlen (text));
@@ -268,7 +268,7 @@ void on_import_biblio_apply_clicked (GtkWidget* widget, void* user) {
     gchar* basename = NULL;
     gchar* root_path = NULL;
     gchar* relative_path = NULL;
-    
+
     const gchar* filename = gtk_entry_get_text (g_importgui->biblio_file);
 
     if ((filename) && (strlen(filename) != 0)) {
@@ -289,7 +289,7 @@ void on_import_biblio_apply_clicked (GtkWidget* widget, void* user) {
 G_MODULE_EXPORT
 void on_image_file_activate (void) {
     gchar* filename = NULL;
-    
+
     filename = get_open_filename (TYPE_IMAGE);
     if (filename) {
         importer_imagegui_set_sensitive (filename, TRUE);
@@ -300,7 +300,7 @@ void on_image_file_activate (void) {
 G_MODULE_EXPORT
 void on_biblio_file_activate (GtkWidget *widget, void * user) {
     gchar* filename = NULL;
-    
+
     filename = get_open_filename (TYPE_BIBLIO);
     if (filename) {
         gtk_entry_set_text (g_importgui->biblio_file, filename);
diff --git a/src/gui/gui-import.h b/src/gui/gui-import.h
index 8383570..9929897 100644
--- a/src/gui/gui-import.h
+++ b/src/gui/gui-import.h
@@ -60,7 +60,7 @@ struct _GuImportGui {
     GtkAdjustment* matrix_rows;
     GtkAdjustment* matrix_cols;
     GtkComboBox* matrix_combobracket;
-    
+
     GtkEntry* biblio_file;
 };
 
diff --git a/src/gui/gui-infoscreen.c b/src/gui/gui-infoscreen.c
index 0105273..f684088 100644
--- a/src/gui/gui-infoscreen.c
+++ b/src/gui/gui-infoscreen.c
@@ -45,14 +45,14 @@ GuInfoscreenGui* infoscreengui_init (GtkBuilder* builder) {
     g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 
     GuInfoscreenGui* is = g_new0 (GuInfoscreenGui, 1);
-    
+
     is->viewport =
         GTK_VIEWPORT (gtk_builder_get_object (builder, "preview_vport"));
     is->errorpanel =
         GTK_WIDGET(gtk_builder_get_object (builder, "errorpanel"));
     is->drawarea =
         GTK_WIDGET (gtk_builder_get_object (builder, "preview_draw"));
-        
+
     is->header =
         GTK_LABEL (gtk_builder_get_object (builder, "error_header"));
     is->image =
@@ -64,17 +64,17 @@ GuInfoscreenGui* infoscreengui_init (GtkBuilder* builder) {
 
 void infoscreengui_enable (GuInfoscreenGui *is, const gchar *msg) {
     GList* list = NULL;
-    
+
     list = gtk_container_get_children (GTK_CONTAINER (is->viewport));
-    
+
     infoscreengui_set_message (is, msg);
-    
+
     while (list) {
         gtk_container_remove (GTK_CONTAINER (is->viewport),
                 GTK_WIDGET (list->data));
         list = list->next;
     }
-    
+
     gtk_container_add (GTK_CONTAINER (is->viewport),
                 GTK_WIDGET (is->errorpanel));
     gtk_widget_show_all (GTK_WIDGET (is->viewport));
@@ -82,7 +82,7 @@ void infoscreengui_enable (GuInfoscreenGui *is, const gchar *msg) {
 }
 
 void infoscreengui_disable (GuInfoscreenGui *is) {
-    
+
     g_object_ref (is->errorpanel);
     gtk_container_remove (GTK_CONTAINER (is->viewport),
             GTK_WIDGET (is->errorpanel));
diff --git a/src/gui/gui-main.c b/src/gui/gui-main.c
index 7d637ff..ed8027d 100644
--- a/src/gui/gui-main.c
+++ b/src/gui/gui-main.c
@@ -66,8 +66,8 @@ extern GummiGui* gui;
 const gchar* insens_widgets_str[] = {
     "rightpanebox", "tool_save", "tool_bold", "tool_italic", "tool_unline",
     "tool_left", "tool_center", "tool_right", "menu_save", "menu_saveas",
-    "menu_exportpdf", "import_tabs", "menu_close", "menu_export", 
-    "menu_undo", "menu_redo", "menu_cut", "menu_copy", "menu_paste", 
+    "menu_exportpdf", "import_tabs", "menu_close", "menu_export",
+    "menu_undo", "menu_redo", "menu_cut", "menu_copy", "menu_paste",
     "menu_delete", "menu_selectall", "menu_preferences", "menu_find",
     "menu_prev", "menu_next", "menu_pdfcompile", "menu_compileopts",
     "menu_runmakeindex", "menu_runbibtex", "menu_docstat", "menu_spelling",
@@ -83,12 +83,12 @@ GummiGui* gui_init (GtkBuilder* builder) {
     gint i = 0, wx = 0, wy = 0, width = 0, height = 0;
 
     GummiGui* g = g_new0 (GummiGui, 1);
-    
+
     g->builder = builder;
 
     g->mainwindow =
         GTK_WINDOW (gtk_builder_get_object (builder, "mainwindow"));
-    g->toolbar = 
+    g->toolbar =
         GTK_WIDGET (gtk_builder_get_object (builder, "maintoolbar"));
     g->statusbar =
         GTK_STATUSBAR (gtk_builder_get_object (builder, "statusbar"));
@@ -125,7 +125,7 @@ GummiGui* gui_init (GtkBuilder* builder) {
 
     g->docstatswindow =
         GTK_WIDGET (gtk_builder_get_object (builder, "docstatswindow"));
-        
+
     g->menu_runbibtex =
         GTK_MENU_ITEM (gtk_builder_get_object (builder, "menu_runbibtex"));
     g->menu_runmakeindex =
@@ -209,16 +209,16 @@ GummiGui* gui_init (GtkBuilder* builder) {
         gtk_toggle_tool_button_set_active (g->previewoff, FALSE);
         gtk_widget_hide (GTK_WIDGET (g->rightpane));
     }
-    
-    g->menu_autosync = 
+
+    g->menu_autosync =
         GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu_autosync"));
-    
+
     if (latex_can_synctex() && config_get_value ("synctex")) {
         gtk_widget_set_sensitive (GTK_WIDGET (g->menu_autosync), TRUE);
         gboolean async = latex_use_synctex();
         gtk_check_menu_item_set_active (g->menu_autosync, (async? TRUE: FALSE));
     }
-        
+
     if (!config_get_value ("compile_status"))
         gtk_toggle_tool_button_set_active (g->previewoff, TRUE);
 
@@ -247,14 +247,14 @@ gboolean w32popup_wait_event (void *builder) {
 
 	const gchar* count = gtk_label_get_text (GTK_LABEL (gui->w32label));
 	gint number = atoi (count) - 1;
-	
+
 	if (number == 0) {
 
-		gtk_label_set_text (GTK_LABEL (gui->w32label), "");	
+		gtk_label_set_text (GTK_LABEL (gui->w32label), "");
 		gtk_widget_set_sensitive (gui->w32button, TRUE);
 		return FALSE;
 	}
-	gtk_label_set_text (GTK_LABEL (gui->w32label), 
+	gtk_label_set_text (GTK_LABEL (gui->w32label),
 						g_strdup_printf("%d", number));
 	return TRUE;
 }
@@ -265,14 +265,14 @@ void gui_main (GtkBuilder* builder) {
     gtk_widget_show_all (GTK_WIDGET (gui->mainwindow));
 
 	#ifdef WIN32
-    gui->w32window = 
+    gui->w32window =
 			GTK_WIDGET (gtk_builder_get_object (builder, "w32popup"));
-	gui->w32button = 
+	gui->w32button =
 			GTK_WIDGET (gtk_builder_get_object (builder, "w32button"));
-	gui->w32label = 
+	gui->w32label =
 			GTK_WIDGET (gtk_builder_get_object (builder, "w32label"));
     gtk_widget_show (gui->w32window);
-    
+
     g_timeout_add_seconds (1, w32popup_wait_event, NULL);
     #endif
 
@@ -304,10 +304,10 @@ void on_tab_notebook_switch_page(GtkNotebook *notebook, GtkWidget *nbpage,
 
     /* update the title of the mainwindow */
     gui_set_filename_display (g_active_tab, TRUE, FALSE);
-    
+
     /* clear the build log output window */
     gui_buildlog_set_text ("");
-    
+
     previewgui_reset (gui->previewgui);
 }
 
@@ -326,7 +326,7 @@ void on_right_notebook_switch_page(GtkNotebook *notebook, GtkWidget *nbpage,
 
 void gui_set_filename_display (GuTabContext* tc, gboolean title, gboolean label) {
     gchar* filetext = tabmanager_get_tabname (tc);
-    
+
     if (label) tabmanagergui_update_label (tc->page, filetext);
     if (title) gui_set_window_title (tc->editor->filename, filetext);
 }
@@ -351,7 +351,7 @@ void gui_set_window_title (const gchar* filename, const gchar* text) {
 
 void on_recovery_infobar_response (GtkInfoBar* bar, gint res, gpointer filename) {
     gchar* prev_workfile = iofunctions_get_swapfile (filename);
-    
+
     if (res == GTK_RESPONSE_YES) {
         tabmanager_set_content (A_LOAD_OPT, filename, prev_workfile);
     }
@@ -369,12 +369,12 @@ void gui_recovery_mode_enable (GuTabContext* tab, const gchar* filename) {
 				"do you want to recover from it?"), filename);
     gtk_label_set_text (GTK_LABEL (tab->page->barlabel), msg);
     g_free (msg);
-    
+
     gchar* data = g_strconcat (filename, NULL);
-    tab->page->infosignal = 
+    tab->page->infosignal =
         g_signal_connect (g_active_tab->page->infobar, "response",
         G_CALLBACK (on_recovery_infobar_response), (gpointer)data);
-        
+
     gtk_widget_set_sensitive (GTK_WIDGET (tab->editor->view), FALSE);
     gtk_widget_show (tab->page->infobar);
 }
@@ -422,14 +422,14 @@ void gui_save_file (GuTabContext* tab, gboolean saveas) {
             }
         } else goto cleanup;
     }
-    
+
     gchar *text;
     GtkWidget* focus = NULL;
 
     focus = gtk_window_get_focus (gummi_get_gui ()->mainwindow);
     text = editor_grab_buffer (tab->editor);
     gtk_widget_grab_focus (focus);
-    
+
     iofunctions_save_file (gummi->io, filename, text);
 
     if (config_get_value ("autoexport")) {
@@ -529,7 +529,7 @@ void on_button_template_open_clicked (GtkWidget* widget, void* user) {
         gtk_widget_hide (GTK_WIDGET (gummi->templ->templatewindow));
     }
     g_free(templ_name);
-    
+
     if (!gtk_widget_get_sensitive (GTK_WIDGET (gui->rightpane)))
         gui_set_hastabs_sensitive (TRUE);
 }
@@ -565,13 +565,13 @@ void on_template_rowitem_edited (GtkWidget* widget, gchar *path, gchar* filenm,
     g_free (filepath);
 }
 
-G_MODULE_EXPORT 
+G_MODULE_EXPORT
 void on_template_cursor_changed (GtkTreeView *tree, gpointer data) {
     if (!gtk_tree_view_get_selection (tree) == 0) {
         gtk_widget_set_sensitive (gummi->templ->template_open, TRUE);
     }
 }
-    
+
 
 G_MODULE_EXPORT
 void on_bibcolumn_clicked (GtkWidget* widget, void* user) {
@@ -584,7 +584,7 @@ void on_bibcolumn_clicked (GtkWidget* widget, void* user) {
 G_MODULE_EXPORT
 void on_button_biblio_compile_clicked (GtkWidget* widget, void* user) {
     gummi->biblio->progressval = 0.0;
-    
+
     gtk_widget_set_sensitive (widget, FALSE);
     g_timeout_add (10, on_bibprogressbar_update, NULL);
 
@@ -595,7 +595,7 @@ void on_button_biblio_compile_clicked (GtkWidget* widget, void* user) {
                 _("Bibliography compiled without errors"));
         motion_force_compile (gummi->motion);
     } else {
-        statusbar_set_message 
+        statusbar_set_message
         (_("Error compiling bibliography file or none detected..."));
         gtk_progress_bar_set_text (gummi->biblio->progressbar,
                 _("Error compiling bibliography file"));
@@ -704,11 +704,11 @@ void typesetter_setup (void) {
     gtk_widget_set_sensitive (GTK_WIDGET (gui->menu_runmakeindex), status);
     gtk_widget_set_sensitive (GTK_WIDGET (gui->prefsgui->opt_shellescape),
                               status);
-                              
+
     gboolean texormk = (texlive_active() || latexmk_active());
-    
-    
-    
+
+
+
     if (config_get_value("synctex") && texormk) {
         gtk_toggle_button_set_active (gui->prefsgui->opt_synctex, TRUE);
     }
@@ -716,8 +716,8 @@ void typesetter_setup (void) {
         gtk_toggle_button_set_active (gui->prefsgui->opt_synctex, FALSE);
     }
     gtk_widget_set_sensitive (GTK_WIDGET (gui->prefsgui->opt_synctex), texormk);
-    
-    
+
+
     slog (L_INFO, "Typesetter %s configured.\n",config_get_value("typesetter"));
 }
 
@@ -735,7 +735,7 @@ gboolean on_bibprogressbar_update (void* user) {
 gint check_for_save (GuEditor* editor) {
     GtkWidget* dialog;
     gint ret = 0;
-    
+
     if (editor && editor_buffer_changed (editor)){
         dialog = gtk_message_dialog_new (gui->mainwindow,
                      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -749,12 +749,12 @@ gint check_for_save (GuEditor* editor) {
                                 GTK_STOCK_SAVE, GTK_RESPONSE_YES,
                                 NULL);
         gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
-        
+
         gtk_window_set_title (GTK_WINDOW (dialog), _("Unsaved Changes"));
         ret = gtk_dialog_run (GTK_DIALOG (dialog));
         gtk_widget_destroy (dialog);
     }
-    
+
     return ret;
 }
 
@@ -876,12 +876,12 @@ void file_dialog_set_filter (GtkFileChooser* dialog, GuFilterType type) {
             gtk_file_chooser_set_filter (dialog, filter);
             break;
 
-        case TYPE_IMAGE: 
-            /* Only \insertgraphics uses this section now. Make sure 
+        case TYPE_IMAGE:
+            /* Only \insertgraphics uses this section now. Make sure
              * the patterns & mimes are correct before assigning it
 			 * for other functions */
             gtk_file_filter_set_name (filter, _("Supported Image files"));
-            
+
             /* Pdflatex supports different formats than pure latex */
             if (latex_method_active ("texpdf")) {
 				gtk_file_filter_add_pattern (filter, "*.jpg");
@@ -905,7 +905,7 @@ void file_dialog_set_filter (GtkFileChooser* dialog, GuFilterType type) {
             gtk_file_filter_add_pattern (filter, "*.gummi");
             gtk_file_chooser_add_filter (dialog, filter);
             gtk_file_chooser_set_filter (dialog, filter);
-            break;   
+            break;
     }
 }
 
@@ -959,7 +959,7 @@ void gui_buildlog_set_text (const gchar *message) {
         GtkTextIter iter;
         gtk_text_buffer_set_text (gui->errorbuff, message, -1);
         gtk_text_buffer_get_end_iter (gui->errorbuff, &iter);
-		// The following lines are commented out, as they seem to cause 
+		// The following lines are commented out, as they seem to cause
 		// Bug #252.
         //GtkTextMark *mark = gtk_text_buffer_create_mark(gui->errorbuff, NULL, &iter, FALSE);
         //gtk_text_view_scroll_to_mark (gui->errorview, mark, 0.25, FALSE, 0, 0);
@@ -984,10 +984,10 @@ gboolean statusbar_del_message (void* user) {
  */
 void check_preview_timer (void) {
     g_return_if_fail (g_active_tab != NULL);
-    
+
     gtk_text_buffer_set_modified (g_e_buffer, TRUE);
     gummi->latex->modified_since_compile = TRUE;
-    
+
     gui_set_filename_display (g_active_tab, TRUE, TRUE);
 
     motion_start_timer (gummi->motion);
diff --git a/src/gui/gui-main.h b/src/gui/gui-main.h
index 90ddf48..6222ff8 100644
--- a/src/gui/gui-main.h
+++ b/src/gui/gui-main.h
@@ -1,10 +1,10 @@
 /**
  * @file   gui-main.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -47,9 +47,9 @@
 #define RECENT_FILES_NUM 5
 #define TEXCOUNT_OUTPUT_LINES 7
 
-/* These macros should be only used in GUI related classes 
+/* These macros should be only used in GUI related classes
  * which acted as syntax sugar */
-/* These macros should be only used in GUI related classes 
+/* These macros should be only used in GUI related classes
  * which acted as syntax sugar */
 #define g_e_buffer GTK_TEXT_BUFFER (g_active_editor->buffer)
 #define g_e_view GTK_TEXT_VIEW (g_active_editor->view)
@@ -59,7 +59,7 @@
 
 
 #define GUMMI_GUI(x) ((GummiGui*)x)
-typedef struct _GummiGui GummiGui; 
+typedef struct _GummiGui GummiGui;
 
 struct _GummiGui {
     GuMenuGui* menugui;
@@ -92,16 +92,16 @@ struct _GummiGui {
     GtkBuilder *builder;
     GtkWidget *docstatswindow;
     GtkWidget *bibcompile;
-    
+
     GtkMenuItem* menu_runbibtex;
     GtkMenuItem* menu_runmakeindex;
-    
+
     #ifdef WIN32
 		GtkWidget* w32label;
 		GtkWidget* w32button;
 		GtkWidget* w32window;
     #endif
-    
+
     guint statusid;
     gchar* recent_list[5];
 };
@@ -121,7 +121,7 @@ void gui_main (GtkBuilder* builder);
 gboolean gui_quit (void);
 
 
-void gui_set_filename_display (GuTabContext* tc, 
+void gui_set_filename_display (GuTabContext* tc,
                                         gboolean title, gboolean label);
 void gui_set_window_title (const gchar* filename, const gchar* text);
 
diff --git a/src/gui/gui-menu.c b/src/gui/gui-menu.c
index a08118a..3163329 100644
--- a/src/gui/gui-menu.c
+++ b/src/gui/gui-menu.c
@@ -37,7 +37,6 @@
 #include "gui-main.h"
 #include "motion.h"
 #include "project.h"
-#include "update.h"
 
 extern Gummi* gummi;
 extern GummiGui* gui;
@@ -49,44 +48,46 @@ GuMenuGui* menugui_init (GtkBuilder* builder) {
     g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 
     GuMenuGui* m = g_new0 (GuMenuGui, 1);
-    
+
     m->menu_projcreate = GTK_MENU_ITEM(
                         gtk_builder_get_object (builder, "menu_projcreate"));
     m->menu_projopen = GTK_MENU_ITEM(
                         gtk_builder_get_object (builder, "menu_projopen"));
     m->menu_projclose = GTK_MENU_ITEM(
                         gtk_builder_get_object (builder, "menu_projclose"));
-    
+    m->menu_cut = GTK_MENU_ITEM(gtk_builder_get_object (builder, "menu_cut"));
+    m->menu_copy = GTK_MENU_ITEM(gtk_builder_get_object (builder, "menu_copy"));
+
     #ifdef WIN32
     // Please do NOT enable for nix, it has no place on a free OS ;)
-    GtkWidget* donate = 
+    GtkWidget* donate =
 		gtk_image_menu_item_new_with_label ("Support this Project");
-    gtk_image_menu_item_set_image 
-        (GTK_IMAGE_MENU_ITEM(donate), 
+    gtk_image_menu_item_set_image
+        (GTK_IMAGE_MENU_ITEM(donate),
          GTK_WIDGET(gtk_image_new_from_stock(
          GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_MENU)));
-    GtkWidget* helpmenu = 
+    GtkWidget* helpmenu =
 		GTK_WIDGET (gtk_builder_get_object (builder, "menu11"));
     gtk_menu_prepend (GTK_MENU (helpmenu), donate);
     gtk_signal_connect_object (GTK_OBJECT (donate), "activate",
                                GTK_SIGNAL_FUNC (on_menu_donate_activate),
                                NULL);
     #endif
-    
+
     /* TODO: There has to be a better way than this.. (bug 246)
     GtkSettings *settings = gtk_settings_get_default();
     gchar *iconsizes;
     g_object_get(settings, "gtk-icon-sizes", &iconsizes, NULL);
     if (iconsizes != NULL) {
         printf("%s\n", iconsizes);
-    }*/ 
+    }*/
 
     #ifdef WIN32
-        // The 2 non-stock menu items have their pixel size values set 
-        // to the default 16x16 in GLADE. The normal icon-size value is 
+        // The 2 non-stock menu items have their pixel size values set
+        // to the default 16x16 in GLADE. The normal icon-size value is
         // normally set by the GTK theme in gtkrc. For themes using
         // non-default icon sizes or Windows, this 16x16 value will be
-        // wrong. This code sets it to match the gtkrc file that we 
+        // wrong. This code sets it to match the gtkrc file that we
         // supply with the Windows builds:
         GtkWidget* export = gtk_image_menu_item_get_image (
         GTK_IMAGE_MENU_ITEM (gtk_builder_get_object (builder, "menu_export")));
@@ -95,10 +96,10 @@ GuMenuGui* menugui_init (GtkBuilder* builder) {
         gtk_image_set_pixel_size (GTK_IMAGE(export), 13);
         gtk_image_set_pixel_size (GTK_IMAGE(update), 13);
     #endif
- 
 
-    
-    
+
+
+
     return m;
 }
 
@@ -107,7 +108,7 @@ G_MODULE_EXPORT
 void on_menu_donate_activate (GtkWidget* widget, void* user) {
 	//TODO: enhance
 	GtkWidget* dialog;
-    dialog = gtk_message_dialog_new (gui->mainwindow, 
+    dialog = gtk_message_dialog_new (gui->mainwindow,
         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_MESSAGE_INFO,
         GTK_BUTTONS_OK,
@@ -117,7 +118,7 @@ void on_menu_donate_activate (GtkWidget* widget, void* user) {
         "project with a donation, please visit our official website. "
         "Thank you!");
     gtk_window_set_title (GTK_WINDOW (dialog), "Support this project");
-    gtk_dialog_run (GTK_DIALOG (dialog));      
+    gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);
 }
 #endif
@@ -202,16 +203,16 @@ void on_menu_recent_activate (GtkWidget *widget, void *user) {
 G_MODULE_EXPORT
 void on_menu_close_activate (GtkWidget *widget, void* user) {
     GuTabContext* tab = NULL;
-    
+
     tab = (user)? GU_TAB_CONTEXT (user): g_active_tab;
-    
+
     gint ret = check_for_save (tab->editor);
-    
+
     if (GTK_RESPONSE_YES == ret)
         gui_save_file (tab, FALSE);
     else if (GTK_RESPONSE_CANCEL == ret || GTK_RESPONSE_DELETE_EVENT == ret)
         return;
-    
+
     /* Kill typesetter command */
     motion_kill_typesetter(gummi->motion);
 
@@ -264,7 +265,7 @@ gboolean on_menu_quit_activate (void) {
     printf ("   ___ \n"
             "  {o,o}    Thanks for using Gummi!\n"
             "  |)__)    I welcome your feedback at:\n"
-            "  -\"-\"-    http://gummi.midnightcoding.org\n\n");
+            "  -\"-\"-    https://github.com/alexandervdm/gummi\n\n");
     return FALSE;
 }
 
@@ -273,6 +274,22 @@ gboolean on_menu_quit_activate (void) {
  ******************************************************************************/
 
 G_MODULE_EXPORT
+void on_menu_edit_activate (GtkWidget *widget, void *user) {
+    if (g_active_editor == NULL)
+        return;
+
+    if (gtk_text_buffer_get_has_selection
+	(GTK_TEXT_BUFFER(g_active_editor->buffer))) {
+        gtk_widget_set_sensitive (GTK_WIDGET (gui->menugui->menu_cut), TRUE);
+        gtk_widget_set_sensitive (GTK_WIDGET (gui->menugui->menu_copy), TRUE);
+        return;
+    }
+
+    gtk_widget_set_sensitive (GTK_WIDGET (gui->menugui->menu_cut), FALSE);
+    gtk_widget_set_sensitive (GTK_WIDGET (gui->menugui->menu_copy), FALSE);
+}
+
+G_MODULE_EXPORT
 void on_menu_undo_activate (GtkWidget *widget, void* user) {
     editor_undo_change (g_active_editor);
 }
@@ -443,8 +460,8 @@ void on_menu_docstat_activate (GtkWidget *widget, void *user) {
     GMatchInfo* match_info;
     GRegex* regexs[TEXCOUNT_OUTPUT_LINES];
     gchar* res[TEXCOUNT_OUTPUT_LINES] = { 0 };
-    
-    
+
+
     /* TODO: can we deprecate this? */
     const gchar* terms[] = {
         _("Words in text"),
@@ -455,7 +472,7 @@ void on_menu_docstat_activate (GtkWidget *widget, void *user) {
         _("Number of math inlines"),
         _("Number of math displayed")
     };
-    
+
     const gchar* terms_regex[] = {
         "Words in text: ([0-9]*)",
         "Words in headers: ([0-9]*)",
@@ -512,19 +529,19 @@ void on_menu_docstat_activate (GtkWidget *widget, void *user) {
         return;
     }
 
-    gchararray items[6] = {"stats_words", "stats_head", "stats_float", 
+    gchararray items[6] = {"stats_words", "stats_head", "stats_float",
                            "stats_nrhead", "stats_nrfloat", "stats_nrmath"};
     int j = 0;
     GtkLabel *tmp;
-        
+
     for (j = 0; j < 6; j++) {
         gchar *value = items[j];
         tmp = GTK_LABEL(gtk_builder_get_object (gui->builder, value));
         gtk_label_set_text (tmp, res[j]);
     }
-    
 
-    gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (gui->builder, 
+
+    gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (gui->builder,
                     "stats_filename")), tabmanagergui_get_labeltext (g_active_tab->page));
     gtk_widget_show (gui->docstatswindow);
     return;
@@ -544,25 +561,25 @@ void on_menu_spelling_toggled (GtkWidget *widget, void *user) {
     GList *editors;
     GuEditor* ec;
     int ectotal, i;
-    
-    gboolean activate = gtk_check_menu_item_get_active 
+
+    gboolean activate = gtk_check_menu_item_get_active
                         (GTK_CHECK_MENU_ITEM (widget));
-    
+
     editors = gummi_get_all_editors ();
     ectotal = g_list_length (editors);
-    
+
     for (i=0; i<ectotal; i++) {
         ec = g_list_nth_data (editors, i);
         if (activate) {
             editor_activate_spellchecking (ec, TRUE);
         }
-        else { 
+        else {
             editor_activate_spellchecking (ec, FALSE);
         }
     }
     if (activate) config_set_value ("spelling", "True");
     else { config_set_value ("spelling", "False"); }
-            
+
 #endif
 }
 
@@ -584,24 +601,24 @@ void on_menu_snippets_toggled (GtkWidget *widget, void *user) {
 G_MODULE_EXPORT
 void on_menu_project_activate (GtkWidget *widget, void *user) {
     // TODO: perhaps use buffer to run pre compile check */
-    
+
     if (g_active_editor == NULL) {
-		gtk_widget_set_tooltip_text (GTK_WIDGET 
+		gtk_widget_set_tooltip_text (GTK_WIDGET
 					 (gui->menugui->menu_projcreate),
 					_("This function requires an active document"));
 		return;
 	}
-    
+
     if (!gummi_project_active()) {
         gtk_widget_set_sensitive (GTK_WIDGET
                                  (gui->menugui->menu_projopen), TRUE);
         // TODO we should probably have functions for calls like this:
         if (g_active_editor->filename != NULL) {
             gtk_widget_set_sensitive (GTK_WIDGET
-                                 (gui->menugui->menu_projcreate), TRUE);                    
+                                 (gui->menugui->menu_projcreate), TRUE);
         }
         else {
-			gtk_widget_set_tooltip_text (GTK_WIDGET 
+			gtk_widget_set_tooltip_text (GTK_WIDGET
 					 (gui->menugui->menu_projcreate),
 					_("This function requires the current\n"
 					  "active document to be saved. "));
@@ -628,7 +645,7 @@ void on_menu_projcreate_activate (GtkWidget *widget, void *user) {
 
     gchar* filename = get_save_filename (TYPE_PROJECT);
     if (!filename) return;
-    
+
     if (project_create_new (filename)) {
         projectgui_enable (gummi->project, gui->projectgui);
         projectgui_list_projfiles (gummi->project->projfile);
@@ -637,7 +654,7 @@ void on_menu_projcreate_activate (GtkWidget *widget, void *user) {
 
 G_MODULE_EXPORT
 void on_menu_projopen_activate (GtkWidget *widget, void *user) {
-    
+
     gchar* filename = get_open_filename (TYPE_PROJECT);
     if (!filename) return;
 
@@ -655,14 +672,14 @@ void on_menu_projopen_activate (GtkWidget *widget, void *user) {
 
 G_MODULE_EXPORT
 void on_menu_projclose_activate (GtkWidget *widget, void *user) {
-    
+
     if (!gummi->project->projfile) return;
-    
+
     if (project_close ()) {
         projectgui_disable (gummi->project, gui->projectgui);
     }
-    
-    
+
+
 }
 
 /*******************************************************************************
@@ -673,41 +690,29 @@ G_MODULE_EXPORT
 void on_menu_guide_activate (GtkWidget *widget, void *user) {
     GError *error = NULL;
 
-    gtk_show_uri (gdk_screen_get_default(), 
+    gtk_show_uri (gdk_screen_get_default(),
                   C_GUMMIGUIDE, GDK_CURRENT_TIME, &error);
-    
+
     if (error) {
         slog (L_ERROR, "Can't open user guide: %s\n", error->message);
     }
 }
 
 G_MODULE_EXPORT
-void on_menu_update_activate (GtkWidget *widget, void *user) {
-    #ifdef WIN32
-        slog (L_G_INFO, "To be implemented for win32..\n");
-    #else
-        gboolean ret = updatecheck (gui->mainwindow);
-        if (!ret)
-            slog (L_G_ERROR, "Update check failed!\n");
-    #endif
-}
-
-G_MODULE_EXPORT
 void on_menu_about_activate (GtkWidget *widget, void *user) {
     GError* err = NULL;
     gchar* icon_file = g_build_filename (GUMMI_DATA, "icons", "gummi.png", NULL);
     GdkPixbuf* icon = gdk_pixbuf_new_from_file_at_size (icon_file, 80, 80, &err);
     g_free (icon_file);
 
-    const gchar* authors[] = { "Alexander van der Mey\n"
-        "<alexvandermey at gmail.com>",
+    const gchar* authors[] = { "Alexander van der Meij\n"
+        "<alexandervdm at gliese.me>",
         "Wei-Ning Huang\n"
         "<aitjcize at gmail.com>",
+        "",
+        "Former contributors:",
         "Dion Timmermann",
-        "<dion.timmermann at tu-harburg.de>", 
         "Robert Schroll",
-        "<rschroll at gmail.com>\n",
-        "Former contributors:",
         "Thomas van der Burgt",
         "Cameron Grout", NULL };
 
@@ -722,7 +727,7 @@ void on_menu_about_activate (GtkWidget *widget, void *user) {
         "Chinese (Traditional): Wei-Ning Huang\n"
         "Czech: Přemysl Janouch\n"
         "Danish: Jack Olsen\n"
-        "Dutch: Alexander van der Mey\n"
+        "Dutch: Alexander van der Meij\n"
         "French: Yvan Duron & Olivier Brousse\n"
         "German: Thomas Niederprüm\n"
         "Greek: Dimitris Leventeas\n"
@@ -731,10 +736,10 @@ void on_menu_about_activate (GtkWidget *widget, void *user) {
         "Polish: Hubert Kowalski\n"
         "Portugese: Alexandre Guimarães\n"
         "Romanian: Alexandru-Eugen Ichim\n"
-        "Russian: Kruvalig\n"
+        "Russian: Kruvalig & Max Musatov\n"
         "Swedish: Kess Vargavind\n"
-        "Spanish: Carlos Salas Contreras\n";
-        
+        "Spanish: Carlos Salas Contreras & Francisco Javier Serrador\n";
+
     const gchar* documenters[] = {"Guy Edwards", NULL};
 
     GtkAboutDialog* dialog = GTK_ABOUT_DIALOG (gtk_about_dialog_new ());
@@ -753,11 +758,3 @@ void on_menu_about_activate (GtkWidget *widget, void *user) {
     gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (GTK_WIDGET (dialog));
 }
-
-
-
-
-
-
-
-
diff --git a/src/gui/gui-menu.h b/src/gui/gui-menu.h
index e61c691..59f23e6 100644
--- a/src/gui/gui-menu.h
+++ b/src/gui/gui-menu.h
@@ -42,6 +42,8 @@ struct _GuMenuGui {
     GtkMenuItem* menu_projcreate;
     GtkMenuItem* menu_projopen;
     GtkMenuItem* menu_projclose;
+    GtkMenuItem* menu_cut;
+    GtkMenuItem* menu_copy;
 };
 
 GuMenuGui* menugui_init (GtkBuilder* builder);
@@ -52,6 +54,3 @@ void on_menu_close_activate (GtkWidget *widget, void* user);
 #endif
 
 #endif /* __GUMMI_GUI_MENU_H__ */
-
-
-
diff --git a/src/gui/gui-prefs.c b/src/gui/gui-prefs.c
index e5d860e..ade7a30 100644
--- a/src/gui/gui-prefs.c
+++ b/src/gui/gui-prefs.c
@@ -79,9 +79,9 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
     p->wordwrap_button =
         GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "wordwrapping"));
     p->line_numbers =
-        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "line_numbers")); 
+        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "line_numbers"));
     p->highlighting =
-        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "highlighting")); 
+        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "highlighting"));
     p->tabwidth =
         GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "tabwidth"));
     p->spaces_instof_tabs =
@@ -89,9 +89,9 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
     p->autoindentation =
         GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "autoindentation"));
     p->autosaving =
-        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "autosaving")); 
+        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "autosaving"));
     p->compile_status =
-        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "compile_status")); 
+        GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "compile_status"));
     p->autosave_timer =
         GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "autosave_timer"));
     p->combo_languages =
@@ -104,7 +104,7 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
         GTK_LIST_STORE (gtk_builder_get_object (builder, "list_styleschemes"));
     p->default_text =
         GTK_TEXT_VIEW (gtk_builder_get_object (builder, "default_text"));
-    p->default_buffer = 
+    p->default_buffer =
         gtk_text_view_get_buffer (p->default_text);
     p->editor_font =
         GTK_FONT_BUTTON (gtk_builder_get_object (builder, "editor_font"));
@@ -114,7 +114,7 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
         GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "compile_timer"));
     p->autoexport =
         GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "auto_export"));
-        
+
     p->typ_pdflatex =
         GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "typ_pdflatex"));
     p->typ_xelatex =
@@ -130,17 +130,17 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
         GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "method_texdvipdf"));
     p->method_texdvipspdf =
         GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "method_texdvipspdf"));
-        
-    p->opt_shellescape = 
+
+    p->opt_shellescape =
         GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "opt_shellescape"));
-    p->opt_synctex = 
+    p->opt_synctex =
         GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "opt_synctex"));
-        
+
     p->combo_animated_scroll =
         GTK_COMBO_BOX (gtk_builder_get_object (builder, "combo_animated_scroll"));
     p->spin_cache_size =
         GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "spin_cache_size"));
-        
+
     p->view_box = GTK_VBOX (gtk_builder_get_object (builder, "view_box"));
     p->editor_box = GTK_HBOX (gtk_builder_get_object (builder, "editor_box"));
     p->compile_box = GTK_HBOX (gtk_builder_get_object (builder, "compile_box"));
@@ -150,16 +150,16 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
 #ifdef USE_GTKSPELL
     /* list available languages */
 
-    
+
     if (g_file_test (
         g_find_program_in_path("enchant-lsmod"), G_FILE_TEST_EXISTS)) {
-            
+
         Tuple2 pret = utils_popen_r ("enchant-lsmod -list-dicts", NULL);
         if (pret.second != NULL) {
             gchar** output = g_strsplit((gchar*)pret.second, "\n", BUFSIZ);
             gchar** elems = NULL;
             int i;
-    
+
             for(i = 0; output[i] != NULL; i++) {
                 GtkTreeIter iter;
                 elems = g_strsplit (output[i], " ", BUFSIZ);
@@ -205,7 +205,7 @@ GuPrefsGui* prefsgui_init (GtkWindow* mainwindow) {
 void prefsgui_main (GuPrefsGui* prefs, int page) {
 
     gtk_notebook_set_current_page(prefs->notebook, page);
-    
+
     set_all_tab_settings (prefs);
     gtk_widget_show_all (GTK_WIDGET (prefs->prefwindow));
 }
@@ -235,8 +235,8 @@ static void set_tab_view_settings (GuPrefsGui* prefs) {
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->line_numbers),
             TO_BOOL (config_get_value ("line_numbers")));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->highlighting),
-            TO_BOOL (config_get_value ("highlighting")));    
-    
+            TO_BOOL (config_get_value ("highlighting")));
+
 }
 
 static void set_tab_editor_settings (GuPrefsGui* prefs) {
@@ -260,16 +260,16 @@ static void set_tab_fontcolor_settings (GuPrefsGui* prefs) {
     PangoFontDescription* font_desc = pango_font_description_from_string (font);
     gtk_widget_modify_font (GTK_WIDGET (prefs->default_text), font_desc);
     pango_font_description_free (font_desc);
-    
-    gtk_font_button_set_font_name (prefs->editor_font, 
+
+    gtk_font_button_set_font_name (prefs->editor_font,
                                         config_get_value ("font"));
     prefsgui_apply_style_scheme(prefs);
 }
 
 static void set_tab_defaulttext_settings (GuPrefsGui* prefs) {
-    
+
     gchar* text = NULL;
-    
+
     if (!g_file_get_contents (C_WELCOMETEXT, &text, NULL, NULL)) {
         gtk_widget_set_sensitive (GTK_WIDGET(prefs->default_text), FALSE);
         return;
@@ -283,31 +283,31 @@ static void set_tab_compilation_settings (GuPrefsGui* prefs) {
     /* Setting available typesetters and the active one */
     /* TODO: iterate the available typesetter list and gtk_builder the objects
      * maybe.. or not.. */
-     
-    
+
+
     if (pdflatex_detected()) {
-        if (pdflatex_active()) 
+        if (pdflatex_active())
             gtk_toggle_button_set_active (prefs->typ_pdflatex, TRUE);
         gtk_widget_set_sensitive (GTK_WIDGET(prefs->typ_pdflatex), TRUE);
         gtk_widget_set_tooltip_text (GTK_WIDGET(prefs->typ_pdflatex), "");
     }
-    
+
     if (xelatex_detected()) {
-        if (xelatex_active()) 
+        if (xelatex_active())
             gtk_toggle_button_set_active (prefs->typ_xelatex, TRUE);
         gtk_widget_set_sensitive (GTK_WIDGET(prefs->typ_xelatex), TRUE);
         gtk_widget_set_tooltip_text (GTK_WIDGET(prefs->typ_xelatex), "");
     }
-    
+
     if (rubber_detected()) {
-        if (rubber_active()) 
+        if (rubber_active())
             gtk_toggle_button_set_active (prefs->typ_rubber, TRUE);
         gtk_widget_set_sensitive (GTK_WIDGET(prefs->typ_rubber), TRUE);
         gtk_widget_set_tooltip_text (GTK_WIDGET(prefs->typ_rubber), "");
     }
-    
+
     if (latexmk_detected()) {
-        if (latexmk_active()) 
+        if (latexmk_active())
             gtk_toggle_button_set_active (prefs->typ_latexmk, TRUE);
         gtk_widget_set_sensitive (GTK_WIDGET(prefs->typ_latexmk), TRUE);
         gtk_widget_set_tooltip_text (GTK_WIDGET(prefs->typ_latexmk), "");
@@ -315,20 +315,20 @@ static void set_tab_compilation_settings (GuPrefsGui* prefs) {
 
     if (latex_method_active ("texpdf")) {
         gtk_toggle_button_set_active (prefs->method_texpdf, TRUE);
-    }    
+    }
     else if (latex_method_active ("texdvipdf")) {
         gtk_toggle_button_set_active (prefs->method_texdvipdf, TRUE);
     }
     else if (latex_method_active ("texdvipspdf")) {
         gtk_toggle_button_set_active (prefs->method_texdvipspdf, TRUE);
     }
-    
+
     if (!latex_use_shellescaping())
         gtk_toggle_button_set_active (prefs->opt_shellescape, FALSE);
     else {
         gtk_toggle_button_set_active (prefs->opt_shellescape, TRUE);
     }
-    
+
     if (latex_can_synctex()) {
         if (config_get_value ("synctex")) {
             gtk_toggle_button_set_active (prefs->opt_synctex, TRUE);
@@ -346,13 +346,13 @@ static void set_tab_preview_settings (GuPrefsGui* prefs) {
 
     if (!config_get_value ("compile_status"))
         gtk_widget_set_sensitive (GTK_WIDGET (prefs->compile_timer), FALSE);
-        
+
     gtk_spin_button_set_value (prefs->compile_timer,
                                atoi (config_get_value ("compile_timer")));
     /* compile scheme */
     if (STR_EQU (config_get_value ("compile_scheme"), "real_time"))
         gtk_combo_box_set_active (prefs->compile_scheme, 1);
-                               
+
     if (STR_EQU (config_get_value ("animated_scroll"), "always")) {
         gtk_combo_box_set_active (prefs->combo_animated_scroll, 0);
     } else if (STR_EQU (config_get_value ("animated_scroll"), "never")) {
@@ -360,7 +360,7 @@ static void set_tab_preview_settings (GuPrefsGui* prefs) {
     } else {
         gtk_combo_box_set_active (prefs->combo_animated_scroll, 1);
     }
-    
+
     gtk_spin_button_set_value (prefs->spin_cache_size,
                                atoi (config_get_value ("cache_size")));
 }
@@ -385,8 +385,8 @@ static void set_tab_miscellaneous_settings (GuPrefsGui* prefs) {
         }
         ++count;
         valid = gtk_tree_model_iter_next (combo_lang, &iter);
-    }    
-    
+    }
+
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->autoexport),
             TO_BOOL (config_get_value ("autoexport")));
 
@@ -448,7 +448,7 @@ void toggle_highlighting (GtkWidget* widget, void* user) {
     GList* tab = gummi->tabmanager->tabs;
 
     config_set_value ("highlighting", newval? "True": "False");
-    
+
     while (tab) {
         gtk_source_view_set_highlight_current_line (GTK_SOURCE_VIEW
                 (GU_TAB_CONTEXT (tab->data)->editor->view), newval);
@@ -572,8 +572,8 @@ void on_prefs_close_clicked (GtkWidget* widget, void* user) {
         gtk_text_buffer_get_end_iter (gui->prefsgui->default_buffer, &end);
         text = gtk_text_buffer_get_text (gui->prefsgui->default_buffer, &start,
                                          &end, FALSE);
-                                         
-        utils_set_file_contents (C_WELCOMETEXT, text, -1);  
+
+        utils_set_file_contents (C_WELCOMETEXT, text, -1);
     }
     g_free (text);
 
@@ -584,7 +584,7 @@ G_MODULE_EXPORT
 void on_prefs_reset_clicked (GtkWidget* widget, void* user) {
     config_set_default ();
     utils_copy_file (C_DEFAULTTEXT, C_WELCOMETEXT, NULL);
-    
+
     set_all_tab_settings (gui->prefsgui);
 }
 
@@ -631,8 +631,8 @@ void on_cache_size_value_changed(GtkWidget* widget, void* user) {
     gchar buf[16];
 
     config_set_value("cache_size", g_ascii_dtostr (buf, 16, (double)newval));
-    
-     
+
+
     g_idle_add((GSourceFunc) run_garbage_collector, gui->previewgui);
 }
 
@@ -693,7 +693,7 @@ void on_method_texpdf_toggled (GtkToggleButton* widget, void* user) {
         config_set_value ("compile_steps", "texpdf");
         slog (L_INFO, "Changed compile method to \"tex->pdf\"\n");
     }
-    
+
 }
 
 G_MODULE_EXPORT
diff --git a/src/gui/gui-prefs.h b/src/gui/gui-prefs.h
index 429c812..c95b3d9 100644
--- a/src/gui/gui-prefs.h
+++ b/src/gui/gui-prefs.h
@@ -62,7 +62,7 @@ struct _GuPrefsGui {
     GtkComboBox* compile_scheme;
     GtkSpinButton* compile_timer;
     GtkSpinButton* spin_cache_size;
-    
+
     GtkToggleButton* typ_pdflatex;
     GtkToggleButton* typ_xelatex;
     GtkToggleButton* typ_rubber;
@@ -70,10 +70,10 @@ struct _GuPrefsGui {
 
     GtkToggleButton* method_texpdf;
     GtkToggleButton* method_texdvipdf;
-    GtkToggleButton* method_texdvipspdf;    
+    GtkToggleButton* method_texdvipspdf;
 
     GtkComboBox* combo_animated_scroll;
-    
+
     GtkVBox* view_box;
     GtkHBox* editor_box;
     GtkHBox* compile_box;
diff --git a/src/gui/gui-preview.c b/src/gui/gui-preview.c
index 0f5821e..4bfeb1a 100644
--- a/src/gui/gui-preview.c
+++ b/src/gui/gui-preview.c
@@ -1,6 +1,6 @@
 /**
  * @file    gui-preview.c
- * @brief 
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
@@ -120,10 +120,10 @@ static void block_handlers_current_page(GuPreviewGui* pc);
 static void unblock_handlers_current_page(GuPreviewGui* pc);
 static void set_fit_mode(GuPreviewGui* pc, enum GuPreviewFitMode fit_mode);
 
-static gboolean on_page_input_lost_focus(GtkWidget *widget, GdkEvent  *event, 
+static gboolean on_page_input_lost_focus(GtkWidget *widget, GdkEvent  *event,
                                          gpointer   user_data);
-                                         
-                                         
+
+
 static gboolean on_button_pressed(GtkWidget* w, GdkEventButton* e, void* user);
 
 /* Functions for layout and painting */
@@ -164,7 +164,7 @@ GuPreviewGui* previewgui_init (GtkBuilder * builder) {
     GdkColor bg = {0, 0xed00, 0xec00, 0xeb00};
     p->previewgui_viewport =
         GTK_VIEWPORT (gtk_builder_get_object (builder, "preview_vport"));
-    p->previewgui_toolbar = 
+    p->previewgui_toolbar =
         GTK_WIDGET (gtk_builder_get_object (builder, "previewgui_toolbar"));
     p->statuslight =
         GTK_WIDGET (gtk_builder_get_object (builder, "tool_statuslight"));
@@ -244,8 +244,8 @@ GuPreviewGui* previewgui_init (GtkBuilder * builder) {
     // The scale to correct for the users DPI
     gdouble screen_dpi = gdk_screen_get_resolution (
 						 gdk_screen_get_default());
-            
-	/* the gdk screen functions do not work properly on win32, so we 
+
+	/* the gdk screen functions do not work properly on win32, so we
 	 * should probably return a default value (or find an alternative)*/
     if (screen_dpi == -1) screen_dpi = 96.0;
 	gdouble poppler_scale = screen_dpi / 72.0;
@@ -256,17 +256,17 @@ GuPreviewGui* previewgui_init (GtkBuilder * builder) {
     }
 
     p->fit_mode = FIT_NONE;
-    
+
     /* TODO: temporary measure because the config system does not look up
              default value if the setting is undefined */
     if (STR_EQU (config_get_value("zoommode"), "")) {
         config_set_value("zoommode", "pagewidth");
     }
-    
+
     if (STR_EQU (config_get_value("animated_scroll"), "")) {
         config_set_value("animated_scroll", "always");
     }
-    
+
     if (STR_EQU (config_get_value("cache_size"), "")) {
         config_set_value("cache_size", "150");
     }
@@ -280,7 +280,7 @@ GuPreviewGui* previewgui_init (GtkBuilder * builder) {
                     p->page_layout_one_column), TRUE);
         p->pageLayout = POPPLER_PAGE_LAYOUT_ONE_COLUMN;
     }
-    
+
     p->sync_nodes = NULL;
 
     slog (L_INFO, "using libpoppler %s\n", poppler_get_version ());
@@ -432,11 +432,11 @@ static void update_fit_scale(GuPreviewGui* pc) {
             pc->previewgui_viewport->view_window);
 #else
         gint view_width_without_bar, view_height_without_bar;
-        gdk_drawable_get_size (pc->previewgui_viewport->view_window, 
-                                &view_width_without_bar, 
+        gdk_drawable_get_size (pc->previewgui_viewport->view_window,
+                                &view_width_without_bar,
                                 &view_height_without_bar);
 #endif
-    
+
 
     if (gtk_widget_get_visible(gtk_scrolled_window_get_vscrollbar(
                     GTK_SCROLLED_WINDOW(pc->scrollw)))) {
@@ -498,10 +498,10 @@ static void update_fit_scale(GuPreviewGui* pc) {
     slog(L_DEBUG, "Document size wrong for fitting, changing scale from %f "
             "to %f.\n", pc->scale, scale);
 
-    // We do not really know where to center the scroll that might appear, 
-    // passing the center of the window causes the toolbar to not be darn 
+    // We do not really know where to center the scroll that might appear,
+    // passing the center of the window causes the toolbar to not be darn
     // (don't ask me why).
-    // Passing NAN as position to center the scrolling on, causes no 
+    // Passing NAN as position to center the scrolling on, causes no
     // scrolling to happen (this is checked in previewgui_goto_xy)
     // So this is basically a bugfix - but I could not see any unwanted side
     // effects up till now...
@@ -547,7 +547,7 @@ static void previewgui_set_current_page(GuPreviewGui* pc, gint page) {
     //L_F_DEBUG;
 
     pc->current_page = page;
-    
+
     update_page_input(pc);
 
 }
@@ -574,21 +574,21 @@ static void update_page_positions(GuPreviewGui* pc) {
 
     if (is_continuous(pc)) {
         gint y = get_document_margin(pc);
-        
+
         for (i=0; i<pc->n_pages; i++) {
             page_inner(pc, i).y = y;
             page_inner(pc, i).width = get_page_width(pc, i)*pc->scale;
-            page_inner(pc, i).x = MAX((fov.width - page_inner(pc, i).width)/2, 
+            page_inner(pc, i).x = MAX((fov.width - page_inner(pc, i).width)/2,
                                        get_document_margin(pc));
             page_inner(pc, i).height = get_page_height(pc, i)*pc->scale;
             page_inner(pc, i).layer = 0;
-            
+
             y += page_inner(pc, i).height + get_page_margin(pc);
         }
-        
+
         y -= get_page_margin(pc);
         y += get_document_margin(pc);
-        
+
         if (y < fov.height) {
             gint diff = (fov.height - y) / 2;
             for (i=0; i<pc->n_pages; i++) {
@@ -596,19 +596,19 @@ static void update_page_positions(GuPreviewGui* pc) {
             }
         }
     } else {
-        
+
         for (i=0; i<pc->n_pages; i++) {
             page_inner(pc, i).height = get_page_height(pc, i)*pc->scale;
             page_inner(pc, i).width = get_page_width(pc, i)*pc->scale;
             page_inner(pc, i).y = MAX((fov.height - page_inner(pc, i).height)/2,
                                        get_document_margin(pc));
-            page_inner(pc, i).x = MAX((fov.width - page_inner(pc, i).width)/2, 
+            page_inner(pc, i).x = MAX((fov.width - page_inner(pc, i).width)/2,
                                        get_document_margin(pc));
             page_inner(pc, i).layer = i;
         }
-        
+
     }
-    
+
     for (i=0; i<pc->n_pages; i++) {
         page_outer(pc, i).x = page_inner(pc, i).x - 1;
         page_outer(pc, i).y = page_inner(pc, i).y - 1;
@@ -618,7 +618,7 @@ static void update_page_positions(GuPreviewGui* pc) {
     }
 }
 
-static gboolean on_page_input_lost_focus(GtkWidget *widget, GdkEvent  *event, 
+static gboolean on_page_input_lost_focus(GtkWidget *widget, GdkEvent  *event,
                                          gpointer   user_data) {
     update_page_input(user_data);
     return FALSE;
@@ -697,12 +697,12 @@ static void previewgui_invalidate_renderings(GuPreviewGui* pc) {
     for (i = 0; i < pc->n_pages; i++) {
         remove_page_rendering(pc, i);
     }
-    
+
     if (pc->cache_size != 0) {
         slog(L_ERROR, "Cleared all page renderings, but cache not empty. "
                 "Cache size is %iB.\n", pc->cache_size);
     }
-    
+
 }
 
 static gboolean remove_page_rendering(GuPreviewGui* pc, gint page) {
@@ -713,9 +713,9 @@ static gboolean remove_page_rendering(GuPreviewGui* pc, gint page) {
 
     cairo_surface_destroy((pc->pages + page)->rendering);
     (pc->pages + page)->rendering = NULL;
-    pc->cache_size -= page_inner(pc, page).width * 
-            page_inner(pc, page).height * BYTES_PER_PIXEL; 
-            
+    pc->cache_size -= page_inner(pc, page).width *
+            page_inner(pc, page).height * BYTES_PER_PIXEL;
+
     return TRUE;
 }
 
@@ -840,8 +840,8 @@ static void update_scaled_size(GuPreviewGui* pc) {
     } else {
         pc->height_scaled = get_page_height(pc, pc->current_page) * pc->scale;
     }
-    
-    
+
+
 
     pc->width_scaled = pc->width_pages*pc->scale;
 }
@@ -859,7 +859,7 @@ static void previewgui_set_scale(GuPreviewGui* pc, gdouble scale, gdouble x,
     gdouble old_y = (gtk_adjustment_get_value(pc->vadj) + y) /
             (pc->height_scaled + 2*get_document_margin(pc));
 
-    // We have to do this before changing the scale, as otherwise the cache 
+    // We have to do this before changing the scale, as otherwise the cache
     // size would be calcualted wrong!
     previewgui_invalidate_renderings(pc);
 
@@ -931,9 +931,9 @@ void previewgui_set_pdffile (GuPreviewGui* pc, const gchar *uri) {
     pc->restore_x = -1;
     pc->restore_y = -1;
 
-    load_document(pc, FALSE);   
+    load_document(pc, FALSE);
 
-    // This is mainly for debugging - to make sure the boxes in the preview disappear.    
+    // This is mainly for debugging - to make sure the boxes in the preview disappear.
     synctex_clear_sync_nodes(pc);
 
     // Restore scale and fit mode
@@ -958,7 +958,7 @@ void previewgui_set_pdffile (GuPreviewGui* pc, const gchar *uri) {
     g_signal_handler_unblock(pc->combo_sizes, pc->combo_sizes_changed_handler);
 
     gtk_widget_queue_draw (pc->drawarea);
-    
+
     previewgui_goto_page (pc, 0);
 }
 
@@ -967,7 +967,7 @@ void previewgui_refresh (GuPreviewGui* pc, GtkTextIter *sync_to,
     //L_F_DEBUG;
     /* We lock the mutex to prevent previewing imcomplete PDF file, i.e
      * compiling. Also prevent PDF from changing (compiling) when previewing */
-    if (!g_mutex_trylock (gummi->motion->compile_mutex)) return;
+    if (!g_mutex_trylock (&gummi->motion->compile_mutex)) return;
 
     /* This line is very important, if no pdf exist, preview will fail */
     if (!pc->uri || !utils_path_exists (pc->uri + usize)) goto unlock;
@@ -988,36 +988,36 @@ void previewgui_refresh (GuPreviewGui* pc, GtkTextIter *sync_to,
     load_document(pc, TRUE);
     update_page_positions(pc);
 
-    if (config_get_value ("synctex") && config_get_value ("autosync") && 
+    if (config_get_value ("synctex") && config_get_value ("autosync") &&
             synctex_run_parser(pc, sync_to, tex_file)) {
-        
-        
+
+
         SyncNode *node;
         if ((node = synctex_one_node_found(pc)) == NULL) {
-            // See if the nodes are so close they all fit in the window 
+            // See if the nodes are so close they all fit in the window
             // in that case we just merge them
             synctex_merge_nodes(pc);
         }
-        
+
 #if HAVE_POPPLER_PAGE_GET_SELECTED_TEXT
         if ((node = synctex_one_node_found(pc)) == NULL) {
             // Search for words in the pdf
             synctex_filter_results(pc, sync_to);
         }
-        // Here we could try merging again - but only with nodes which 
+        // Here we could try merging again - but only with nodes which
         // contained the searched text
 #endif
-        
+
         // If we have only one node left/selected, scroll ot it.
         if ((node = synctex_one_node_found(pc)) != NULL) {
            synctex_scroll_to_node(pc, node);
         }
-        
+
     } else {
-        
-        // This is mainly for debugging - to make sure the boxes in the preview disappear.  
+
+        // This is mainly for debugging - to make sure the boxes in the preview disappear.
         synctex_clear_sync_nodes(pc);
-        
+
         if (pc->current_page >= pc->n_pages) {
             previewgui_goto_page (pc, pc->n_pages-1);
         }
@@ -1027,7 +1027,7 @@ void previewgui_refresh (GuPreviewGui* pc, GtkTextIter *sync_to,
     gtk_widget_queue_draw (pc->drawarea);
 
 unlock:
-    g_mutex_unlock (gummi->motion->compile_mutex);
+    g_mutex_unlock (&gummi->motion->compile_mutex);
 }
 
 static gboolean synctex_run_parser(GuPreviewGui* pc, GtkTextIter *sync_to, gchar* tex_file) {
@@ -1051,26 +1051,26 @@ static gboolean synctex_run_parser(GuPreviewGui* pc, GtkTextIter *sync_to, gchar
          * SyncTeX can return several nodes. It seems best to use the last one, as
          * this one rarely is below (usually slighly above) the edited line.
          */
-         
+
         while ((node = synctex_next_result(sync_scanner))) {
-        
+
             SyncNode *sn = g_new0(SyncNode, 1);
-        
+
             sn->page = synctex_node_page(node) - 1; // syncTeX counts from 1, but poppler from 0
             sn->x = synctex_node_box_visible_h(node);
             sn->y = synctex_node_box_visible_v(node);
             sn->width = synctex_node_box_visible_width(node);
             sn->height = synctex_node_box_visible_height(node);
             sn->y -= sn->height;    // We want y to be the upper value
-            
+
             pc->sync_nodes = g_slist_append(pc->sync_nodes, sn);
-            
+
         }
     }
 
     synctex_scanner_free(sync_scanner);
-    
-    return TRUE;    
+
+    return TRUE;
 }
 
 #if HAVE_POPPLER_PAGE_GET_SELECTED_TEXT
@@ -1084,51 +1084,51 @@ static void synctex_filter_results(GuPreviewGui* pc, GtkTextIter *sync_to) {
     GtkTextIter wordStart = *sync_to;
     int i;
     for (i=0; i<5; i++) {
-    
+
         gtk_text_iter_backward_word_start(&wordStart);
-        
+
         GtkTextIter wordEnd = wordStart;
         gtk_text_iter_forward_word_end(&wordEnd);
-        
+
 
         if (gtk_text_iter_compare(&wordStart, &wordEnd) >= 0) {
             break;
         }
-            
+
         gchar *word = g_strconcat("\\b", gtk_text_iter_get_text(&wordStart, &wordEnd), "\\b", NULL);
-        
+
         //gchar *pattern g_strconcat
-        
+
         slog(L_DEBUG, "Searching for word \"%s\"\n", word);
 
         GSList *nl = pc->sync_nodes;
-        
+
         while (nl != NULL) {
-        
+
             SyncNode *sn =  nl->data;
-            
+
             PopplerRectangle selection;
             selection.x1 = sn->x;               // lower left corner
             selection.y1 = sn->y + sn->height;  // lower left corner
             selection.x2 = sn->x + sn->width;   // upper right corner
             selection.y2 = sn->y;               // upper right corner
-            
+
             PopplerPage* ppage = poppler_document_get_page(pc->doc, sn->page);
-            gchar *node_text = poppler_page_get_selected_text(ppage, 
+            gchar *node_text = poppler_page_get_selected_text(ppage,
                         POPPLER_SELECTION_WORD, &selection);
-            
+
             //slog(L_DEBUG, "Node contains text\"%s\"\n", node_text);
-            
+
             if (g_regex_match_simple(word, node_text, 0, 0)) {
                 sn->score += 1;
             }
-            
+
             g_free(node_text);
             g_object_unref(ppage);
-        
+
             nl = nl->next;
         }
-        
+
         g_free(word);
     }
 }
@@ -1136,22 +1136,22 @@ static void synctex_filter_results(GuPreviewGui* pc, GtkTextIter *sync_to) {
 
 
 static SyncNode* synctex_one_node_found(GuPreviewGui* pc) {
-    
+
     if (g_slist_length(pc->sync_nodes) == 1) {
         SyncNode *node = g_slist_nth_data(pc->sync_nodes, 0);
         node->score = -1;
         return node;
     }
-    
+
     // See if we have found a single match
     GSList *nl = pc->sync_nodes;
-    
+
     gint score_max_id = -1;
     gint score_other = 0;
     gint n = 0;
     while (nl != NULL) {
         SyncNode *sn =  nl->data;
-    
+
         if (sn->score > score_other) {
             score_other = sn->score;
             score_max_id = n;
@@ -1160,17 +1160,17 @@ static SyncNode* synctex_one_node_found(GuPreviewGui* pc) {
             // the first one..
             score_max_id = -1;
         }
-    
+
         nl = nl->next;
         n++;
     }
-    
+
     if (score_max_id >= 0) {
         SyncNode *node = g_slist_nth_data(pc->sync_nodes, score_max_id);
         node->score = -1;
         return node;
     }
-    
+
     return NULL;
 }
 
@@ -1180,47 +1180,47 @@ static void synctex_merge_nodes(GuPreviewGui* pc) {
     gint y1 = INT_MAX;   // upper left corner
     gint x2 = -1;   // lower right corner
     gint y2 = -1;   // lower right corner
-    
+
     gint page = -1;
-    
+
     GSList *nl = pc->sync_nodes;
-    
+
     while (nl != NULL) {
-    
+
         SyncNode *sn =  nl->data;
-        
-        
+
+
         slog(L_DEBUG, "Nodes (%i, %i), w=%i, h=%i, P=%i\n", sn->x, sn->y, sn->width, sn->height, sn->page);
-        
+
         if (page == -1) {
             page = sn->page;
         } else if (page != sn->page) {
             return; // The Nodes are on different pages. We don't hande this for now...
         }
-        
+
         x1 = MIN(x1, sn->x);
         y1 = MIN(y1, sn->y);
         x2 = MAX(x2, sn->x + sn->width);
         y2 = MAX(y2, sn->y + sn->height);
-    
+
         nl = nl->next;
     }
-    
+
     if ((y2-y1)*pc->scale < gtk_adjustment_get_page_size(pc->vadj)/3) {
         SyncNode *sn = g_new0(SyncNode, 1);
         sn->y = y1;
         sn->x = x1;
-        
+
         sn->width = x2 - x1;
         sn->height = y2 - y1;
         sn->page = page;
-        
+
         slog(L_DEBUG, "Merged nodes to (%i, %i), w=%i, h=%i, p=%i\n", sn->x, sn->y, sn->width, sn->height, sn->page);
-        
+
         synctex_clear_sync_nodes(pc);
         pc->sync_nodes = g_slist_append(pc->sync_nodes, sn);
     }
-    
+
 }
 
 static void synctex_clear_sync_nodes(GuPreviewGui* pc) {
@@ -1229,10 +1229,10 @@ static void synctex_clear_sync_nodes(GuPreviewGui* pc) {
         SyncNode *node = el->data;
         g_free(node);
         node = NULL;
-        
+
         el = el->next;
     }
-    
+
     g_slist_free (pc->sync_nodes);
     pc->sync_nodes = NULL;
 }
@@ -1245,7 +1245,7 @@ static void synctex_scroll_to_node(GuPreviewGui* pc, SyncNode* node) {
     gdouble node_x = MAX(get_document_margin(pc),
                           (adjpage_width - pc->width_scaled) / 2);
     gdouble node_y;
-    
+
     if (is_continuous(pc)) {
         node_y = MAX(get_document_margin(pc),
                                (adjpage_height - pc->height_scaled) / 2);
@@ -1258,7 +1258,7 @@ static void synctex_scroll_to_node(GuPreviewGui* pc, SyncNode* node) {
         gdouble height = get_page_height(pc, pc->current_page) * pc->scale;
         node_y = MAX(get_document_margin(pc), (adjpage_height-height)/2);
     }
-    
+
     node_y += node->y * pc->scale;
     node_x += node->x * pc->scale;
     gdouble node_height = node->height * pc->scale;
@@ -1268,7 +1268,7 @@ static void synctex_scroll_to_node(GuPreviewGui* pc, SyncNode* node) {
     gdouble view_width = adjpage_width;
     gdouble view_y = gtk_adjustment_get_value(pc->vadj);
     gdouble view_height = adjpage_height;
-    
+
     slog(L_DEBUG, "node: (%f, %f), w=%f, h=%f\n", node_x, node_y, node_width,
             node_height);
     slog(L_DEBUG, "view: (%f, %f), w=%f, h=%f\n", view_x, view_y,
@@ -1291,7 +1291,7 @@ static void synctex_scroll_to_node(GuPreviewGui* pc, SyncNode* node) {
     } else {
         to_y = node_y;
     }
-        
+
     if (node_x > view_x && node_x + node_width < view_x + view_width) {
         to_x = view_x;
     } else if (node_width < view_width) {
@@ -1299,12 +1299,12 @@ static void synctex_scroll_to_node(GuPreviewGui* pc, SyncNode* node) {
     } else {
         to_x = node_x;
     }
-    
+
     if (!is_continuous(pc) && pc->current_page != node->page) {
-    
+
         previewgui_goto_page (pc, node->page);
         previewgui_goto_xy(pc, to_x, to_y);
-    
+
     } else {
         if (STR_EQU (config_get_value ("animated_scroll"), "always") ||
             STR_EQU (config_get_value ("animated_scroll"), "autosync")) {
@@ -1380,11 +1380,11 @@ void previewgui_goto_xy (GuPreviewGui* pc, gdouble x, gdouble y) {
     }
     //L_F_DEBUG;
 
-    x = CLAMP(x, 0, gtk_adjustment_get_upper(pc->hadj) - 
+    x = CLAMP(x, 0, gtk_adjustment_get_upper(pc->hadj) -
                     gtk_adjustment_get_page_size(pc->hadj));
-    y = CLAMP(y, 0, gtk_adjustment_get_upper(pc->vadj) - 
+    y = CLAMP(y, 0, gtk_adjustment_get_upper(pc->vadj) -
                     gtk_adjustment_get_page_size(pc->vadj));
-        
+
     // Minimize the number of calls to on_adjustment_changed
     block_handlers_current_page(pc);
     gtk_adjustment_set_value(pc->hadj, x);
@@ -1466,10 +1466,10 @@ static cairo_surface_t* get_page_rendering(GuPreviewGui* pc, int page) {
         PopplerPage* ppage = poppler_document_get_page(pc->doc, page);
         p->rendering = do_render(ppage, pc->scale, p->width, p->height);
         g_object_unref(ppage);
-        pc->cache_size += page_inner(pc, page).width * 
+        pc->cache_size += page_inner(pc, page).width *
                 page_inner(pc, page).height * BYTES_PER_PIXEL;
-    
-        // Trigger the garbage collector to be run - it will exit if nothing is TBD.    
+
+        // Trigger the garbage collector to be run - it will exit if nothing is TBD.
         g_idle_add( (GSourceFunc) run_garbage_collector, pc);
     }
 
@@ -1528,7 +1528,7 @@ void on_page_input_changed (GtkEntry* entry, void* user) {
     newpage -= 1;
     newpage = MAX(newpage, 0);
     newpage = MIN(newpage, gui->previewgui->n_pages);
-    
+
     if (STR_EQU (config_get_value ("animated_scroll"), "always")) {
         previewgui_scroll_to_page (gui->previewgui, newpage);
     } else {
@@ -1613,15 +1613,15 @@ static void paint_page (cairo_t *cr, GuPreviewGui* pc, gint page, gint x, gint y
 
     GSList *nl = pc->sync_nodes;
     while (nl != NULL && in_debug_mode()) {
-    
+
         SyncNode *sn =  nl->data;
-    
+
         if (sn->page == page) {
             gint mark_x = sn->x * pc->scale;
             gint mark_y = sn->y * pc->scale;
             gint mark_width = sn->width * pc->scale;
             gint mark_height = sn->height * pc->scale;
-        
+
             cairo_set_line_width (cr, 1);
             if (sn->score < 0) {
                 cairo_set_source_rgb (cr, 1, 0, 0); // Mark selected node red
@@ -1633,16 +1633,16 @@ static void paint_page (cairo_t *cr, GuPreviewGui* pc, gint page, gint x, gint y
             cairo_rectangle (cr, x+mark_x-1, y+mark_y-1, mark_width+2, mark_height+2);
             cairo_stroke (cr);
         }
-        
+
         nl = nl->next;
     }
-    
+
     cairo_surface_destroy(rendering);
 }
 
 static inline LayeredRectangle get_fov(GuPreviewGui* pc) {
     //L_F_DEBUG;
-    
+
     LayeredRectangle fov;
     fov.x = gtk_adjustment_get_value(pc->hadj);
     fov.y = gtk_adjustment_get_value(pc->vadj);
@@ -1653,13 +1653,13 @@ static inline LayeredRectangle get_fov(GuPreviewGui* pc) {
     } else {
         fov.layer = pc->current_page;
     }
-    
+
     return fov;
 }
 
 /**
  *  Tests for the intersection of both rectangles src1 and src2.
- *  If dest is set and there is a intersection, it will be the intersecting, 
+ *  If dest is set and there is a intersection, it will be the intersecting,
  *  rectangle. If dest is set but src1 and src2 do not intersect, dest's width
  *  and height will be set to 0. All other values will be undefined. Dest may be
  *  the same as src1 or src2.
@@ -1677,14 +1677,14 @@ static gboolean layered_rectangle_intersect(const LayeredRectangle *src1,
         }
         return FALSE;
     }
-                                  
+
     if (src1->layer == src2->layer) {
-   
+
         gint dest_x = MAX (src1->x, src2->x);
         gint dest_y = MAX (src1->y, src2->y);
         gint dest_x2 = MIN (src1->x + src1->width, src2->x + src2->width);
         gint dest_y2 = MIN (src1->y + src1->height, src2->y + src2->height);
-        
+
         if (dest_x2 > dest_x && dest_y2 > dest_y) {
             if (dest) {
                 dest->x = dest_x;
@@ -1696,7 +1696,7 @@ static gboolean layered_rectangle_intersect(const LayeredRectangle *src1,
             return TRUE;
         }
     }
-    
+
     if (dest) {
         dest->width = 0;
         dest->height = 0;
@@ -1723,14 +1723,14 @@ static gboolean layered_rectangle_union(const LayeredRectangle *src1,
         }
         return FALSE;
     }
-    
+
     if (dest) {
-    
+
         gint dest_x = MIN (src1->x, src2->x);
         gint dest_y = MIN (src1->y, src2->y);
         gint dest_x2 = MAX (src1->x + src1->width, src2->x + src2->width);
         gint dest_y2 = MAX (src1->y + src1->height, src2->y + src2->height);
-    
+
         dest->x = dest_x;
         dest->y = dest_y;
         dest->width = dest_x2 - dest_x;
@@ -1739,7 +1739,7 @@ static gboolean layered_rectangle_union(const LayeredRectangle *src1,
             dest->layer = src1->layer;
         }
     }
-    
+
     if (src1->layer != src2->layer) {
         return FALSE;
     }
@@ -1747,18 +1747,18 @@ static gboolean layered_rectangle_union(const LayeredRectangle *src1,
 }*/
 
 gboolean run_garbage_collector(GuPreviewGui* pc) {
-    
+
     gint max_cache_size = atoi (config_get_value ("cache_size")) * 1024 * 1024;
-    
+
     if (pc->cache_size < max_cache_size) {
         return FALSE;
     }
-    
+
     LayeredRectangle fov = get_fov(pc);
-    
+
     gint first = -1;
     gint last = -1;
-    
+
     gint i;
     for (i=0; i < pc->n_pages; i++) {
         if (layered_rectangle_intersect(&fov, &(page_inner(pc, i)), NULL)) {
@@ -1768,12 +1768,12 @@ gboolean run_garbage_collector(GuPreviewGui* pc) {
             last = i;
         }
     }
-    
+
     if (first == -1) {
         slog(L_ERROR, "No pages are shown. Clearing whole cache.\n");
         previewgui_invalidate_renderings(pc);
     }
-    
+
     gint n=0;
     gint dist = MAX(first, pc->n_pages - 1 - last);
     for (; dist > 0; dist--) {
@@ -1788,7 +1788,7 @@ gboolean run_garbage_collector(GuPreviewGui* pc) {
         if (pc->cache_size < max_cache_size / 2) {
             break;
         }
-        
+
         gint down = last + dist;
         if (down < pc->n_pages && down >= 0) {
             if (!layered_rectangle_intersect(&fov, &(page_inner(pc, down)), NULL)) {
@@ -1801,14 +1801,14 @@ gboolean run_garbage_collector(GuPreviewGui* pc) {
             break;
         }
     }
-    
+
     if (n == 0) {
         slog(L_DEBUG, "Could not delete any pages from cache. All pages are "
                 "currently visible.\n");
     } else {
         slog(L_DEBUG, "Deleted %i pages from cache.\n", n);
     }
-        
+
     return FALSE;   // We only want this to run once - so always return false!
 }
 
@@ -1999,7 +1999,7 @@ static void draw2page(GuPreviewGui* pc, gint dx, gint dy, gint *pp, gint *px, gi
 
     *px -= MAX(get_document_margin(pc),
                           (adjpage_width - pc->width_scaled) / 2);
-    
+
     if (is_continuous(pc)) {
         *py -= MAX(get_document_margin(pc),
                                (adjpage_height - pc->height_scaled) / 2);
@@ -2017,7 +2017,7 @@ static void draw2page(GuPreviewGui* pc, gint dx, gint dy, gint *pp, gint *px, gi
         *py -= MAX(get_document_margin(pc), (adjpage_height-height)/2);
         *pp += pc->current_page;
     }
-    
+
     //TODO Check if we still are inside a page...
 }
 
@@ -2032,36 +2032,36 @@ gboolean on_button_pressed(GtkWidget* w, GdkEventButton* e, void* user) {
     gint x;
     gint y;
     draw2page(pc, e->x, e->y, &page, &x, &y);
-    
+
     if (e->state & GDK_CONTROL_MASK) {
-    
-        
+
+
         slog(L_DEBUG, "Ctrl-click to %i, %i\n", x, y);
-    
+
         synctex_scanner_t sync_scanner = synctex_scanner_new_with_output_file(pc->uri, C_TMPDIR, 1);
-        
+
         if(synctex_edit_query(sync_scanner, page+1, x/pc->scale, y/pc->scale)>0) {
             synctex_node_t node;
             /*
              * SyncTeX can return several nodes. It seems best to use the last one, as
              * this one rarely is below (usually slighly above) the edited line.
              */
-             
+
             if ((node = synctex_next_result(sync_scanner))) {
-            
+
                 const gchar *file = synctex_scanner_get_name(sync_scanner, synctex_node_tag(node));
                 gint line = synctex_node_line(node);
-            
+
                 slog(L_DEBUG, "File \"%s\", Line %i\n", file, line);
-                
+
                 // FIXME: Go to the editor containing the file "file"!
                 editor_scroll_to_line(gummi_get_active_editor(), line-1);
-                
+
             }
         }
 
         synctex_scanner_free(sync_scanner);
-    
+
     }
 
     pc->prev_x = e->x;
@@ -2096,9 +2096,9 @@ gboolean on_resize (GtkWidget* w, GdkRectangle* r, void* user) {
 
     update_fit_scale(pc);
     update_page_positions(pc);
-    
+
     fov = get_fov(pc);
-    previewgui_goto_xy (pc, x_rel*pc->width_scaled - fov.width/2, 
+    previewgui_goto_xy (pc, x_rel*pc->width_scaled - fov.width/2,
                             y_rel*pc->height_scaled - fov.height/2);
 
     return FALSE;
diff --git a/src/gui/gui-preview.h b/src/gui/gui-preview.h
index 2dcdf95..35bda34 100644
--- a/src/gui/gui-preview.h
+++ b/src/gui/gui-preview.h
@@ -1,10 +1,10 @@
 /**
  * @file   gui-preview.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -31,7 +31,7 @@
 #define __GUMMI_GUI_PREVIEW_H__
 
 #include <gtk/gtk.h>
-#include <poppler.h> 
+#include <poppler.h>
 
 #define PAGE_MARGIN 14
 #define DOCUMENT_MARGIN (PAGE_MARGIN/2)
@@ -47,14 +47,14 @@
 #define BYTES_PER_PIXEL 4
 
 /**
- *  These "Layered" Rectangles are just like normal GdkRectangles, except the 
+ *  These "Layered" Rectangles are just like normal GdkRectangles, except the
  *  have a layer assigned. 2 Rectangles can only intersect or be unioned if they
  *  are on the same layer.
- * 
- *  In the future these structs should be used to describe the position of a 
- *  page. In continuous mode all pages are on the same layer (0). In Paged mode, 
- *  they are on different layers. The field of view (fov) rectangle, that 
- *  describes the portion of the preview that is currently visible is on the 
+ *
+ *  In the future these structs should be used to describe the position of a
+ *  page. In continuous mode all pages are on the same layer (0). In Paged mode,
+ *  they are on different layers. The field of view (fov) rectangle, that
+ *  describes the portion of the preview that is currently visible is on the
  *  layer/page that should currently be displayed (0 in continuous mode).
  */
 typedef struct _LayeredRectangle LayeredRectangle;
@@ -67,9 +67,9 @@ struct _LayeredRectangle {
 };
 
 enum GuPreviewFitMode {
-    FIT_NONE = 0, 
-    FIT_WIDTH, 
-    FIT_HEIGHT, 
+    FIT_NONE = 0,
+    FIT_WIDTH,
+    FIT_HEIGHT,
     FIT_BOTH
 };
 
@@ -78,13 +78,13 @@ typedef struct _GuPreviewPage GuPreviewPage;
 
 struct _GuPreviewPage {
     cairo_surface_t* rendering;
-    
+
     double height;
     double width;
-    
+
     LayeredRectangle inner; // Position of the page itself
     LayeredRectangle outer; // Position of the page + border & shadow
-    
+
 };
 
 #define GU_PREVIEW_GUI(x) ((GuPreviewGui*)x)
@@ -141,7 +141,7 @@ struct _GuPreviewGui {
     GuPreviewPage *pages;
     enum GuPreviewFitMode fit_mode;
     gint cache_size;
-    
+
     gint document_width_scaling;
     gint document_height_scaling;
     gint document_width_non_scaling;
diff --git a/src/gui/gui-project.c b/src/gui/gui-project.c
index 8f778ab..2a8ce6c 100644
--- a/src/gui/gui-project.c
+++ b/src/gui/gui-project.c
@@ -45,22 +45,22 @@ GuProjectGui* projectgui_init (GtkBuilder* builder) {
     g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 
     GuProjectGui* p = g_new0 (GuProjectGui, 1);
-    
+
     p->proj_name = GTK_LABEL (gtk_builder_get_object (builder, "proj_name"));
     p->proj_path = GTK_LABEL (gtk_builder_get_object (builder, "proj_path"));
-    p->proj_nroffiles = 
+    p->proj_nroffiles =
             GTK_LABEL (gtk_builder_get_object (builder, "proj_nroffiles"));
-    
-    p->proj_addbutton = 
+
+    p->proj_addbutton =
             GTK_BUTTON (gtk_builder_get_object (builder, "proj_addbutton"));
-    p->proj_rembutton = 
+    p->proj_rembutton =
             GTK_BUTTON (gtk_builder_get_object (builder, "proj_rembutton"));
-    
+
     p->list_projfiles =
         GTK_LIST_STORE (gtk_builder_get_object (builder, "list_projfiles"));
     p->proj_treeview =
         GTK_TREE_VIEW (gtk_builder_get_object (builder, "proj_treeview"));
-        
+
     return p;
 }
 
@@ -79,7 +79,7 @@ int projectgui_list_projfiles (gchar* active_proj) {
     gint amount, i;
     gchar* name;
     gchar* path;
-    
+
     GtkListStore* store = gui->projectgui->list_projfiles;
     gtk_list_store_clear (store);
 
@@ -87,17 +87,17 @@ int projectgui_list_projfiles (gchar* active_proj) {
         slog (L_ERROR, "%s\n", err->message);
         return -1;
     }
-    
+
     files = project_list_files (content);
     amount = g_list_length (files);
-    
+
     for (i=0; i < amount; i++) {
         GdkPixbuf* pic = NULL;
         gchar* tmp = g_list_nth_data (files, i);
         name = g_path_get_basename (tmp);
         path = g_path_get_dirname (tmp);
         gtk_list_store_append (store, &iter);
-        
+
         // 0=ROOT, 1=ERROR
         if (i == 0) pic = projectgui_get_status_pixbuf (0);
         if (!g_file_test (tmp, G_FILE_TEST_EXISTS)) {
@@ -129,36 +129,36 @@ GdkPixbuf* projectgui_get_status_pixbuf (int status) {
 void projectgui_enable (GuProject* pr, GuProjectGui* prgui) {
     const gchar* projbasename = g_path_get_basename (pr->projfile);
     const gchar* projrootpath = g_path_get_dirname (pr->rootfile);
-    
+
     gtk_label_set_text (prgui->proj_name, projbasename);
     gtk_label_set_text (prgui->proj_path, projrootpath);
-    gtk_label_set_text (prgui->proj_nroffiles, 
+    gtk_label_set_text (prgui->proj_nroffiles,
                         g_strdup_printf("%d", pr->nroffiles));
-    
+
     // for visible information when window is shrinked, see #439 -A
-    gtk_widget_set_tooltip_text 
+    gtk_widget_set_tooltip_text
                         (GTK_WIDGET (prgui->proj_name), projbasename);
-    gtk_widget_set_tooltip_text 
+    gtk_widget_set_tooltip_text
                         (GTK_WIDGET (prgui->proj_path), projrootpath);
-                        
+
     gtk_widget_set_sensitive (GTK_WIDGET (prgui->proj_addbutton), TRUE);
     gtk_widget_set_sensitive (GTK_WIDGET (prgui->proj_rembutton), TRUE);
     tablabel_set_bold_text (g_active_tab->page);
 }
 
 void projectgui_disable (GuProject* pr, GuProjectGui* prgui) {
-    
+
     gtk_list_store_clear (gui->projectgui->list_projfiles);
-    
+
     gtk_label_set_text (prgui->proj_name, "");
     gtk_label_set_text (prgui->proj_path, "");
     gtk_label_set_text (prgui->proj_nroffiles, "");
 
-    gtk_widget_set_tooltip_text 
+    gtk_widget_set_tooltip_text
                         (GTK_WIDGET (prgui->proj_name), "");
-    gtk_widget_set_tooltip_text 
+    gtk_widget_set_tooltip_text
                         (GTK_WIDGET (prgui->proj_path), "");
-    
+
     gtk_widget_set_sensitive (GTK_WIDGET (prgui->proj_addbutton), FALSE);
     gtk_widget_set_sensitive (GTK_WIDGET (prgui->proj_rembutton), FALSE);
 }
@@ -166,13 +166,13 @@ void projectgui_disable (GuProject* pr, GuProjectGui* prgui) {
 G_MODULE_EXPORT
 void on_projfile_add_clicked (GtkWidget* widget, void* user) {
     gchar* selected = NULL;
-    
+
     selected = get_open_filename (TYPE_LATEX);
-    
+
     if (selected) {
         if (project_add_document (gummi->project->projfile, selected)) {
             int amount = projectgui_list_projfiles (gummi->project->projfile);
-            gtk_label_set_text (gui->projectgui->proj_nroffiles, 
+            gtk_label_set_text (gui->projectgui->proj_nroffiles,
                                 g_strdup_printf("%d", amount));
             gui_open_file (selected);
         }
@@ -187,17 +187,17 @@ G_MODULE_EXPORT
 void on_projfile_rem_clicked (GtkWidget* widget, void* user) {
     GtkTreeIter iter;
     gchar* value;
-    
+
     GtkTreeModel* model = GTK_TREE_MODEL (gui->projectgui->list_projfiles);
-    GtkTreeSelection* selection = gtk_tree_view_get_selection 
+    GtkTreeSelection* selection = gtk_tree_view_get_selection
                                          (gui->projectgui->proj_treeview);
-                                         
+
     if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
         gtk_tree_model_get (model, &iter, 3, &value, -1);
-    
+
         if (project_remove_document (gummi->project->projfile, value)) {
             int amount = projectgui_list_projfiles (gummi->project->projfile);
-            gtk_label_set_text (gui->projectgui->proj_nroffiles, 
+            gtk_label_set_text (gui->projectgui->proj_nroffiles,
                                 g_strdup_printf("%d", amount));
         }
     }
diff --git a/src/gui/gui-project.h b/src/gui/gui-project.h
index 2cb16a6..bcf5c17 100644
--- a/src/gui/gui-project.h
+++ b/src/gui/gui-project.h
@@ -43,14 +43,14 @@ typedef struct _GuProjectGui GuProjectGui;
 struct _GuProjectGui {
     GtkListStore* list_projfiles;
     GtkTreeView* proj_treeview;
-    
+
     GtkButton* proj_addbutton;
     GtkButton* proj_rembutton;
-    
+
     GtkLabel* proj_name;
     GtkLabel* proj_path;
     GtkLabel* proj_nroffiles;
-    
+
 };
 
 GuProjectGui* projectgui_init (GtkBuilder* builder);
diff --git a/src/gui/gui-snippets.c b/src/gui/gui-snippets.c
index 0abfc97..c6fc36d 100644
--- a/src/gui/gui-snippets.c
+++ b/src/gui/gui-snippets.c
@@ -71,11 +71,11 @@ GuSnippetsGui* snippetsgui_init (GtkWindow* mainwindow) {
         GTK_TREE_VIEW (gtk_builder_get_object (builder, "snippets_tree_view"));
     s->snippet_scroll =
         GTK_SCROLLED_WINDOW(gtk_builder_get_object (builder, "snippet_scroll"));
-    s->tab_trigger_entry = 
+    s->tab_trigger_entry =
         GTK_ENTRY (gtk_builder_get_object (builder, "tab_trigger_entry"));
-    s->accelerator_entry = 
+    s->accelerator_entry =
         GTK_ENTRY (gtk_builder_get_object (builder, "accelerator_entry"));
-    s->list_snippets = 
+    s->list_snippets =
         GTK_LIST_STORE (gtk_builder_get_object (builder, "list_snippets"));
     s->snippet_renderer = GTK_CELL_RENDERER_TEXT
         (gtk_builder_get_object (builder, "snippet_renderer"));
@@ -230,7 +230,7 @@ void on_snippetsgui_selected_text_clicked (GtkWidget* widget, void* user) {
 G_MODULE_EXPORT
 void on_snippetsgui_filename_clicked (GtkWidget* widget, void* user) {
     snippetsgui_insert_at_current(gui->snippetsgui, "$FILENAME");
-    
+
 }
 
 G_MODULE_EXPORT
@@ -248,7 +248,7 @@ void on_button_new_snippet_clicked (GtkWidget* widget, void* user) {
 
     gtk_list_store_append (s->list_snippets, &iter);
     g_object_set (s->snippet_renderer, "editable", TRUE, NULL);
-    
+
     col = gtk_tree_view_get_column (s->snippets_tree_view, 0);
     model = gtk_tree_view_get_model (s->snippets_tree_view);
     path = gtk_tree_model_get_path (model, &iter);
@@ -283,7 +283,7 @@ void on_button_remove_snippet_clicked (GtkWidget* widget, void* user) {
         gtk_tree_model_get (model, &iter, 0, &name, 1, &key, 2, &accel, -1);
         path = gtk_tree_model_get_path (model, &iter);
         path_str = gtk_tree_path_to_string (path);
-        
+
         /* Because this function is also called by on_snippet_renderer_edited
          * where the snippet to be remove isn't inserted into slist, we only
          * remove if the snippets is already in the slist */
@@ -430,7 +430,7 @@ void on_snippet_renderer_edited (GtkCellRendererText* renderer, gchar *path,
     GtkTreeIter iter;
     GtkTreeModel* model = NULL;
     GtkTreeSelection* selection = NULL;
-    
+
     g_object_set (renderer, "editable", FALSE, NULL);
     model = gtk_tree_view_get_model (s->snippets_tree_view);
     selection = gtk_tree_view_get_selection (s->snippets_tree_view);
diff --git a/src/gui/gui-tabmanager.c b/src/gui/gui-tabmanager.c
index 4056faf..6771843 100644
--- a/src/gui/gui-tabmanager.c
+++ b/src/gui/gui-tabmanager.c
@@ -43,7 +43,7 @@ GuTabmanagerGui* tabmanagergui_init (GtkBuilder* builder) {
     tm->notebook =
         GTK_NOTEBOOK (gtk_builder_get_object (builder, "tab_notebook"));
     g_object_set (tm->notebook, "tab-border", 0, NULL);
-    
+
     tm->unsavednr = 0;
     return tm;
 }
@@ -52,26 +52,26 @@ int tabmanagergui_create_page (GuTabContext* tc, GuEditor* editor) {
     GuTabPage* tp = g_new0(GuTabPage, 1);
     tc->page = tp;
     int pos;
-    
+
     tp->scrollw = gtk_scrolled_window_new (NULL, NULL);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(tp->scrollw),
                                     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-                                    
+
     gchar* labeltext = tabmanager_get_tabname (tc);
     tabmanagergui_create_label (tp, labeltext);
-    g_signal_connect (tp->button, "clicked", 
+    g_signal_connect (tp->button, "clicked",
                       G_CALLBACK (on_menu_close_activate), tc);
     tabmanagergui_create_infobar (tp);
 
-    gtk_container_add (GTK_CONTAINER (tp->scrollw), 
+    gtk_container_add (GTK_CONTAINER (tp->scrollw),
                        GTK_WIDGET (editor->view));
-                       
+
     tp->editorbox = gtk_vbox_new (FALSE, 0);
 
     gtk_box_pack_start (GTK_BOX (tp->editorbox), tp->infobar, FALSE, FALSE, 0);
     gtk_box_pack_end (GTK_BOX (tp->editorbox), tp->scrollw, TRUE, TRUE, 0);
-    
-    pos = gtk_notebook_append_page (GTK_NOTEBOOK (g_tabnotebook), 
+
+    pos = gtk_notebook_append_page (GTK_NOTEBOOK (g_tabnotebook),
                                     tp->editorbox, GTK_WIDGET (tp->labelbox));
 
     gtk_widget_show_all (tp->editorbox);
@@ -79,30 +79,30 @@ int tabmanagergui_create_page (GuTabContext* tc, GuEditor* editor) {
 }
 
 void tabmanagergui_create_infobar (GuTabPage* tp) {
-    // we will probably want to make a separate file for infobar 
-    // procedures that we can attach to hboxes in both the editor 
+    // we will probably want to make a separate file for infobar
+    // procedures that we can attach to hboxes in both the editor
     // and the preview window, TODO for 0.7.0 -Alex
     GtkWidget* infobar = NULL;
     GtkWidget* message = NULL;
     GtkWidget* area = NULL;
-    
+
     infobar = gtk_info_bar_new ();
     gtk_widget_set_no_show_all (infobar, TRUE);
     message = gtk_label_new ("");
     gtk_label_set_line_wrap (GTK_LABEL(message), TRUE);
-    
+
     gtk_widget_show (message);
     area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
     gtk_container_add (GTK_CONTAINER (area), message);
-    
+
     gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
                             GTK_STOCK_YES, GTK_RESPONSE_YES);
     gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
                             GTK_STOCK_NO, GTK_RESPONSE_NO);
-                  
+
     gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar),
                                   GTK_MESSAGE_WARNING);
-                                  
+
     tp->barlabel = message;
     tp->infobar = infobar;
 }
@@ -116,21 +116,21 @@ void tabmanagergui_create_label (GuTabPage* tp, gchar* labeltext) {
     tp->labelbox = gtk_event_box_new ();
     hbox = GTK_HBOX (gtk_hbox_new (FALSE, 0));
     tp->unsavednr = ++count;
-    
+
     gtk_event_box_set_visible_window (GTK_EVENT_BOX (tp->labelbox), FALSE);
     gtk_container_add (GTK_CONTAINER(tp->labelbox), GTK_WIDGET (hbox));
-    
+
     tp->label = GTK_LABEL (gtk_label_new (labeltext));
 
     gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (tp->label), TRUE, TRUE, 5);
-    
+
     tp->button = GTK_BUTTON (gtk_button_new());
     image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
     gtk_button_set_image (tp->button, image);
-    g_object_set (tp->button, "relief", GTK_RELIEF_NONE, 
+    g_object_set (tp->button, "relief", GTK_RELIEF_NONE,
                          "focus-on-click", FALSE, NULL);
     gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (tp->button), FALSE,FALSE,0);
-    
+
     rcstyle = gtk_rc_style_new ();
     rcstyle->xthickness = rcstyle->ythickness = 0;
     gtk_widget_modify_style (GTK_WIDGET (tp->button), rcstyle);
@@ -145,9 +145,9 @@ gchar* tabmanagergui_get_labeltext (GuTabPage* tp) {
 }
 
 gint tabmanagergui_replace_page (GuTabContext* tc, GuEditor* newec) {
-    
+
     gummi->tabmanager->active_tab->editor = newec;
-    
+
     gtk_container_remove (GTK_CONTAINER (tc->page->scrollw),
                           GTK_WIDGET (g_active_editor->view));
     editor_destroy (g_active_editor);
@@ -155,7 +155,7 @@ gint tabmanagergui_replace_page (GuTabContext* tc, GuEditor* newec) {
                        GTK_WIDGET (newec->view));
     gtk_widget_show (GTK_WIDGET(newec->view));
 
-    int pos = gtk_notebook_page_num (g_tabnotebook, 
+    int pos = gtk_notebook_page_num (g_tabnotebook,
                             gummi->tabmanager->active_tab->page->editorbox);
     return pos;
 }
diff --git a/src/gui/gui-tabmanager.h b/src/gui/gui-tabmanager.h
index cd10539..d714c94 100644
--- a/src/gui/gui-tabmanager.h
+++ b/src/gui/gui-tabmanager.h
@@ -43,11 +43,11 @@ typedef struct _GuTabPage GuTabPage;
 struct _GuTabPage {
     GtkWidget* scrollw;
     GtkWidget* editorbox;
-    
+
     GtkWidget* infobar;
     GtkWidget* barlabel;
     gint infosignal;
-    
+
     GtkWidget* labelbox;
     GtkLabel* label;
     gint position;
diff --git a/src/importer.c b/src/importer.c
index bb8a787..5b8c632 100644
--- a/src/importer.c
+++ b/src/importer.c
@@ -1,10 +1,10 @@
 /**
  * @file   importer.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -37,6 +37,8 @@
 #include "environment.h"
 #include "utils.h"
 
+extern Gummi* gummi;
+
 const gchar align_type[][4] = { "l", "c", "r" };
 const gchar bracket_type[][16] = { "matrix", "pmatrix", "bmatrix",
                                   "Bmatrix", "vmatrix", "Vmatrix" };
@@ -46,8 +48,8 @@ const gchar* importer_generate_table (gint rows, gint cols, gint borders,
     gint i = 0, j = 0;
     static gchar result[BUFSIZ * 2] = { 0 };
     gchar table[BUFSIZ * 2] = { 0 },
-          begin_tabular[BUFSIZ] = "\\begin{tabular}{", 
-          end_tabular[] = "\n\\end{tabular}\n", 
+          begin_tabular[BUFSIZ] = "\\begin{tabular}{",
+          end_tabular[] = "\n\\end{tabular}\n",
           line[] = "\n\\hline",
           tmp[BUFSIZ / 8];
 
@@ -122,6 +124,14 @@ const gchar* importer_generate_image (const gchar* path, const gchar* caption,
     /* clear previous data */
     result[0] = 0;
 
+    // Filepath notation corrections for Windows systems:
+    #ifdef WIN32
+    path = g_strjoinv("/", g_strsplit(path, "\\", -1));
+    if (utils_subinstr (" ", path, FALSE)) {
+        editor_insert_package (g_active_editor, "grffile", "space");
+    }
+    #endif
+
     snprintf (scale_str, 16, "%.2f", scale);
 
     /* some locales use ',' as seperator, replace them as '.' */
diff --git a/src/importer.h b/src/importer.h
index f8bf242..6814570 100644
--- a/src/importer.h
+++ b/src/importer.h
@@ -1,10 +1,10 @@
 /**
  * @file    importer.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/iofunctions.c b/src/iofunctions.c
index d7a58cb..dbdfbb3 100644
--- a/src/iofunctions.c
+++ b/src/iofunctions.c
@@ -1,10 +1,10 @@
 /**
  * @file    iofunctions.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -77,9 +77,9 @@ void iofunctions_load_default_text (gboolean loopedonce) {
         utils_copy_file (C_DEFAULTTEXT, C_WELCOMETEXT, &copyerr);
         if (!loopedonce) return iofunctions_load_default_text (TRUE);
     }
-    
+
     if (text) editor_fill_buffer (ec, text);
-    
+
     gtk_text_buffer_set_modified (GTK_TEXT_BUFFER (ec->buffer), FALSE);
     g_free (text);
 }
@@ -105,7 +105,7 @@ void iofunctions_real_load_file (GObject* hook, const gchar* filename) {
     GuEditor* ec = NULL;
 
     ec = gummi_get_active_editor();
-    
+
     /* get the file contents */
     if (FALSE == (result = g_file_get_contents (filename, &text, NULL, &err))) {
         slog (L_G_ERROR, "g_file_get_contents (): %s\n", err->message);
@@ -121,29 +121,29 @@ void iofunctions_real_load_file (GObject* hook, const gchar* filename) {
 
 cleanup:
     g_free (decoded);
-    g_free (text); 
+    g_free (text);
 }
 
 void iofunctions_save_file (GuIOFunc* io, gchar* filename, gchar *text) {
     gchar* status = NULL;
 
     status = g_strdup_printf (_("Saving %s..."), filename);
-    statusbar_set_message (status);    
+    statusbar_set_message (status);
     g_free (status);
-    
+
     GObject *savecontext = g_object_new(G_TYPE_OBJECT, NULL);
-    
+
     g_object_set_data (savecontext, "filename", filename);
     g_object_set_data (savecontext, "text", text);
-    
+
     g_signal_emit_by_name (io->sig_hook, "document-write", savecontext);
-    
-    gtk_text_buffer_set_modified 
+
+    gtk_text_buffer_set_modified
                 (GTK_TEXT_BUFFER(gummi_get_active_editor()->buffer), FALSE);
 }
 
 void iofunctions_real_save_file (GObject* hook, GObject* savecontext) {
-    
+
     gboolean result = FALSE;
     gchar* filename = NULL;
     gchar* encoded = NULL;
@@ -154,21 +154,21 @@ void iofunctions_real_save_file (GObject* hook, GObject* savecontext) {
     text = g_object_get_data (savecontext, "text");
 
     encoded = iofunctions_encode_text (text);
-    
+
     /* set the contents of the file to the text from the buffer */
     if (filename != NULL) {
         if (! (result = g_file_set_contents (filename, encoded, -1, &err))) {
             slog (L_ERROR, "g_file_set_contents (): %s\n", err->message);
         }
     }
-        
+
     if (result == FALSE) {
         slog (L_G_ERROR, _("%s\nPlease try again later."), err->message);
         g_error_free (err);
     }
 
     g_free (encoded);
-    g_free (text); 
+    g_free (text);
     g_object_unref (savecontext);
 }
 
@@ -176,12 +176,12 @@ gchar* iofunctions_get_swapfile (const gchar* filename) {
     gchar* basename = NULL;
     gchar* dirname = NULL;
     gchar* swapfile = NULL;
-    
+
     basename = g_path_get_basename (filename);
     dirname = g_path_get_dirname (filename);
     swapfile = g_strdup_printf ("%s%c.%s.swp", dirname,
             G_DIR_SEPARATOR, basename);
-            
+
     g_free (dirname);
     g_free (basename);
     return swapfile;
@@ -189,7 +189,7 @@ gchar* iofunctions_get_swapfile (const gchar* filename) {
 
 gboolean iofunctions_has_swapfile (const gchar* filename) {
     if (filename == NULL) return FALSE;
-    
+
     gchar* swapfile = iofunctions_get_swapfile (filename);
     if (utils_path_exists (swapfile)) {
         return TRUE;
@@ -210,7 +210,7 @@ void iofunctions_stop_autosave (void) {
         return;
     }
     else {
-        slog (L_ERROR, "Error occured stopping autosaving..");
+        slog (L_ERROR, "Error occured stopping autosaving..\n");
     }
 }
 
@@ -227,7 +227,7 @@ char* iofunctions_decode_text (gchar* text) {
 
     if (! (result = g_locale_to_utf8 (text, -1, &read, &written, &err))) {
         g_error_free (err);
-        slog (L_ERROR, "failed to convert text from default locale, trying "
+        slog (L_ERROR, "Failed to convert text from default locale, trying "
                 "ISO-8859-1\n");
         gsize in_size = strlen (text), out_size = in_size * 2;
         gchar* out = (gchar*)g_malloc (out_size);
@@ -268,14 +268,14 @@ gboolean iofunctions_autosave_cb (void *user) {
 
     GList *tabs = gummi_get_all_tabs();
     tabtotal = g_list_length(tabs);
-    
+
     /* skip the autosave procedure when there are no tabs open */
-    if (tabtotal == 0) return TRUE; 
+    if (tabtotal == 0) return TRUE;
 
     for (i=0; i < tabtotal; i++) {
         tab = g_list_nth_data (tabs, i);
         ec = tab->editor;
-        
+
         if ((ec->filename) && editor_buffer_changed (ec)) {
             focus = gtk_window_get_focus (gummi_get_gui ()->mainwindow);
             text = editor_grab_buffer (ec);
diff --git a/src/iofunctions.h b/src/iofunctions.h
index 32b5239..39ac55c 100644
--- a/src/iofunctions.h
+++ b/src/iofunctions.h
@@ -1,10 +1,10 @@
 /**
  * @file    iofunctions.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/latex.c b/src/latex.c
index 1864e67..cb4bbfc 100644
--- a/src/latex.c
+++ b/src/latex.c
@@ -1,10 +1,10 @@
 /**
  * @file   latex.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -56,17 +56,17 @@ GuLatex* latex_init (void) {
     GuLatex* l = g_new0 (GuLatex, 1);
     l->compilelog = NULL;
     l->modified_since_compile = FALSE;
-    
+
     l->tex_version = texlive_init ();
     rubber_init ();
     latexmk_init ();
-    
+
     /* TODO: Temp hard set of compilation options for migrating configs */
     if (strlen(config_get_value("typesetter")) == 0)
         config_set_value("typesetter", "pdflatex");
     if (strlen(config_get_value("compile_steps")) == 0)
         config_set_value("compile_steps", "texpdf");
-    
+
     return l;
 }
 
@@ -81,9 +81,9 @@ gboolean latex_method_active (gchar* method) {
 
 gchar* latex_update_workfile (GuLatex* lc, GuEditor* ec) {
     gchar *text;
-    
+
     text = editor_grab_buffer (ec);
-    
+
     // bit of a dirty hack, but only write the buffer content when
     // there is not a recovery in progress, otherwise the workfile
     // will be overwritten with empty text
@@ -94,11 +94,11 @@ gchar* latex_update_workfile (GuLatex* lc, GuEditor* ec) {
 }
 
 gchar* latex_set_compile_cmd (GuEditor* ec) {
-    
+
     const gchar* method = config_get_value ("compile_steps");
     gchar* combined = NULL;
     gchar* texcmd = NULL;
-    
+
     if (rubber_active()) {
         texcmd = rubber_get_command (method, ec->workfile);
     }
@@ -124,7 +124,7 @@ gchar* latex_analyse_log (gchar* log, gchar* filename, gchar* basename) {
             logpath = g_strconcat (basename, ".log", NULL);
         }
         else {
-            logpath = g_strconcat (C_TMPDIR, C_DIRSEP, 
+            logpath = g_strconcat (C_TMPDIR, C_DIRSEP,
                                    g_path_get_basename(basename), ".log", NULL);
         }
         g_file_get_contents (logpath, &log, NULL, NULL);
@@ -132,8 +132,8 @@ gchar* latex_analyse_log (gchar* log, gchar* filename, gchar* basename) {
     return log;
 }
 
-            
-    
+
+
 
 void latex_analyse_errors (GuLatex* lc) {
     gchar* result = NULL;
@@ -146,7 +146,7 @@ void latex_analyse_errors (GuLatex* lc) {
         g_error_free (err);
         return;
     }
-    
+
     if (lc->compilelog == NULL) printf("null\n");
 
     if (g_regex_match (match_str, lc->compilelog, 0, &match_info)) {
@@ -184,20 +184,20 @@ gboolean latex_update_pdffile (GuLatex* lc, GuEditor* ec) {
 
     g_free (lc->compilelog);
     memset (lc->errorlines, 0, BUFSIZ);
-    
+
     /* run pdf compilation */
     Tuple2 cresult = utils_popen_r (command, curdir);
     cerrors = (glong)cresult.first;
     gchar* coutput = (gchar*)cresult.second;
-    
+
     lc->compilelog = latex_analyse_log (coutput, filename, basename);
     lc->modified_since_compile = FALSE;
-    
+
     /* find error line */
     if (cerrors && (g_utf8_strlen (lc->compilelog, -1) != 0)) {
         latex_analyse_errors (lc);
     }
-    
+
     g_free (command);
 
     return cerrors == 0;
@@ -228,10 +228,10 @@ int latex_remove_auxfile (GuEditor* ec) {
         auxfile = g_strconcat (ec->basename, ".aux", NULL);
     }
     else {
-        auxfile = g_strconcat (C_TMPDIR, C_DIRSEP, 
+        auxfile = g_strconcat (C_TMPDIR, C_DIRSEP,
                   g_path_get_basename(ec->basename), ".aux", NULL);
         }
-    
+
     // TODO: extend for other build files
     if (g_file_test (auxfile, G_FILE_TEST_EXISTS)) {
         res = g_remove (auxfile);
@@ -245,9 +245,9 @@ gboolean latex_precompile_check (gchar* editortext) {
      * http://pangea.stanford.edu/computing/unix/formatting/parts.php
      * TOD: Improve and add document scan tags and make compatible with
      * upcoming master/slave document system */
-     
+
     // TODO: see issue #269
-    
+
     gboolean class = utils_subinstr("\\documentclass", editortext, FALSE);
     gboolean style = utils_subinstr("\\documentstyle", editortext, FALSE);
     gboolean input = utils_subinstr("\\input", editortext, FALSE);
@@ -274,7 +274,7 @@ void latex_export_pdffile (GuLatex* lc, GuEditor* ec, const gchar* path,
         }
     }
     if (!utils_copy_file (ec->pdffile, savepath, &err)) {
-        slog (L_G_ERROR, _("Unable to export PDF file.\n\n%s"), 
+        slog (L_G_ERROR, _("Unable to export PDF file.\n\n%s"),
                             err->message);
         g_error_free (err);
     }
@@ -284,13 +284,13 @@ void latex_export_pdffile (GuLatex* lc, GuEditor* ec, const gchar* path,
 
 gboolean latex_run_makeindex (GuEditor* ec) {
     int retcode;
-    
+
     if (g_find_program_in_path ("makeindex")) {
-        
+
         gchar* command = g_strdup_printf ("%s makeindex \"%s.idx\"",
                                           C_TEXSEC,
                                           g_path_get_basename(ec->basename));
-                                         
+
         Tuple2 res = utils_popen_r (command, C_TMPDIR);
         retcode = (glong)res.first;
         g_free (command);
diff --git a/src/latex.h b/src/latex.h
index 56b2666..c99d6b2 100644
--- a/src/latex.h
+++ b/src/latex.h
@@ -1,10 +1,10 @@
 /**
  * @file   latex.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -44,9 +44,9 @@ struct _GuLatex {
     gint errorlines[BUFSIZ];
     gchar* compilelog;
     gboolean modified_since_compile;
-    
+
     int tex_version;
-    
+
 };
 
 GuLatex* latex_init (void);
diff --git a/src/main.c b/src/main.c
index 84bb5be..4d65d10 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,9 +55,9 @@ static int debug = 0;
 static int showversion = 0;
 
 static GOptionEntry entries[] = {
-    { (const gchar*)"debug", (gchar)'d', 0, G_OPTION_ARG_NONE, 
+    { (const gchar*)"debug", (gchar)'d', 0, G_OPTION_ARG_NONE,
         &debug, (gchar*)"show debug info", NULL},
-    { (const gchar*)"version", (gchar)'v', 0, G_OPTION_ARG_NONE, 
+    { (const gchar*)"version", (gchar)'v', 0, G_OPTION_ARG_NONE,
         &showversion, (gchar*)"show version and exit", NULL},
     { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 };
@@ -77,7 +77,7 @@ int main (int argc, char *argv[]) {
     g_option_context_add_main_entries (context, entries, PACKAGE);
     g_option_context_parse (context, &argc, &argv, &error);
     if (error) g_error("%s\n", error->message);
-    
+
     if (showversion) {
         printf("Gummi %s\n", PACKAGE_VERSION);
         return 0;
@@ -90,13 +90,13 @@ int main (int argc, char *argv[]) {
     GError* ui_error = NULL;
     GtkBuilder* builder = gtk_builder_new ();
     gchar* ui = g_build_filename (GUMMI_DATA, "ui", "gummi.glade", NULL);
-    
+
     // exit program when gummi.glade can not be located:
     if (!g_file_test (ui, G_FILE_TEST_EXISTS)) {
         printf("Could not locate Glade interface file at:\n%s\n", ui);
         return 0;
     }
-    
+
     gtk_builder_add_from_file (builder, ui, &ui_error);
     if (ui_error) {
         g_error ("%s\n", ui_error->message);
@@ -125,7 +125,7 @@ int main (int argc, char *argv[]) {
     // why do we not load this from environment, like gui-main does? -A
     GuMotion* motion = motion_init ();
     GuIOFunc* io = iofunctions_init();
-    GuLatex* latex = latex_init (); 
+    GuLatex* latex = latex_init ();
     GuBiblio* biblio = biblio_init (builder);
     GuTemplate* templ = template_init (builder);
     GuTabmanager* tabm = tabmanager_init ();
@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) {
 
     /* Initialize GUI */
     gui = gui_init (builder);
-    
+
     slog_set_gui_parent (gui->mainwindow);
     slog (L_DEBUG, "GummiGui created!\n");
 
@@ -165,7 +165,7 @@ int main (int argc, char *argv[]) {
         }
         tabmanager_create_tab (A_LOAD, argv[1], NULL);
     }
-        
+
     if (config_get_value ("autosaving")) iofunctions_start_autosave ();
 
     gui_main (builder);
diff --git a/src/motion.c b/src/motion.c
index 6bbffd1..19d5162 100644
--- a/src/motion.c
+++ b/src/motion.c
@@ -1,10 +1,10 @@
 /**
  * @file   motion.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -74,9 +74,9 @@ GuMotion* motion_init (void) {
     GuMotion* m = g_new0 (GuMotion, 1);
 
     m->key_press_timer = 0;
-    m->signal_mutex = g_mutex_new ();
-    m->compile_mutex = g_mutex_new ();
-    m->compile_cv = g_cond_new ();
+    g_mutex_init(&m->signal_mutex);
+    g_mutex_init(&m->compile_mutex);
+    g_cond_init(&m->compile_cv);
     m->keep_running = TRUE;
     m->keep_running = FALSE;
     m->typesetter_pid = &typesetter_pid;
@@ -85,14 +85,8 @@ GuMotion* motion_init (void) {
 }
 
 void motion_start_compile_thread (GuMotion* m) {
-    GError* err = NULL;
-
     m->keep_running = TRUE;
-    m->compile_thread = g_thread_create (motion_compile_thread, m, TRUE, &err);
-    if (!m->compile_thread) {
-        slog (L_G_FATAL, "Can not create new thread: %s\n", err->message);
-        g_error_free(err);
-    }
+    m->compile_thread = g_thread_new ("motion", motion_compile_thread, m);
 }
 
 void motion_stop_compile_thread (GuMotion* m) {
@@ -131,13 +125,13 @@ void motion_kill_typesetter (GuMotion* m) {
 
         /* Make sure typesetter command is terminated */
         if (kill(*m->typesetter_pid, 15)) {
-            slog(L_ERROR, "Could not kill process: %s\n", 
+            slog(L_ERROR, "Could not kill process: %s\n",
                                     g_strerror(errno));
         }
 #else
         if (!TerminateProcess(*m->typesetter_pid, 0)) {
             gchar *msg = g_win32_error_message(GetLastError());
-            slog (L_ERROR, "Could not kill process: %s\n", 
+            slog (L_ERROR, "Could not kill process: %s\n",
                                     msg ? msg : "(null)");
             g_free(msg);
         }
@@ -157,9 +151,9 @@ gboolean motion_do_compile (gpointer user) {
     L_F_DEBUG;
     GuMotion* mc = GU_MOTION (user);
 
-    if (!g_mutex_trylock (mc->signal_mutex)) goto ret;
-    g_cond_signal (mc->compile_cv);
-    g_mutex_unlock (mc->signal_mutex);
+    if (!g_mutex_trylock (&mc->signal_mutex)) goto ret;
+    g_cond_signal (&mc->compile_cv);
+    g_mutex_unlock (&mc->signal_mutex);
 
 ret:
     return (STR_EQU (config_get_value ("compile_scheme"), "real_time"));
@@ -178,31 +172,31 @@ gpointer motion_compile_thread (gpointer data) {
 
     latex = gummi_get_latex ();
     pc = gui->previewgui;
-    
+
     while (TRUE) {
-        if (!g_mutex_trylock (mc->compile_mutex)) continue;
+        if (!g_mutex_trylock (&mc->compile_mutex)) continue;
         slog (L_DEBUG, "Compile thread sleeping...\n");
-        g_cond_wait (mc->compile_cv, mc->compile_mutex);
+        g_cond_wait (&mc->compile_cv, &mc->compile_mutex);
         slog (L_DEBUG, "Compile thread awoke.\n");
 
         if (!(editor = gummi_get_active_editor ())) {
-            g_mutex_unlock (mc->compile_mutex);
+            g_mutex_unlock (&mc->compile_mutex);
             continue;
         }
         if (!mc->keep_running) {
-            g_mutex_unlock (mc->compile_mutex);
+            g_mutex_unlock (&mc->compile_mutex);
             g_thread_exit (NULL);
         }
 
         if (mc->pause) {
-            g_mutex_unlock (mc->compile_mutex);
+            g_mutex_unlock (&mc->compile_mutex);
             continue;
         }
 
         gdk_threads_enter ();
         focus = gtk_window_get_focus (gui->mainwindow);
         editortext = latex_update_workfile (latex, editor);
-        
+
         precompile_ok = latex_precompile_check (editortext);
         g_free (editortext);
 
@@ -211,14 +205,14 @@ gpointer motion_compile_thread (gpointer data) {
         if (!precompile_ok) {
             motion_start_errormode (mc, "document_error");
             gdk_threads_leave();
-            g_mutex_unlock (mc->compile_mutex);
+            g_mutex_unlock (&mc->compile_mutex);
             continue;
         }
         gdk_threads_leave();
-        
+
         compile_status = latex_update_pdffile (latex, editor);
         *mc->typesetter_pid = 0;
-        g_mutex_unlock (mc->compile_mutex);
+        g_mutex_unlock (&mc->compile_mutex);
 
         if (!mc->keep_running)
             g_thread_exit (NULL);
@@ -235,7 +229,7 @@ gpointer motion_compile_thread (gpointer data) {
                 motion_start_errormode  (mc, "compile_error");
             } else {
                 if (!pc->uri) {
-                    
+
                     char* uri = g_strconcat (urifrmt, editor->pdffile, NULL);
                     previewgui_set_pdffile (pc, uri);
                     g_free(uri);
@@ -259,24 +253,24 @@ void motion_force_compile (GuMotion *mc) {
 }
 
 void motion_start_errormode (GuMotion *mc, const gchar *msg) {
-    
+
     if (mc->errormode) {
         infoscreengui_set_message (gui->infoscreengui, msg);
     return;
     }
 
     previewgui_save_position (gui->previewgui);
-    
+
     infoscreengui_enable (gui->infoscreengui, msg);
     mc->errormode = TRUE;
 }
 
 void motion_stop_errormode (GuMotion *mc) {
-    
+
     if (!mc->errormode) return;
 
     previewgui_restore_position (gui->previewgui);
-    
+
     infoscreengui_disable (gui->infoscreengui);
     mc->errormode = FALSE;
 }
@@ -304,7 +298,7 @@ gboolean on_key_press_cb (GtkWidget* widget, GdkEventKey* event, void* user) {
     if (!event->is_modifier) {
         motion_stop_timer (GU_MOTION (user));
     }
-    if (config_get_value("snippets") && 
+    if (config_get_value("snippets") &&
         snippets_key_press_cb (gummi_get_snippets (),
                                gummi_get_active_editor (), event))
         return TRUE;
@@ -315,7 +309,7 @@ gboolean on_key_release_cb (GtkWidget* widget, GdkEventKey* event, void* user) {
     if (!event->is_modifier) {
         motion_start_timer (GU_MOTION (user));
     }
-    if (config_get_value("snippets") && 
+    if (config_get_value("snippets") &&
         snippets_key_release_cb (gummi_get_snippets (),
                                  gummi_get_active_editor (), event))
         return TRUE;
diff --git a/src/motion.h b/src/motion.h
index 1457126..672e3f9 100644
--- a/src/motion.h
+++ b/src/motion.h
@@ -1,10 +1,10 @@
 /**
  * @file   motion.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -38,12 +38,12 @@ typedef struct _GuMotion GuMotion;
 
 struct _GuMotion {
     gint key_press_timer;
-    GMutex* signal_mutex;
-    GMutex* compile_mutex;
+    GMutex signal_mutex;
+    GMutex compile_mutex;
     GThread* compile_thread;
-    GCond* compile_cv;
+    GCond compile_cv;
     pid_t* typesetter_pid;
-    
+
     gboolean keep_running;
     gboolean pause;
     gboolean errormode;
diff --git a/src/porting.h b/src/porting.h
index e527bbd..aa9c59b 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -1,10 +1,10 @@
 /**
  * @file   porting.h
- * @brief  Porting layer of different platforms 
+ * @brief  Porting layer of different platforms
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/project.c b/src/project.c
index 60e9522..2de77fa 100644
--- a/src/project.c
+++ b/src/project.c
@@ -1,10 +1,10 @@
 /**
  * @file   project.h
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -26,7 +26,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
- 
+
 #include "project.h"
 
 #include <string.h>
@@ -62,9 +62,9 @@ gboolean project_create_new (const gchar* filename) {
     const gchar* content = g_strdup_printf("version=%s\n"
                                            "typesetter=%s\n"
                                            "steps=%s\n"
-                                           "root=%s\n", 
+                                           "root=%s\n",
                                             version, csetter, csteps, rootfile);
-    
+
     if (!STR_EQU (filename + strlen (filename) -6, ".gummi")) {
         filename = g_strdup_printf ("%s.gummi", filename);
     }
@@ -72,9 +72,9 @@ gboolean project_create_new (const gchar* filename) {
     statusbar_set_message (g_strdup_printf("Creating project file: %s",
                 filename));
     utils_set_file_contents (filename, content, -1);
-    
+
     gummi->project->projfile = g_strdup (filename);
-    
+
     return TRUE;
 }
 
@@ -86,10 +86,10 @@ gboolean project_open_existing (const gchar* filename) {
         slog (L_ERROR, "%s\n", err->message);
         return FALSE;
     }
-    
+
     if (!project_file_integrity (content)) return FALSE;
     if (!project_load_files (filename, content)) return FALSE;
-    
+
     gummi->project->projfile = g_strdup (filename);
 
     return TRUE;
@@ -99,7 +99,7 @@ gboolean project_close (void) {
     GList *tabs = NULL;
     int i = 0;
     tabs = g_list_copy(gummi_get_all_tabs());
-    
+
     // XXX: needs refactor
     /* Disable compile thread to prevent it from compiling nonexisting editor */
     motion_stop_compile_thread(gummi->motion);
@@ -131,17 +131,17 @@ gboolean project_add_document (const gchar* project, const gchar* fname) {
     gchar* oldcontent;
     gchar* newcontent;
     GError* err;
-    
+
     if (!g_file_get_contents (project, &oldcontent, NULL, &err)) {
         slog (L_ERROR, "%s\n", err->message);
         return FALSE;
     }
-    
+
     // don't add files that are already in the project:
     if (utils_subinstr ((gchar*)fname, oldcontent, TRUE)) return FALSE;
-    
+
     newcontent = g_strconcat (oldcontent, "\nfile=", fname, NULL);
-    
+
     if (g_file_test (project, G_FILE_TEST_EXISTS)) {
         utils_set_file_contents (project, newcontent, -1);
         return TRUE;
@@ -157,17 +157,17 @@ gboolean project_remove_document (const gchar* project, const gchar* fname) {
     gchar* oldcontent;
     gchar* newcontent;
     GError* err;
-    
+
     if (!g_file_get_contents (project, &oldcontent, NULL, &err)) {
         slog (L_ERROR, "%s\n", err->message);
         return FALSE;
     }
-    
+
     gchar* delimiter = g_strdup_printf ("file=%s", fname);
-    
+
     gchar** splitcontent = g_strsplit (oldcontent, delimiter, 2);
     newcontent = g_strconcat (splitcontent[0], splitcontent[1], NULL);
-    
+
     if (g_file_test (project, G_FILE_TEST_EXISTS)) {
         utils_set_file_contents (project, newcontent, -1);
         return TRUE;
@@ -183,7 +183,7 @@ GList* project_list_files (const gchar* content) {
     gchar** splcontent = g_strsplit(content, "\n", 0);
     GList* filelist = NULL;
     gint i;
-    
+
     for (i = 0; i < g_strv_length(splcontent); i++) {
         gchar** line = g_strsplit(splcontent[i], "=", 0);
         if (STR_EQU ("file", line[0])) {
@@ -197,7 +197,7 @@ GList* project_list_files (const gchar* content) {
     }
     return filelist;
 }
-    
+
 gboolean project_load_files (const gchar* projfile, const gchar* content) {
     gboolean status = FALSE;
     gint rootpos, i;
@@ -209,7 +209,7 @@ gboolean project_load_files (const gchar* projfile, const gchar* content) {
     for (i=0; i<length;i++) {
         filename = g_list_nth_data (filelist, i);
         if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
-            
+
             if (!tabmanager_check_exists (filename)) {
                 gui_open_file (filename);
                 // TODO: no direct calling this:
@@ -222,7 +222,7 @@ gboolean project_load_files (const gchar* projfile, const gchar* content) {
         }
     }
     if (status == TRUE) projectgui_set_rootfile (rootpos);
-    
+
     return status;
 }
 
diff --git a/src/project.h b/src/project.h
index 0151eb4..95889b9 100644
--- a/src/project.h
+++ b/src/project.h
@@ -1,10 +1,10 @@
 /**
  * @file   project.h
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -35,7 +35,7 @@
 typedef struct _Project {
     gchar* projfile;
     gchar* rootfile;
-    
+
     int nroffiles;
 
 } GuProject;
@@ -50,8 +50,8 @@ gboolean project_open_existing (const gchar* filename);
 gboolean project_file_integrity (const gchar* content);
 gboolean project_load_files (const gchar* projfile, const gchar* content);
 GList* project_list_files (const gchar* content);
-gchar* project_get_value (const gchar* content, const gchar* item);   
-  
+gchar* project_get_value (const gchar* content, const gchar* item);
+
 gboolean project_add_document (const gchar* project, const gchar* fname);
 gboolean project_remove_document (const gchar* project, const gchar* fname);
 
diff --git a/src/signals.c b/src/signals.c
index 02d688c..6a91d2c 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/signals.h b/src/signals.h
index 969a0d0..513677b 100644
--- a/src/signals.h
+++ b/src/signals.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/snippets.c b/src/snippets.c
index fdfc81c..907990c 100644
--- a/src/snippets.c
+++ b/src/snippets.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -291,7 +291,7 @@ gboolean snippets_key_press_cb (GuSnippets* sc, GuEditor* ec, GdkEventKey* ev) {
             g_free (key);
         }
     }
-    
+
     if (sc->info) {
         if (ev->keyval == GDK_KEY_Tab) {
             if (!snippet_info_goto_next_placeholder (sc->info, ec))
diff --git a/src/snippets.h b/src/snippets.h
index d16a4a3..b4dc8bc 100644
--- a/src/snippets.h
+++ b/src/snippets.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -26,7 +26,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
- 
+
 #ifndef __GUMMI_SNIPPETS_H__
 #define __GUMMI_SNIPPETS_H__
 
diff --git a/src/syncTeX/synctex_parser.c b/src/syncTeX/synctex_parser.c
index ebe3578..0e15870 100644
--- a/src/syncTeX/synctex_parser.c
+++ b/src/syncTeX/synctex_parser.c
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
@@ -32,9 +32,9 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE
 
-Except as contained in this notice, the name of the copyright holder  
-shall not be used in advertising or otherwise to promote the sale,  
-use or other dealings in this Software without prior written  
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
 authorization from the copyright holder.
 
 Acknowledgments:
@@ -64,7 +64,7 @@ Thu Jun 19 09:39:21 UTC 2008
 #   else
 #       define HAVE_LOCALE_H 1
 #       define HAVE_SETLOCALE 1
-#       if defined(_MSC_VER) 
+#       if defined(_MSC_VER)
 #          define SYNCTEX_INLINE __inline
 #       else
 #          define SYNCTEX_INLINE inline
@@ -566,9 +566,9 @@ typedef struct {
 	|| (NODE->class->type == synctex_node_type_void_vbox)\
 	|| (NODE->class->type == synctex_node_type_hbox)\
 	|| (NODE->class->type == synctex_node_type_void_hbox))
-	
+
 #define SYNCTEX_HAS_CHILDREN(NODE) (NODE && SYNCTEX_CHILD(NODE))
-	
+
 void _synctex_log_medium_node(synctex_node_t node);
 
 /*  math node creator */
@@ -1355,7 +1355,7 @@ synctex_status_t _synctex_decode_int(synctex_scanner_t scanner, int* value_ref)
 			* value_ref = result;
 		}
 		return SYNCTEX_STATUS_OK;/*  Successfully scanned an int */
-	}	
+	}
 	return SYNCTEX_STATUS_NOT_OK;/*  Could not scan an int */
 }
 
@@ -1914,7 +1914,7 @@ scan_next_line:
 		} else if (*SYNCTEX_CUR == SYNCTEX_CHAR_BEGIN_SHEET) {
 			++SYNCTEX_CUR;
 			goto deeper;
-            
+
 		} else if (_synctex_next_line(scanner)<SYNCTEX_STATUS_OK) {
             _synctex_error("Unexpected end of nested sheet (3).");
             SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR);
@@ -2642,7 +2642,7 @@ return_on_error:
 		/*  remove the last path extension if any */
 		_synctex_strip_last_path_extension(synctex_name);
 		if (!strlen(synctex_name)) {
-			goto return_on_error;		
+			goto return_on_error;
 		}
 		/*  now insert quotes. */
 		if (add_quotes) {
@@ -3317,7 +3317,7 @@ int synctex_display_query(synctex_scanner_t scanner,const char * name,int line,i
 						SYNCTEX_CUR += SYNCTEX_END - SYNCTEX_START;
 						SYNCTEX_START = SYNCTEX_END;
 						SYNCTEX_END = SYNCTEX_START + size*sizeof(synctex_node_t *);
-					}			
+					}
 					*(synctex_node_t *)SYNCTEX_CUR = node;
 					SYNCTEX_CUR += sizeof(synctex_node_t);
 				}
@@ -3335,7 +3335,7 @@ int synctex_display_query(synctex_scanner_t scanner,const char * name,int line,i
 							SYNCTEX_CUR += SYNCTEX_END - SYNCTEX_START;
 							SYNCTEX_START = SYNCTEX_END;
 							SYNCTEX_END = SYNCTEX_START + size*sizeof(synctex_node_t *);
-						}			
+						}
 						*(synctex_node_t *)SYNCTEX_CUR = node;
 						SYNCTEX_CUR += sizeof(synctex_node_t);
 					}
@@ -3352,7 +3352,7 @@ int synctex_display_query(synctex_scanner_t scanner,const char * name,int line,i
 								SYNCTEX_CUR += SYNCTEX_END - SYNCTEX_START;
 								SYNCTEX_START = SYNCTEX_END;
 								SYNCTEX_END = SYNCTEX_START + size*sizeof(synctex_node_t *);
-							}			
+							}
 							*(synctex_node_t *)SYNCTEX_CUR = node;
 							SYNCTEX_CUR += sizeof(synctex_node_t);
 						}
@@ -3514,7 +3514,7 @@ end:
 				if ((other_node = SYNCTEX_NEXT_HORIZ_BOX(node))) {
 					do {
 						if (_synctex_point_in_box(hitPoint,other_node,synctex_YES)) {
-							node = _synctex_smallest_container(other_node,node); 
+							node = _synctex_smallest_container(other_node,node);
 						}
 					} while((other_node = SYNCTEX_NEXT_HORIZ_BOX(other_node)));
 				}
@@ -3773,7 +3773,7 @@ synctex_bool_t _synctex_point_in_box(synctex_point_t hitPoint, synctex_node_t no
 			return synctex_YES;
 		}
 	}
-	return synctex_NO;	
+	return synctex_NO;
 }
 
 int _synctex_node_distance_to_point(synctex_point_t hitPoint, synctex_node_t node, synctex_bool_t visible) {
@@ -3962,7 +3962,7 @@ SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_hbox(synctex_poin
 					}
 				}
 			} else if (off7 == 0) {
-				/*  hitPoint is inside node. */ 
+				/*  hitPoint is inside node. */
 				bestDistancesRef->left = bestDistancesRef->right = 0;
 				bestNodesRef->left = node;
 				bestNodesRef->right = NULL;
@@ -3988,19 +3988,19 @@ SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_hbox(synctex_poin
 			/*  the left node is new, try to narrow the result */
 			if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->left,visible))) {
 				bestNodesRef->left = node;
-			} 
+			}
 			if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->left,visible))) {
 				bestNodesRef->left = node;
-			} 
+			}
 		}
 		if (result & SYNCTEX_MASK_RIGHT) {
 			/*  the right node is new, try to narrow the result */
 			if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->right,visible))) {
 				bestNodesRef->right = node;
-			} 
+			}
 			if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->right,visible))) {
 				bestNodesRef->right = node;
-			} 
+			}
 		}
 	}
 	return result;
@@ -4055,19 +4055,19 @@ SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_vbox(synctex_poin
 			/*  the left node is new, try to narrow the result */
 			if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->left,visible))) {
 				bestNodesRef->left = node;
-			} 
+			}
 			if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->left,visible))) {
 				bestNodesRef->left = node;
-			} 
+			}
 		}
 		if (result & SYNCTEX_MASK_RIGHT) {
 			/*  the right node is new, try to narrow the result */
 			if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->right,visible))) {
 				bestNodesRef->right = node;
-			} 
+			}
 			if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->right,visible))) {
 				bestNodesRef->right = node;
-			} 
+			}
 		}
 	}
 	return result;
diff --git a/src/syncTeX/synctex_parser.h b/src/syncTeX/synctex_parser.h
index 4aca415..2f22c30 100644
--- a/src/syncTeX/synctex_parser.h
+++ b/src/syncTeX/synctex_parser.h
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
@@ -32,9 +32,9 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE
 
-Except as contained in this notice, the name of the copyright holder  
-shall not be used in advertising or otherwise to promote the sale,  
-use or other dealings in this Software without prior written  
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
 authorization from the copyright holder.
 
 Acknowledgments:
diff --git a/COPYING b/src/syncTeX/synctex_parser_local.h
similarity index 57%
copy from COPYING
copy to src/syncTeX/synctex_parser_local.h
index 83feef3..611f86d 100644
--- a/COPYING
+++ b/src/syncTeX/synctex_parser_local.h
@@ -1,6 +1,16 @@
-Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
-All Rights reserved.
+/*
+Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr
 
+This file is part of the SyncTeX package.
+
+Latest Revision: Tue Jun 14 08:23:30 UTC 2011
+
+Version: 1.16
+
+See synctex_parser_readme.txt for more details
+
+License:
+--------
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
 files (the "Software"), to deal in the Software without
@@ -20,4 +30,16 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
+authorization from the copyright holder.
+
+*/
+
+/* This local header file is for TEXLIVE, use your own header to fit your system */
+#   include <w2c/c-auto.h> /* for inline && HAVE_xxx */
+/*	No inlining for synctex tool in texlive. */
+#	define SYNCTEX_INLINE
diff --git a/src/syncTeX/synctex_parser_readme.txt b/src/syncTeX/synctex_parser_readme.txt
new file mode 100644
index 0000000..ebc06bb
--- /dev/null
+++ b/src/syncTeX/synctex_parser_readme.txt
@@ -0,0 +1,141 @@
+This file is part of the SyncTeX package.
+
+The Synchronization TeXnology named SyncTeX is a new feature
+of recent TeX engines designed by Jerome Laurens.
+It allows to synchronize between input and output, which means to
+navigate from the source document to the typeset material and vice versa.
+More informations on http://itexmac2.sourceforge.net/SyncTeX.html
+
+This package is mainly for developers, it mainly contains the following files:
+
+synctex_parser_readme.txt
+synctex_parser_version.txt
+synctex_parser_utils.c
+synctex_parser_utils.h
+synctex_parser_local.h
+synctex_parser.h
+synctex_parser.c
+
+The file you are reading contains more informations about the SyncTeX parser history.
+
+In order to support SyncTeX in a viewer, it is sufficient to include
+in the source the files synctex_parser.h and synctex_parser.c.
+The synctex parser usage is described in synctex_parser.h header file.
+
+The other files are used by tex engines or by the synctex command line utility:
+
+ChangeLog
+README.txt
+am
+man1
+man5
+synctex-common.h
+synctex-convert.sh
+synctex-e-mem.ch0
+synctex-e-mem.ch1
+synctex-e-rec.ch0
+synctex-e-rec.ch1
+synctex-etex.h
+synctex-mem.ch0
+synctex-mem.ch1
+synctex-mem.ch2
+synctex-pdf-rec.ch2
+synctex-pdftex.h
+synctex-rec.ch0
+synctex-rec.ch1
+synctex-rec.ch2
+synctex-tex.h
+synctex-xe-mem.ch2
+synctex-xe-rec.ch2
+synctex-xe-rec.ch3
+synctex-xetex.h
+synctex.c
+synctex.defines
+synctex.h
+synctex_main.c
+tests
+
+
+Version:
+--------
+This is version 1, which refers to the synctex output file format.
+The files are identified by a build number.
+In order to help developers to automatically manage the version and build numbers
+and download the parser only when necessary, the synctex_parser.version
+is an ASCII text file just containing the current version and build numbers.
+
+History:
+--------
+1.1: Thu Jul 17 09:28:13 UTC 2008
+- First official version available in TeXLive 2008 DVD.
+  Unfortunately, the backwards synchronization is not working properly mainly for ConTeXt users, see below.
+1.2: Tue Sep  2 10:28:32 UTC 2008
+- Correction for ConTeXt support in the edit query.
+  The previous method was assuming that TeX boxes do not overlap,
+  which is reasonable for LaTeX but not for ConTeXt.
+  This assumption is no longer considered.
+1.3: Fri Sep  5 09:39:57 UTC 2008
+- Local variable "read" renamed to "already_read" to avoid conflicts.
+- "inline" compiler directive renamed to "SYNCTEX_INLINE" for code support and maintenance
+- _synctex_error cannot be inlined due to variable arguments (thanks Christiaan Hofman)
+- Correction in the display query, extra boundary nodes are used for a more precise forwards synchronization
+1.4: Fri Sep 12 08:12:34 UTC 2008
+- For an unknown reason, the previous version was not the real 1.3 (as used in iTeXMac2 build 747).
+  As a consequence, a crash was observed.
+- Some typos are fixed.
+1.6: Mon Nov  3 20:20:02 UTC 2008
+- The bug that prevented synchronization with compressed files on windows has been fixed.
+- New interface to allow system specific customization.
+- Note that some APIs have changed.
+1.8: Mer  8 jul 2009 11:32:38 UTC
+Note that version 1.7 was delivered privately.
+- bug fix: synctex was causing a memory leak in pdftex and xetex, thus some processing speed degradation
+- bug fix: the synctex command line tool was broken when updating a .synctex file
+- enhancement: better accuracy of the synchronization process
+- enhancement: the pdf output file and the associated .synctex file no longer need to live in the same directory.
+               The new -d option of the synctex command line tool manages this situation.
+               This is handy when using something like tex -output-directory=DIR ...
+1.9: Wed Nov  4 11:52:35 UTC 2009
+- Various typo fixed
+- OutputDebugString replaced by OutputDebugStringA to deliberately disable unicode preprocessing
+- New conditional created because OutputDebugStringA is only available since Windows 2K professional
+1.10: Sun Jan  10 10:12:32 UTC 2010 
+- Bug fix in synctex_parser.c to solve a synchronization problem with amsmath's gather environment.
+  Concerns the synctex tool.
+1.11: Sun Jan  17 09:12:31 UTC 2010
+- Bug fix in synctex_parser.c, function synctex_node_box_visible_v: 'x' replaced by 'y'.
+  Only 3rd party tools are concerned.
+1.12: Mon Jul 19 21:52:10 UTC 2010
+- Bug fix in synctex_parser.c, function __synctex_open: the io_mode was modified even in case of a non zero return,
+causing a void .synctex.gz file to be created even if it was not expected. Reported by Marek Kasik concerning a bug on evince.
+1.13: Fri Mar 11 07:39:12 UTC 2011
+- Bug fix in synctex_parser.c, better synchronization as suggested by Jan Sundermeyer (near line 3388).
+- Stronger code design in synctex_parser_utils.c, function _synctex_get_name (really neutral behavior).
+  Only 3rd party tools are concerned.
+1.14: Fri Apr 15 19:10:57 UTC 2011
+- taking output_directory into account
+- Replaced FOPEN_WBIN_MODE by FOPEN_W_MODE when opening the text version of the .synctex file.
+- Merging with LuaTeX's version of synctex.c
+1.15: Fri Jun 10 14:10:17 UTC 2011
+This concerns the synctex command line tool and 3rd party developers.
+TeX and friends are not concerned by these changes.
+- Bug fixed in _synctex_get_io_mode_name, sometimes the wrong mode was returned
+- Support for LuaTeX convention of './' file prefixing
+1.16: Tue Jun 14 08:23:30 UTC 2011
+This concerns the synctex command line tool and 3rd party developers.
+TeX and friends are not concerned by these changes.
+- Better forward search (thanks Jose Alliste)
+- Support for LuaTeX convention of './' file prefixing now for everyone, not only for Windows
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
+
diff --git a/src/syncTeX/synctex_parser_utils.c b/src/syncTeX/synctex_parser_utils.c
index 2e52459..53ecdf0 100644
--- a/src/syncTeX/synctex_parser_utils.c
+++ b/src/syncTeX/synctex_parser_utils.c
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
@@ -32,9 +32,9 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE
 
-Except as contained in this notice, the name of the copyright holder  
-shall not be used in advertising or otherwise to promote the sale,  
-use or other dealings in this Software without prior written  
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
 authorization from the copyright holder.
 
 */
@@ -302,7 +302,7 @@ char * _synctex_merge_strings(const char * first,...) {
 		_synctex_error("!  _synctex_merge_strings: Memory problem");
 		return NULL;
 	}
-	return NULL;	
+	return NULL;
 }
 
 /*  The purpose of _synctex_get_name is to find the name of the synctex file.
@@ -473,7 +473,7 @@ int _synctex_get_name(const char * output, const char * build_directory, char **
 }
 
 const char * _synctex_get_io_mode_name(synctex_io_mode_t io_mode) {
-    static const char * synctex_io_modes[4] = {"r","rb","a","ab"}; 
+    static const char * synctex_io_modes[4] = {"r","rb","a","ab"};
     unsigned index = ((io_mode & synctex_io_gz_mask)?1:0) + ((io_mode & synctex_io_append_mask)?2:0);// bug pointed out by Jose Alliste
     return synctex_io_modes[index];
 }
diff --git a/src/syncTeX/synctex_parser_utils.h b/src/syncTeX/synctex_parser_utils.h
index e67f8f5..b41e66e 100644
--- a/src/syncTeX/synctex_parser_utils.h
+++ b/src/syncTeX/synctex_parser_utils.h
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) 2008, 2009, 2010, 2011 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
@@ -32,9 +32,9 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE
 
-Except as contained in this notice, the name of the copyright holder  
-shall not be used in advertising or otherwise to promote the sale,  
-use or other dealings in this Software without prior written  
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
 authorization from the copyright holder.
 
 */
@@ -66,13 +66,13 @@ extern "C" {
 #	else
 #		define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c)
 #	endif
-    
+
 #	if _WIN32
 #		define SYNCTEX_IS_DOT(c) ('.' == c)
 #	else
 #		define SYNCTEX_IS_DOT(c) ('.' == c)
 #	endif
-    
+
 /*  This custom malloc functions initializes to 0 the newly allocated memory.
  *  There is no bzero function on windows. */
 void *_synctex_malloc(size_t size);
@@ -133,7 +133,7 @@ int _synctex_get_name(const char * output, const char * build_directory, char **
 const char * _synctex_get_io_mode_name(synctex_io_mode_t io_mode);
 
 const char * synctex_ignore_leading_dot_slash(const char * name);
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/syncTeX/synctex_parser_version.txt b/src/syncTeX/synctex_parser_version.txt
new file mode 100644
index 0000000..03ff897
--- /dev/null
+++ b/src/syncTeX/synctex_parser_version.txt
@@ -0,0 +1 @@
+1.16
\ No newline at end of file
diff --git a/src/tabmanager.c b/src/tabmanager.c
index 615f6c3..d9914fc 100644
--- a/src/tabmanager.c
+++ b/src/tabmanager.c
@@ -1,10 +1,10 @@
 /**
  * @file   tabmanager.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -37,7 +37,7 @@ static gboolean current_tab_replaceable (OpenAct act);
 
 GuTabmanager* tabmanager_init (void) {
     GuTabmanager* tm = g_new0 (GuTabmanager, 1);
-    
+
     tm->tabs = NULL;
     tm->active_editor = NULL;
     tm->active_tab = NULL;
@@ -57,7 +57,7 @@ void tabmanager_foreach_editor (GFunc func, gpointer user_data) {
 static gboolean current_tab_replaceable (OpenAct act) {
     if ((act == A_LOAD || act == A_LOAD_OPT))
         if (g_active_editor && !g_active_editor->filename)
-            if (!editor_buffer_changed (g_active_editor)) 
+            if (!editor_buffer_changed (g_active_editor))
                 return TRUE;
     return FALSE;
 }
@@ -70,12 +70,12 @@ gchar* tabmanager_get_tabname (GuTabContext* tc) {
     if (tc->editor->filename) {
         filetext = g_path_get_basename (tc->editor->filename);
     } else {
-        filetext = g_strdup_printf (_("Unsaved Document %d"), 
+        filetext = g_strdup_printf (_("Unsaved Document %d"),
                                        tc->page->unsavednr);
     }
-    
+
     modified = editor_buffer_changed (tc->editor);
-    
+
     labeltext = g_strdup_printf ("%s%s", (modified? "*": ""), filetext);
     g_free (filetext);
     return labeltext;
@@ -89,13 +89,13 @@ gboolean tabmanager_remove_tab (GuTabContext* tab) {
 
     g_tabs = g_list_remove (g_tabs, tab);
     tabmanager_set_active_tab (total - 2);
-    
+
     editor_destroy (tab->editor);
     gtk_notebook_remove_page (g_tabnotebook, position);
     g_free (tab);
     return (total != 1);
 }
-    
+
 /*--------------------------------------------------------------------------*/
 
 
@@ -105,7 +105,7 @@ void tabmanager_set_active_tab (int position) {
         g_active_editor = NULL;
     } else {
         g_active_tab = GU_TAB_CONTEXT (g_list_nth_data (g_tabs, position));
-        g_active_editor = 
+        g_active_editor =
             GU_TAB_CONTEXT (g_list_nth_data (g_tabs, position))->editor;
     }
 }
@@ -113,12 +113,12 @@ void tabmanager_set_active_tab (int position) {
 
 void tabmanager_create_tab (OpenAct act, const gchar* filename, gchar* opt) {
     gint pos = 0;
-    
+
     GuEditor* editor = gummi_new_environment (filename);
 
     if (current_tab_replaceable (act)) {
         pos = tabmanagergui_replace_page (g_active_tab, editor);
-    } 
+    }
     else {
         GuTabContext* tc = g_new0(GuTabContext, 1);
         tc->editor = editor;
@@ -126,7 +126,7 @@ void tabmanager_create_tab (OpenAct act, const gchar* filename, gchar* opt) {
         pos = tabmanagergui_create_page (tc, tc->editor);
         tabmanagergui_set_current_page (pos);
     }
-    
+
     tabmanager_set_active_tab (pos);
 
     if (iofunctions_has_swapfile (filename)) {
@@ -138,7 +138,7 @@ void tabmanager_create_tab (OpenAct act, const gchar* filename, gchar* opt) {
     }
 
     gui_set_filename_display (g_active_tab, TRUE, TRUE);
-    add_to_recent_list (filename);
+    add_to_recent_list (editor->filename);
 
     previewgui_reset (gui->previewgui);
 }
@@ -167,14 +167,17 @@ void tabmanager_update_tab (const gchar* filename) {
     /* this function is called when the document is saved. no new editor
      * or tab object has to be initialised, but we'll need a fileinfo env
      * to match the new filename and its location and a gui update*/
-     
-    add_to_recent_list (filename);
+
     gui_set_filename_display (g_active_tab, TRUE, TRUE);
-    
+
     editor_fileinfo_update (g_active_tab->editor, filename);
+
+    // Add full filepath to recent list
+    add_to_recent_list (g_active_tab->editor->filename);
+
     slog (L_INFO, "Environment updated for %s\n",
             g_active_tab->editor->filename);
-    previewgui_reset (gui->previewgui);    
+    previewgui_reset (gui->previewgui);
 }
 
 gboolean tabmanager_has_tabs () {
@@ -191,10 +194,10 @@ gboolean tabmanager_check_exists (const gchar* filename) {
     GList *editors;
     GuEditor* ec;
     gint ectotal, i;
-    
+
     editors = gummi_get_all_editors ();
     ectotal = g_list_length (editors);
-    
+
     for (i=0; i<ectotal; i++) {
         ec = g_list_nth_data (editors, i);
         if (STR_EQU (ec->filename, filename)) return TRUE;
diff --git a/src/tabmanager.h b/src/tabmanager.h
index 467f928..de83210 100644
--- a/src/tabmanager.h
+++ b/src/tabmanager.h
@@ -1,10 +1,10 @@
 /**
  * @file    tabmanager.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/template.c b/src/template.c
index eb50d5b..175d1d6 100644
--- a/src/template.c
+++ b/src/template.c
@@ -1,10 +1,10 @@
 /**
  * @file   template.c
- * @brief  
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -48,18 +48,18 @@ GuTemplate* template_init (GtkBuilder* builder) {
     GuTemplate* t = g_new0 (GuTemplate, 1);
     t->templatewindow =
         GTK_WINDOW (gtk_builder_get_object (builder, "templatewindow"));
-    t->templateview = 
+    t->templateview =
         GTK_TREE_VIEW (gtk_builder_get_object (builder, "template_treeview"));
     t->list_templates =
         GTK_LIST_STORE (gtk_builder_get_object (builder, "list_templates"));
-    t->template_label = 
+    t->template_label =
         GTK_LABEL (gtk_builder_get_object (builder, "template_label"));
     t->template_add =
         GTK_WIDGET (gtk_builder_get_object (builder, "template_add"));
     t->template_remove =
         GTK_WIDGET (gtk_builder_get_object (builder, "template_remove"));
     t->template_open =
-        GTK_WIDGET (gtk_builder_get_object (builder, "template_open")); 
+        GTK_WIDGET (gtk_builder_get_object (builder, "template_open"));
     t->template_render = GTK_CELL_RENDERER_TEXT (
             gtk_builder_get_object (builder, "template_renderer"));
     t->template_col = GTK_TREE_VIEW_COLUMN (
@@ -76,9 +76,9 @@ void template_setup (GuTemplate* t) {
 
     gchar *dirpath = g_build_filename (g_get_user_config_dir (), "gummi",
                                       "templates" , NULL);
-    
-    GDir* dir = g_dir_open (dirpath, 0, &error);    
-    if (error) { 
+
+    GDir* dir = g_dir_open (dirpath, 0, &error);
+    if (error) {
         /* print error if directory does not exist */
         slog (L_INFO, "unable to read template directory, creating new..\n");
         g_mkdir_with_parents (dirpath, DIR_PERMS);
@@ -94,15 +94,15 @@ void template_setup (GuTemplate* t) {
         g_free (filepath);
     }
     g_free (dirpath);
-    
+
     // disable the add button when there are no tabs opened (#388)
     if (!tabmanager_has_tabs()) {
         gtk_widget_set_sensitive (t->template_add, FALSE);
     }
-    
+
     gtk_widget_set_sensitive (t->template_open, FALSE);
-    
-    
+
+
 }
 
 gchar* template_get_selected_path (GuTemplate* t) {
@@ -110,10 +110,10 @@ gchar* template_get_selected_path (GuTemplate* t) {
     GtkTreeIter iter;
     GtkTreeSelection *selection;
     gchar *filepath = NULL;
-    
+
     model = gtk_tree_view_get_model (t->templateview);
     selection = gtk_tree_view_get_selection (t->templateview);
-    
+
     if (gtk_tree_selection_get_selected (selection, &model, &iter))
         gtk_tree_model_get (model, &iter, 1, &filepath, -1);
 
@@ -127,15 +127,15 @@ void template_add_new_entry (GuTemplate* t) {
     GtkTreePath* path = NULL;
     GtkTreeViewColumn* col = NULL;
     GList* cells = NULL;
-    
+
     gtk_label_set_text (t->template_label, "");
     gtk_list_store_append (t->list_templates, &iter);
-    
+
     g_object_set (t->template_render, "editable", TRUE, NULL);
     gtk_widget_set_sensitive (t->template_add, FALSE);
     gtk_widget_set_sensitive (t->template_remove, FALSE);
     gtk_widget_set_sensitive (t->template_open, FALSE);
-    
+
     col = gtk_tree_view_get_column (t->templateview, 0);
     model = gtk_tree_view_get_model (t->templateview);
     path = gtk_tree_model_get_path (model, &iter);
@@ -155,7 +155,7 @@ void template_remove_entry (GuTemplate* t) {
 
     model = gtk_tree_view_get_model (t->templateview);
     selection = gtk_tree_view_get_selection (t->templateview);
-    
+
     if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
         gtk_tree_model_get (model, &iter, 1, &filepath, -1);
         gtk_list_store_remove (t->list_templates, &iter);
@@ -167,7 +167,7 @@ void template_remove_entry (GuTemplate* t) {
 void template_create_file (GuTemplate* t, gchar* filename, gchar* text) {
     const char* filepath = g_build_filename (g_get_user_config_dir (),
             "gummi", "templates", filename, NULL);
-                           
+
     if (g_file_test (filepath, G_FILE_TEST_EXISTS)) {
         gtk_label_set_text (t->template_label, "filename already exists");
         template_remove_entry (t);
diff --git a/src/template.h b/src/template.h
index e230b34..050df89 100644
--- a/src/template.h
+++ b/src/template.h
@@ -1,10 +1,10 @@
 /**
  * @file    template.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
diff --git a/src/update.c b/src/update.c
deleted file mode 100644
index d5b7b66..0000000
--- a/src/update.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * @file   update.c
- * @brief  functions related to releases and upgrading between them
- *
- * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
- * All Rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "update.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#ifndef WIN32
-#   include <sys/socket.h>
-#   include <sys/time.h>
-#   include <netdb.h>
-#   include <unistd.h>
-#endif
-
-#include <glib.h>
-
-#include "environment.h"
-#include "utils.h"
-
-#ifdef WIN32
-/* TODO: use Winsock for WIN32 */
-#else
-gboolean updatecheck (GtkWindow* parent) {
-    GtkWidget* dialog;
-    struct sockaddr_in servaddr;
-    struct hostent *hp;
-    gint sock_fd = 0, i = 0;
-    struct timeval timeout;
-    gchar data[BUFSIZ] = { 0 };
-    const gchar* avail_version;
-    const gchar* request = "GET /projects/gummi/repository/raw/"
-        "trunk/dev/latest HTTP/1.1\r\n"
-        "User-Agent: Gummi\r\n"
-        "Host: dev.midnightcoding.org\r\n"
-        "\r\n";
-
-    if (-1 == (sock_fd = socket (AF_INET, SOCK_STREAM, 0))) {
-        slog (L_ERROR, "socket () error\n");
-        return FALSE;
-    }
-
-    /* set timeout to prevent hanging */
-    memset (&timeout, 0, sizeof (struct timeval));
-    timeout.tv_sec = 5;
-    if (setsockopt (sock_fd, SOL_SOCKET, SO_RCVTIMEO, &timeout,
-            sizeof (struct timeval))) {
-        slog (L_ERROR, "setsockopt () error\n");
-        return FALSE;
-    }
-
-    memset (&servaddr, 0, sizeof (servaddr));
-    if (NULL == (hp = gethostbyname ("dev.midnightcoding.org"))) {
-        slog (L_ERROR, "gethostbyname () error\n");
-        return FALSE;
-    }
-
-    memcpy((gchar*)&servaddr.sin_addr.s_addr, (gchar*)hp->h_addr, hp->h_length);
-    servaddr.sin_port = htons (80);
-    servaddr.sin_family = AF_INET;
-
-    if (0 != connect(sock_fd, (struct sockaddr*)&servaddr, sizeof (servaddr))) {
-        slog (L_G_ERROR, "connect () error");
-        return FALSE;
-    }
-
-    write (sock_fd, request, strlen (request));
-    read (sock_fd, data, BUFSIZ);
-
-    if (0 == strlen (data)) {
-        slog (L_ERROR, "connection timeout\n");
-        return FALSE;
-    }
-
-    /* get version string */
-    for (i = strlen (data) -2; i >= 0 && data[i] != '\n'; --i);
-    avail_version = data + i + 1;
-    
-    slog (L_INFO, "Currently installed: "PACKAGE_VERSION"\n");
-    slog (L_INFO, "Currently available: %s", avail_version);
-    
-    /* TODO: move gtk part to gui-menu.c */
-
-    dialog = gtk_message_dialog_new (parent, 
-        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-        GTK_MESSAGE_INFO,
-        GTK_BUTTONS_OK,
-        _("Currently installed:\n%s\n\nCurrently available:\n%s"),
-        PACKAGE_VERSION, avail_version);
-    gtk_window_set_title (GTK_WINDOW (dialog), _("Update Check"));
-    gtk_dialog_run (GTK_DIALOG (dialog));      
-    gtk_widget_destroy (dialog);
-
-    return TRUE;
-}
-#endif
diff --git a/src/update.h b/src/update.h
deleted file mode 100644
index 7ada517..0000000
--- a/src/update.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file    update.h
- * @brief   
- *
- * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
- * All Rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef __GUMMI_UPDATE_CHECK__
-#define __GUMMI_UPDATE_CHECK__
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-gboolean updatecheck (GtkWindow* parent);
-
-#endif /* __GUMMI_UPDATE_CHECK__ */
diff --git a/src/utils.c b/src/utils.c
index 2740e4e..8e992d7 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,10 +1,10 @@
 /**
  * @file    utils.c
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -122,12 +122,12 @@ void slog (gint level, const gchar *fmt, ...) {
             out = g_strdup_printf (_("%s has encountered a serious error and "
                         "will require a restart. Your working data will be "
                         "restored when you reload your document. Please "
-                        "report bugs at: http://dev.midnightcoding.org"),
+                        "report bugs at: https://github.com/alexandervdm/gummi"),
                         PACKAGE_NAME);
         else
             out = g_strdup (message);
 
-        dialog = gtk_message_dialog_new (parent, 
+        dialog = gtk_message_dialog_new (parent,
                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                 L_IS_TYPE (level,L_G_INFO)? GTK_MESSAGE_INFO: GTK_MESSAGE_ERROR,
                 GTK_BUTTONS_OK,
@@ -146,8 +146,8 @@ void slog (gint level, const gchar *fmt, ...) {
     }
 
     if (!L_IS_TYPE (level, L_INFO) &&
-        !L_IS_TYPE (level, L_DEBUG) && 
-        !L_IS_TYPE (level, L_ERROR) && 
+        !L_IS_TYPE (level, L_DEBUG) &&
+        !L_IS_TYPE (level, L_ERROR) &&
         !L_IS_TYPE (level, L_G_INFO) &&
         !L_IS_TYPE (level, L_G_ERROR))
         exit (1);
@@ -159,14 +159,14 @@ gint utils_yes_no_dialog (const gchar* message) {
 
     g_return_val_if_fail (message != NULL, 0);
 
-    dialog = gtk_message_dialog_new (parent, 
+    dialog = gtk_message_dialog_new (parent,
                  GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                  GTK_MESSAGE_QUESTION,
                  GTK_BUTTONS_YES_NO,
                  "%s", message);
 
     gtk_window_set_title (GTK_WINDOW (dialog), _("Confirmation"));
-    ret = gtk_dialog_run (GTK_DIALOG (dialog));      
+    ret = gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);
 
     return ret;
@@ -251,7 +251,7 @@ Tuple2 utils_popen_r (const gchar* cmd, const gchar* chdir) {
             ret = g_strdup (buf);
         g_free (rot);
     }
-    
+
     // close the file descriptor:
     close(pout);
 
@@ -260,11 +260,11 @@ Tuple2 utils_popen_r (const gchar* cmd, const gchar* chdir) {
     #else
         waitpid(typesetter_pid, &status, 0);
     #endif
-    
+
     // See bug 446:
     if (ret) {
         if (!g_utf8_validate (ret, -1, NULL)) {
-            ret = g_convert_with_fallback (ret, -1, "UTF-8", 
+            ret = g_convert_with_fallback (ret, -1, "UTF-8",
                     "ISO-8859-1", NULL, NULL, NULL, NULL);
         }
     }
@@ -283,18 +283,18 @@ gchar* utils_path_to_relative (const gchar* root, const gchar* target) {
 
 gchar* utils_get_tmp_tmp_dir (void) {
 	/* brb, gonna go punch a wall */
-    gchar *tmp_tmp = g_build_path 
+    gchar *tmp_tmp = g_build_path
 						(C_DIRSEP, g_get_home_dir(), "gtmp", NULL);
     g_mkdir_with_parents (tmp_tmp, DIR_PERMS);
 
     return tmp_tmp;
-}  
+}
 
 
 gboolean utils_glist_is_member (GList* list, gchar* item) {
     int nrofitems = g_list_length (list);
     int i;
-    
+
     for (i=0;i<nrofitems;i++) {
         if (STR_EQU (item, g_list_nth_data (list,i))) {
             return TRUE;
diff --git a/src/utils.h b/src/utils.h
index b4baf30..71eeaa1 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,10 +1,10 @@
 /**
  * @file    utils.h
- * @brief   
+ * @brief
  *
  * Copyright (C) 2009-2012 Gummi-Dev Team <alexvandermey at gmail.com>
  * All Rights reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -152,7 +152,7 @@ gchar* utils_path_to_relative (const gchar* root, const gchar* target);
 
 /**
  * utils_subinstr:
- * 
+ *
  * Returns: A gboolean that states whether or the string in the first
  * argument is a substring of the second argument. When the case_sens arg
  * is passed as TRUE, case sensitivity of the two strings is ignored.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gummi.git



More information about the debian-science-commits mailing list