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

git version control git at videolan.org
Thu Sep 11 02:43:06 CEST 2008


vlc | branch: 0.9-bugfix | Christophe Mutricy <xtophe at videolan.org> | Tue Sep  9 20:13:14 2008 +0100| [cf4c462340fc811be867cbac857ae50c70c88443] | committer: Derk-Jan Hartman 

Default enable telx when zvbi is not present
(cherry picked from commit 628a18b6a3cbc760a27b6c631d602718b572751b)

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

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

diff --git a/configure.ac b/configure.ac
index 81de61b..c8a259d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3728,12 +3728,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,
     	[
@@ -3741,13 +3738,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])
   ])
 




More information about the vlc-devel mailing list