fixes to make gdk_pixbuf loader install nicely

Original commit message from CVS:
fixes to make gdk_pixbuf loader install nicely

diff --git a/configure.ac b/configure.ac
index 0b6e01f..8fe8dba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,8 @@ if test "x$HAVE_GTK_22" = "xyes"; then
   AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, no)
   GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
   AC_SUBST(GTK_VERSION)
-  GTK_BASE_DIR=`echo "$QUERYLOADERS" | sed "s/bin\/gdk-pixbuf-query-loaders\$//"`
+  GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
+  GTK_SYSCONFDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
   AC_SUBST(GTK_BASE_DIR)
 else
   PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
@@ -254,6 +255,27 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(HAVE_GTK)
 AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes")
 
+AC_ARG_WITH(gdk-pixbuf-loader-dir, 
+   AC_HELP_STRING([--with-gdk-pixbuf-loader-dir],
+       [directory to install the gdk_pixbuf loader]),
+   [if test "x${withval}" != x ; then
+       GDK_PIXBUF_LOADER_DIR=${withval}
+    else
+       GDK_PIXBUF_LOADER_DIR="\$(libdir)/gtk-2.0/\$(GTK_VERSION)"
+    fi
+])
+
+GDK_PIXBUF_CONFFILE="\$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders"
+AC_ARG_WITH(gdk-pixbuf-conffile, 
+   AC_HELP_STRING([--with-gdk-pixbuf-conffile],
+       [path to the gdk_pixbuf config file]),
+   [if test "x${withval}" != x ; then
+       GDK_PIXBUF_CONFFILE=${withval}
+    else
+       GDK_PIXBUF_CONFFILE="\$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders"
+    fi
+])
+
 dnl ===========================================================================
 dnl ============================= gst plug-ins ================================
 dnl ===========================================================================

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index 0e2d82c..ae023aa 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -8,7 +8,7 @@ libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 
 if HAVE_GDK_LOADERS
-loaderdir = $(GTK_BASE_DIR)/lib/gtk-2.0/$(GTK_VERSION)/loaders
+loaderdir = $(GDK_PIXBUF_LIBDIR)/gtk-2.0/$(GTK_VERSION)/loaders
 loader_LTLIBRARIES = gst_loader.la
 
 gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND
@@ -20,9 +20,11 @@ gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS)
 
 gst_loader_headers = gstgdkanimation.h
 
-install-data-hook:
-       $(mkinstalldirs) $(GTK_BASE_DIR)/etc/gtk-2.0 ; \
-       $(QUERYLOADERS) > $(GTK_BASE_DIR)/etc/gtk-2.0/gdk-pixbuf.loaders ;
+#install-data-hook:
+#      if test -z "$(DESTDIR)"  ; then
+#        $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0 ; \
+#        $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0/gdk-pixbuf.loaders ; \
+#      fi
 
 else
 gst_loader_headers =