mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

distcheck fixes

Browse source 
Original commit message from CVS:
distcheck fixes
This commit is contained in:
Thomas Vander Stichele 2003-12-14 19:09:23 +00:00
parent 734e19ff44
commit 7c399e62b5
5 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
configure.ac
View file

@ -245,7 +245,6 @@ if test "x$HAVE_GTK_22" = "xyes"; then
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_VERSION) AC_SUBST(GTK_VERSION)
GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0` 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_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0` GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR) AC_SUBST(GTK_BASE_DIR)
@ -279,20 +278,31 @@ AC_ARG_WITH(gdk-pixbuf-loader-dir,
# nothing specified # nothing specified
GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
) )
AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR) AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR)
AC_SUBST(GDK_PIXBUF_LOADER_DIR) AC_SUBST(GDK_PIXBUF_LOADER_DIR)
AC_MSG_NOTICE([Putting GTK+-2 pixbuf loaders in $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/" # allow customization of pixbuf loader configuration file
AC_ARG_WITH(gdk-pixbuf-conffile, # 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], AC_HELP_STRING([--with-gdk-pixbuf-conf-dir],
[path to the gdk_pixbuf config directory]), [directory to install the gdk_pixbuf config (none for pkg-config default)]),
[if test "x${withval}" != x ; then [
GDK_PIXBUF_CONFDIR="${withval}" if test "x${withval}" != xyes ; then
GDK_PIXBUF_CONF_DIR="${withval}"
else
GDK_PIXBUF_CONF_DIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
fi 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 ===========================================================================
dnl ============================= gst plug-ins ================================ dnl ============================= gst plug-ins ================================
@ -1514,6 +1524,7 @@ gst-libs/gst/play/Makefile
gst-libs/gst/propertyprobe/Makefile gst-libs/gst/propertyprobe/Makefile
gst-libs/gst/resample/Makefile gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile gst-libs/gst/riff/Makefile
gst-libs/gst/tag/Makefile
gst-libs/gst/tuner/Makefile gst-libs/gst/tuner/Makefile
gst-libs/gst/video/Makefile gst-libs/gst/video/Makefile
gst-libs/gst/xoverlay/Makefile gst-libs/gst/xoverlay/Makefile

2
ext/flac/gstflacdec.c
View file

@ -27,7 +27,7 @@
#include "gstflacdec.h" #include "gstflacdec.h"
#include <gst/gsttaginterface.h> #include <gst/gsttaginterface.h>
#include <gst/tags/gsttagediting.h> #include <gst/tag/tag.h>
#include "flac_compat.h" #include "flac_compat.h"

2
ext/flac/gstflacenc.c
View file

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <gstflacenc.h> #include <gstflacenc.h>
#include <gst/tags/gsttagediting.h> #include <gst/tag/tag.h>
#include <gst/gsttaginterface.h> #include <gst/gsttaginterface.h>
#include "flac_compat.h" #include "flac_compat.h"

2
ext/flac/gstflactag.c
View file

@ -24,7 +24,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include <gst/gsttaginterface.h> #include <gst/gsttaginterface.h>
#include <gst/tags/gsttagediting.h> #include <gst/tag/tag.h>
#include <string.h> #include <string.h>
#define GST_TYPE_FLAC_TAG (gst_flac_tag_get_type()) #define GST_TYPE_FLAC_TAG (gst_flac_tag_get_type())

4
ext/gdk_pixbuf/Makefile.am
View file

@ -22,8 +22,8 @@ gst_loader_headers = gstgdkanimation.h
install-data-hook: install-data-hook:
if test -z "$(DESTDIR)" ; then \ if test -z "$(DESTDIR)" ; then \
$(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONFDIR) ; \ $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \
$(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONFDIR)/gdk-pixbuf.loaders ; \ $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \
fi fi
else else