diff --git a/ChangeLog b/ChangeLog index e345ccca36..57e4ad0bb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-21 Jan Schmidt + + * configure.ac: + Apply patch from Sebastien Cote to handle --with-pkg-config-path + before looking for GStreamer patches. (Re-closes #319248) + 2006-02-19 Jan Schmidt * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), diff --git a/common b/common index c30611ac38..c09cd18d32 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c30611ac38336030fed6d258c6e558cc537adbc5 +Subproject commit c09cd18d328f740ac532377fa5605b0f712cc6fd diff --git a/configure.ac b/configure.ac index b652271ef8..1c68c7448c 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ fi AC_HEADER_STDC([]) +GST_ARG_WITH_PKG_CONFIG_PATH dnl check for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) @@ -83,8 +84,6 @@ AC_SUBST(GST_PLUGIN_LDFLAGS) dnl Determine CPU GST_ARCH() -GST_ARG_WITH_PKG_CONFIG_PATH - dnl check for documentation tools GTK_DOC_CHECK([1.3]) AS_PATH_PYTHON([2.1])