[vlc-commits] Configure: simplify kate detection

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep 29 14:44:19 2011 +0200| [a0ce67b6f778b5cf7034c464345c9951a0597531] | committer: Jean-Baptiste Kempf

Configure: simplify kate detection

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

 configure.ac |   29 ++---------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/configure.ac b/configure.ac
index a0ecbd2..586890e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3011,37 +3011,13 @@ AS_IF( [test "${enable_libass}" != "no"], [
 dnl
 dnl  kate decoder plugin
 dnl
-AC_ARG_ENABLE(kate,
-[  --enable-kate           kate codec (default enabled)])
-AS_IF([test "${enable_kate}" != "no"], [
-  PKG_CHECK_MODULES(KATE,[kate >= 0.1.5], [
-      VLC_ADD_PLUGIN([kate])
-      VLC_ADD_CFLAGS([kate],[$KATE_CFLAGS])
-      VLC_ADD_LIBS([kate],[$KATE_LIBS]) ],[
-        AC_CHECK_HEADERS(kate/kate.h, [
-          AC_CHECK_LIB(kate, kate_decode_init, [
-            VLC_ADD_PLUGIN([kate])
-            VLC_ADD_LIBS([kate],[-lkate -logg]) ],[
-            AS_IF([test "x${enable_kate}" != "x"], [
-              AC_MSG_ERROR([libkate doesn't appear to be installed on your system.
-              You also need to check that you have a libogg posterior to the 1.0 release.])
-            ])
-      ], [-lkate -logg])
-        ],[
-          AS_IF([test "x${enable_kate}" != "x"], [
-            AC_MSG_ERROR([libkate headers do not appear to be installed on your system.
-            You also need to check that you have a libogg posterior to the 1.0 release.])
-          ])
-        ])
-  ])
-])
-
+PKG_ENABLE_MODULES_VLC([KATE], [], [kate >= 0.3.0], [kate codec], [auto])
 
 dnl
 dnl  tiger rendering for kate decoder plugin
 dnl
 AC_ARG_ENABLE(tiger,
-[  --enable-tiger          Tiger rendering library for Kate streams (default enabled)])
+[  --enable-tiger          Tiger rendering library for Kate streams (default auto)])
 AS_IF([test "${enable_tiger}" != "no"], [
   PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
       AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])
@@ -3054,7 +3030,6 @@ AS_IF([test "${enable_tiger}" != "no"], [
 ])
 
 
-
 dnl
 dnl  Video plugins
 dnl