[vlc-devel] commit: configure: Minor fixes for kate detection ( Rémi Denis-Courmont )
git version control
git at videolan.org
Fri May 2 17:34:46 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Fri May 2 18:33:00 2008 +0300| [5d1e0c0567765078ac182155cb1f02269f46848f]
configure: Minor fixes for kate detection
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d1e0c0567765078ac182155cb1f02269f46848f
---
configure.ac | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index f0cef78..1bb0cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4009,33 +4009,29 @@ dnl kate decoder plugin
dnl
AC_ARG_ENABLE(kate,
[ --enable-kate kate codec (default enabled)])
-if test "${enable_kate}" != "no"; then
+AS_IF([test "${enable_kate}" != "no"], [
PKG_CHECK_MODULES(KATE,[kate >= 0.1.1], [
- VLC_ADD_PLUGINS([kate])
+ 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, [
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_PLUGINS([kate])
- else
- VLC_ADD_BUILTINS([kate])
- fi
+ VLC_ADD_PLUGIN([kate])
kate_libs="-lkate -logg"
VLC_ADD_LDFLAGS([kate],[${kate_libs}]) ],[
- if test "${enable_kate}" == "yes"; then
+ 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.])
- fi],
- [-lkate -logg])
+ ])
+ ], [-lkate -logg])
],[
- if test "${enable_kate}" == "yes"; then
+ 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.])
- fi
+ ])
])
])
-fi
+])
dnl
More information about the vlc-devel
mailing list