5 files changed, 25 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 80b85208..365fcfb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,6 @@ if test "x$HAVE_GTK_22" = "xyes"; then
   GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
   AC_SUBST(GTK_VERSION)
   GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
-  GTK_SYSCONFDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
   GDK_PIXBUF_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
   GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
   AC_SUBST(GTK_BASE_DIR)
@@ -279,20 +278,31 @@ AC_ARG_WITH(gdk-pixbuf-loader-dir,
    # nothing specified
    GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
 )
-
 AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR)
 AC_SUBST(GDK_PIXBUF_LOADER_DIR)
 AC_MSG_NOTICE([Putting GTK+-2 pixbuf loaders in $GDK_PIXBUF_LOADER_DIR])
 
-GDK_PIXBUF_CONFDIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
-AC_ARG_WITH(gdk-pixbuf-conffile, 
+# allow customization of pixbuf loader configuration file
+# when nothing specified, adhere to prefix settings
+# when called without any option with this argument, autodetect
+# when called with a path, set to the given path
+AC_ARG_WITH(gdk-pixbuf-conf-dir, 
    AC_HELP_STRING([--with-gdk-pixbuf-conf-dir],
-   	[path to the gdk_pixbuf config directory]),
-   [if test "x${withval}" != x ; then
-   	GDK_PIXBUF_CONFDIR="${withval}"
+   	[directory to install the gdk_pixbuf config (none for pkg-config default)]),
+   [
+    if test "x${withval}" != xyes ; then
+      GDK_PIXBUF_CONF_DIR="${withval}"
+    else
+      GDK_PIXBUF_CONF_DIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
     fi
-])
-AC_SUBST(GDK_PIXBUF_CONFDIR)
+   ],
+   # nothing specified
+   GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
+   GDK_PIXBUF_CONF_DIR=${sysconfdir}/gtk-2.0
+)
+AS_AC_EXPAND(GDK_PIXBUF_CONF_DIR, $GDK_PIXBUF_CONF_DIR)
+AC_SUBST(GDK_PIXBUF_CONF_DIR)
+AC_MSG_NOTICE([Putting GTK+-2 pixbuf loader config in $GDK_PIXBUF_CONF_DIR])
 
 dnl ===========================================================================
 dnl ============================= gst plug-ins ================================
@@ -1514,6 +1524,7 @@ gst-libs/gst/play/Makefile
 gst-libs/gst/propertyprobe/Makefile
 gst-libs/gst/resample/Makefile
 gst-libs/gst/riff/Makefile
+gst-libs/gst/tag/Makefile
 gst-libs/gst/tuner/Makefile
 gst-libs/gst/video/Makefile
 gst-libs/gst/xoverlay/Makefile
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index a67c4a98..104552d6 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -27,7 +27,7 @@
 #include "gstflacdec.h"
 #include <gst/gsttaginterface.h>
 
-#include <gst/tags/gsttagediting.h>
+#include <gst/tag/tag.h>
 
 #include "flac_compat.h"
 
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 4b7bf16c..29425c95 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include <gstflacenc.h>
-#include <gst/tags/gsttagediting.h>
+#include <gst/tag/tag.h>
 #include <gst/gsttaginterface.h>
 #include "flac_compat.h"
 
diff --git a/ext/flac/gstflactag.c b/ext/flac/gstflactag.c
index 03e24a1e..39d31729 100644
--- a/ext/flac/gstflactag.c
+++ b/ext/flac/gstflactag.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 #include <gst/gsttaginterface.h>
-#include <gst/tags/gsttagediting.h>
+#include <gst/tag/tag.h>
 #include <string.h>
 
 #define GST_TYPE_FLAC_TAG (gst_flac_tag_get_type())
diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index 3e0b1179..95477db4 100644
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -22,8 +22,8 @@ gst_loader_headers = gstgdkanimation.h
 
 install-data-hook:
 	if test -z "$(DESTDIR)"  ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONFDIR) ; \
-	  $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONFDIR)/gdk-pixbuf.loaders ; \
+	  $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \
+	  $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \
 	fi
 
 else