mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 05:28:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix gdk_pixbuf installation directory (again)

Browse source 
Original commit message from CVS:
Fix gdk_pixbuf installation directory (again)
This commit is contained in:
David Schleef 2003-11-23 00:51:02 +00:00
parent 45004c2479
commit d9b16783db
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -255,26 +255,25 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(HAVE_GTK) AC_SUBST(HAVE_GTK)
AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes") AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes")
GDK_PIXBUF_LOADER_DIR="\$(libdir)/gtk-2.0/\$(GTK_VERSION)"
AC_ARG_WITH(gdk-pixbuf-loader-dir, AC_ARG_WITH(gdk-pixbuf-loader-dir,
AC_HELP_STRING([--with-gdk-pixbuf-loader-dir], AC_HELP_STRING([--with-gdk-pixbuf-loader-dir],
[directory to install the gdk_pixbuf loader]), [directory to install the gdk_pixbuf loader]),
[if test "x${withval}" != x ; then [if test "x${withval}" != x ; then
GDK_PIXBUF_LOADER_DIR=${withval} GDK_PIXBUF_LOADER_DIR="${withval}"
else
GDK_PIXBUF_LOADER_DIR="\$(libdir)/gtk-2.0/\$(GTK_VERSION)"
fi fi
]) ])
AC_SUBST(GDK_PIXBUF_LOADER_DIR)
GDK_PIXBUF_CONFFILE="\$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders" GDK_PIXBUF_CONFFILE="\$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders"
AC_ARG_WITH(gdk-pixbuf-conffile, AC_ARG_WITH(gdk-pixbuf-conffile,
AC_HELP_STRING([--with-gdk-pixbuf-conffile], AC_HELP_STRING([--with-gdk-pixbuf-conffile],
[path to the gdk_pixbuf config file]), [path to the gdk_pixbuf config file]),
[if test "x${withval}" != x ; then [if test "x${withval}" != x ; then
GDK_PIXBUF_CONFFILE=${withval} GDK_PIXBUF_CONFFILE="${withval}"
else
GDK_PIXBUF_CONFFILE="\$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders"
fi fi
]) ])
AC_SUBST(GDK_PIXBUF_CONFFILE)
dnl =========================================================================== dnl ===========================================================================
dnl ============================= gst plug-ins ================================ dnl ============================= gst plug-ins ================================

2
ext/gdk_pixbuf/Makefile.am
View file

@ -8,7 +8,7 @@ libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
if HAVE_GDK_LOADERS if HAVE_GDK_LOADERS
loaderdir = $(GDK_PIXBUF_LIBDIR)/gtk-2.0/$(GTK_VERSION)/loaders loaderdir = $(GDK_PIXBUF_LOADER_DIR)/gtk-2.0/$(GTK_VERSION)/loaders
loader_LTLIBRARIES = gst_loader.la loader_LTLIBRARIES = gst_loader.la
gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND