--- resynthesizer-git-4a53a8e02.old/autogen.sh
+++ resynthesizer-git-4a53a8e02/autogen.sh
@@ -58,16 +58,7 @@
 fi
 
 printf "checking for automake >= %s ... " "$AUTOMAKE_REQUIRED_VERSION"
-if (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.7
-   ACLOCAL=aclocal-1.7
-elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.8
-   ACLOCAL=aclocal-1.8
-elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.9
-   ACLOCAL=aclocal-1.9
-elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.10
    ACLOCAL=aclocal-1.10
 elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
--- resynthesizer-git-4a53a8e02.old/configure.ac
+++ resynthesizer-git-4a53a8e02/configure.ac
@@ -56,31 +56,15 @@
 
 GIMP_REQUIRED_VERSION=2.2.0
 
-PKG_CHECK_MODULES(GIMP,
-  gimp-2.0 >= $GIMP_REQUIRED_VERSION gimpui-2.0 >= $GIMP_REQUIRED_VERSION,
-  ,AC_MSG_ERROR(GIMP development libraries not found; please install.))
-
 AC_SUBST(GIMP_CFLAGS)
 AC_SUBST(GIMP_LIBS)
 
-GIMP_LIBDIR=`$PKG_CONFIG --variable=gimplibdir gimp-2.0`
+GIMP_LIBDIR=__META_PREFIX__/lib/gimp/2.0
 AC_SUBST(GIMP_LIBDIR)
 
-
-dnl i18n stuff
-
-dnl lkk 2011 Changed name here
-GETTEXT_PACKAGE=resynthesizer
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-				    [The gettext translation domain.])
-
 dnl Add the languages which your application supports here.
 ALL_LINGUAS="es fr ru"
 
-AC_PROG_INTLTOOL
-AM_GLIB_GNU_GETTEXT
-
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 
 dnl Fix for changes in GLib 2.31 
--- resynthesizer-git-4a53a8e02.old/lib/engineTypes.h
+++ resynthesizer-git-4a53a8e02/lib/engineTypes.h
@@ -228,7 +228,7 @@
 
 
 /* swap two elements of a point vector */
-inline void
+static inline void
 swap_vector_elements(
   pointVector vector,
   guint size,
--- resynthesizer-git-4a53a8e02.old/src/plugin-intl.h
+++ resynthesizer-git-4a53a8e02/src/plugin-intl.h
@@ -28,7 +28,7 @@
 
 
 #ifndef GETTEXT_PACKAGE
-#error "config.h must be included prior to plugin-intl.h"
+#define GETTEXT_PACKAGE "resynthesizer"
 #endif
 
 #include <libintl.h>