merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0372-gstreamer-config-office.diff
blob1aaceb1cff6746eecf2bd0696206e318cf5747b5
1 diff --git configure.in configure.in
2 index 4ff07ea..bfe9198 100644
3 --- configure.in
4 +++ configure.in
5 @@ -908,6 +908,7 @@ case "$build_os" in
6 solaris*)
7 test_gtk=yes
8 test_cairo=yes
9 + build_gstreamer=yes
10 test_kde=yes
11 test_cups=yes
12 test_randr=yes
13 @@ -936,6 +937,7 @@ case "$build_os" in
14 linux-gnu*)
15 test_gtk=yes
16 test_cairo=yes
17 + build_gstreamer=yes
18 test_kde=yes
19 test_cups=yes
20 test_randr=yes
21 @@ -979,6 +982,7 @@ case "$build_os" in
22 freebsd*)
23 test_gtk=yes
24 test_cairo=yes
25 + build_gstreamer=yes
26 test_kde=yes
27 test_cups=yes
28 test_randr=yes
29 @@ -1012,6 +1016,7 @@ case "$build_os" in
30 netbsd)
31 test_gtk=yes
32 test_cairo=yes
33 + build_gstreamer=yes
34 test_kde=yes
35 test_cups=no
36 test_randr=yes
37 @@ -5565,6 +5570,26 @@ AC_SUBST(CAIRO_CFLAGS)
38 AC_SUBST(CAIRO_LIBS)
40 dnl ===================================================================
41 +dnl Check whether the GStreamer libraries are available.
42 +dnl ===================================================================
44 +ENABLE_GSTREAMER=""
46 +if test "$build_gstreamer" = "yes"; then
48 + AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
49 + if test "x$enable_gstreamer" != "xno" ; then
50 + ENABLE_GSTREAMER="TRUE"
51 + AC_MSG_RESULT([yes])
52 + PKG_CHECK_MODULES( GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10 )
53 + else
54 + AC_MSG_RESULT([no])
55 + fi
56 +fi
58 +AC_SUBST(ENABLE_GSTREAMER)
60 +dnl ===================================================================
61 dnl Check whether the OpenGL libraries are available
62 dnl ===================================================================
64 diff --git set_soenv.in set_soenv.in
65 index 7f49931..7320345 100644
66 --- set_soenv.in
67 +++ set_soenv.in
68 @@ -1756,6 +1756,7 @@ ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
69 ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" );
70 ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
71 ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@", "e" );
72 +ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
73 ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
74 ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
75 ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );