svn commit: r1215522 - /incubator/ooo/trunk/main/configure.in

[ar...@apache.org]

Author: arielch
Date: Sat Dec 17 16:47:34 2011
New Revision: 1215522

URL: http://svn.apache.org/viewvc?rev=1215522&view=rev
Log:
Make GStreamer optional, disabled by default

Modified:
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1215522&r1=1215521&r2=1215522&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Sat Dec 17 16:47:34 2011
@@ -207,9 +207,9 @@ AC_ARG_ENABLE(gtk,
                           where Gtk+ is available.
 ],,enable_gtk=yes)
 AC_ARG_ENABLE(gstreamer,
-[  --disable-gstreamer     Determines whether to use the GStreamer media
+[  --enable-gstreamer      Determines whether to use the GStreamer media
                           backend on platforms where GStreamer is available.
-],,enable_gstreamer=yes)
+],,enable_gstreamer=no)
 AC_ARG_ENABLE(systray,
 [  --disable-systray       Determines whether to build the systray quickstarter.
 ],,enable_systray=yes)
@@ -5837,7 +5837,7 @@ ENABLE_GSTREAMER=""
 if test "$test_gstreamer" = "yes"; then
     AC_MSG_CHECKING([whether to build the GStreamer media backend])
     if test "x$enable_gstreamer" != "xno" ; then
-        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
+        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Do not use --enable-gstreamer or install the missing packages]))
         ENABLE_GSTREAMER="TRUE"
         AC_MSG_RESULT([yes])
     else