diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-12-14 19:50:00 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-12-14 19:50:00 +0000 |
| commit | a907a8758a16676078f821e32c44cbc61b671909 (patch) | |
| tree | 91f0a98471394865a5033101f1fe211ac2d5efb6 /configure.ac | |
| parent | 525d7a9ad6fd9d27086a0ba3ce36757859bf98e7 (diff) | |
| download | gst-plugins-bad-a907a8758a16676078f821e32c44cbc61b671909.tar.gz gst-plugins-bad-a907a8758a16676078f821e32c44cbc61b671909.tar.bz2 gst-plugins-bad-a907a8758a16676078f821e32c44cbc61b671909.zip | |
distcheck fixes
Original commit message from CVS:
distcheck fixes
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 20 insertions, 9 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 |