diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-10 23:15:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-07 11:52:38 +0000 |
| commit | 65a00c71a5e3a8cdd74ac1a557208e183e23cf01 (patch) | |
| tree | c3d88f619366acc6f9453548b8dff4fb2792fdee /config_host.mk.in | |
| parent | 8b94b2e6d6f4d96b8f4b5da3471a66eed6b78af6 (diff) | |
Clarify configure GStreamer handling
Currrently --disables-gstreamer disables GStreamer API 1.0 support
and --enable-gstreamer-0-10 enables GStreamer API 0.10 support. To
build with GStreamer API 0.10 you need to --disable-gstreamer and
--enable-gstreamer-0-10, which doesn't seem logical.
But actually it's possible to build both avmedia GStreamer backends,
so this changes:
* --disable-gstreamer to --disable-gstreamer-1-0
* configure variables to include the GStreamer API version "1_0"
* adapts the configure help text
Change-Id: Icffd8cfb9d80b3021e290675e7c9644c2a31fce8
Reviewed-on: https://gerrit.libreoffice.org/11912
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 98dad1d02259..7a5d42acf435 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -134,8 +134,8 @@ export ENABLE_GLTF=@ENABLE_GLTF@ export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@ export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@ export LIBGLTF_LIBS=@LIBGLTF_LIBS@ -export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ +export ENABLE_GSTREAMER_1_0=@ENABLE_GSTREAMER_1_0@ export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ @@ -227,8 +227,8 @@ export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@ export GSSAPI_LIBS=@GSSAPI_LIBS@ export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@ export GSTREAMER_0_10_LIBS=$(gb_SPACE)@GSTREAMER_0_10_LIBS@ -export GSTREAMER_CFLAGS=$(gb_SPACE)@GSTREAMER_CFLAGS@ -export GSTREAMER_LIBS=$(gb_SPACE)@GSTREAMER_LIBS@ +export GSTREAMER_1_0_CFLAGS=$(gb_SPACE)@GSTREAMER_1_0_CFLAGS@ +export GSTREAMER_1_0_LIBS=$(gb_SPACE)@GSTREAMER_1_0_LIBS@ export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@ export GTHREAD_LIBS=$(gb_SPACE)@GTHREAD_LIBS@ export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@ |