diff options
| author | Bastien Nocera <hadess@hadess.net> | 2005-12-22 18:48:23 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2005-12-22 18:48:23 +0000 |
| commit | aa0fe670980d9256b21f9152acf61eb2243c686d (patch) | |
| tree | f3f7a962e7c8a7a84a23712b699940475fc51d5d | |
| parent | 430d361cbbbc9f017480c344c6f702461d595ece (diff) | |
| download | totem-aa0fe670980d9256b21f9152acf61eb2243c686d.tar.gz | |
exit if xine-lib isn't available, and GStreamer is disabled (Closes:
2005-12-22 Bastien Nocera <hadess@hadess.net>
* configure.in: exit if xine-lib isn't available, and GStreamer
is disabled (Closes: #324785)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2005-12-22 Bastien Nocera <hadess@hadess.net> + * configure.in: exit if xine-lib isn't available, and GStreamer + is disabled (Closes: #324785) + +2005-12-22 Bastien Nocera <hadess@hadess.net> + * src/totem-properties-main.c: (nautilus_module_initialize): * src/totem-properties-view.c: (totem_properties_view_init), (totem_properties_view_finalize), diff --git a/configure.in b/configure.in index 58357dfaa..f1fd555f7 100644 --- a/configure.in +++ b/configure.in @@ -64,12 +64,12 @@ AC_ARG_ENABLE(gstreamer, no) ENABLE_GST=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-gstreamer) ;; esac], - [ENABLE_GST=no]) dnl Default value + [ENABLE_GST=auto]) dnl Default value HAVE_XINE=no AC_MSG_CHECKING(for backend libraries) -if test x$ENABLE_GST = xno; then +if test x$ENABLE_GST = xno || test x$ENABLE_GST = xauto; then MM="libxine >= $XINE_REQS gconf-2.0" PKG_CHECK_MODULES(XINE, $MM, HAVE_XINE=yes, HAVE_XINE=no) if test x$HAVE_XINE = xyes; then @@ -77,6 +77,11 @@ if test x$ENABLE_GST = xno; then fi fi +if test x$ENABLE_GST = xno && test x$HAVE_XINE = xno; then + AC_MSG_RESULT(none) + AC_MSG_ERROR(you need the GStreamer or the xine-lib development packages installed) +fi + if test x$HAVE_XINE = xno; then GST_MAJORMINOR=0.8 PKG_CHECK_MODULES(GST, \ |