distcheck fixes

Original commit message from CVS:
distcheck fixes
parent 635c5361
......@@ -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
......
......@@ -15,13 +15,13 @@ endif
SUBDIRS = audio colorbalance floatcast \
$(GCONF_DIR) idct media-info \
mixer navigation play propertyprobe \
resample riff tuner video \
resample riff tag tuner video \
$(X_DIR)
DIST_SUBDIRS = audio colorbalance floatcast \
gconf idct media-info \
mixer navigation play propertyprobe \
resample riff tuner video \
resample riff tag tuner video \
xoverlay xwindowlistener
......
libgsttagincludedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tag
libgsttaginclude_HEADERS = \
tag.h
......@@ -18,8 +18,8 @@
*/
#ifndef __GST_TAG_EDITING_H__
#define __GST_TAG_EDITING_H__
#ifndef __GST_TAG_H__
#define __GST_TAG_H__
#include <gst/gst.h>
......@@ -59,4 +59,4 @@ G_CONST_RETURN gchar * gst_tag_to_id3_tag (const gchar * gst_tag);
G_END_DECLS
#endif /* __GST_TAG_EDITING_H__ */
#endif /* __GST_TAG_H__ */
......@@ -6,8 +6,5 @@ libgsttagediting_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
libgsttagediting_la_LIBADD = $(GST_LIBS)
libgsttagediting_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgsttageditingincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tags
libgsttageditinginclude_HEADERS = gsttagediting.h
noinst_HEADERS = gsttageditingprivate.h
/* GStreamer
* Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
*
* gstvorbistagsetter.c: plugin for reading / modifying vorbis tags
* gstid3tag.c: plugin for reading / modifying id3 tags
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......
......@@ -21,7 +21,7 @@
#ifndef __GST_OGG_PLUGINS_H__
#define __GST_OGG_PLUGINS_H__
#include "gsttagediting.h"
#include <gst/tag/tag.h>
G_BEGIN_DECLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment