[vlc-devel] commit: Default enable telx when zvbi is not present (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Tue Sep  9 20:13:14 2008 +0100| [628a18b6a3cbc760a27b6c631d602718b572751b] | committer: Christophe Mutricy 

Default enable telx when zvbi is not present

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=628a18b6a3cbc760a27b6c631d602718b572751b
---

 configure.ac |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index eb7a627..052c232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3670,12 +3670,9 @@ AC_ARG_ENABLE(zvbi,
 		  libzvbi (default enabled)]))
 AC_ARG_ENABLE(telx,
   AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with 
-		  zvbi) (default disabled)]))
+		  zvbi) (default enabled if zvbi is absent)]))
 
 AS_IF( [test "${enable_zvbi}" != "no"],[
-  AS_IF( [test "${enable_telx}" = "yes"],[
-    AC_MSG_ERROR([The zvbi and telx modules are uncompatibles. Disable the other if you enable one.])
-  ],[
     PKG_CHECK_MODULES(ZVBI,
     	zvbi-0.2 >= 0.2.25,
     	[
@@ -3683,13 +3680,15 @@ AS_IF( [test "${enable_zvbi}" != "no"],[
     	  VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
           VLC_ADD_PLUGIN([zvbi])
 	  AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) 
+	  AS_IF( [test "${enable_telx}" = "yes"],[
+		  AC_MSG_WARN([The zvbi and telx modules are uncompatibles. 
+			       Using zvbi.])
+		  ])
 	],[
 	  AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
-	  enable_telx="yes"
 	])
     ])  
-  ])
-AS_IF( [test "${enable_telx}" = "yes"],[
+AS_IF( [test "${enable_telx}" !=no ],[
   VLC_ADD_PLUGIN([telx])
   ])