[vlc-devel] commit: Simplify portaudio and libxml2 detection (Jean-Baptiste Kempf )
git version control
git at videolan.org
Thu Aug 6 00:18:33 CEST 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 5 23:54:01 2009 +0200| [f004323ee330bc55f8deafed113081de61f0e76a] | committer: Jean-Baptiste Kempf
Simplify portaudio and libxml2 detection
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f004323ee330bc55f8deafed113081de61f0e76a
---
configure.ac | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/configure.ac b/configure.ac
index e1c119e..d4da3ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3886,19 +3886,7 @@ fi
dnl
dnl libxml2 module
dnl
-AC_ARG_ENABLE(libxml2,
- [ --enable-libxml2 libxml2 support (default enabled)])
-AS_IF([test "${enable_libxml2}" != "no"], [
- PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.5], [
- VLC_ADD_CPPFLAGS([xml],[${XML2_CFLAGS}])
- VLC_ADD_LIBS([xml],[${XML2_LIBS}])
- VLC_ADD_PLUGIN([xml])
- ], [
- AS_IF([test "x${enable_xml2}" != "x"], [
- AC_MSG_ERROR([Could not find libxml version 2.5 or higher])
- ])
- ])
-])
+PKG_ENABLE_MODULES_VLC([libxml2], [], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
dnl
dnl SVG module
@@ -4249,18 +4237,7 @@ PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support],
dnl
dnl Portaudio module
dnl
-AC_ARG_ENABLE(portaudio,
- [ --enable-portaudio Portaudio library support (default disabled)],
- [if test "${enable_portaudio}" = "yes"
- then
- VLC_ADD_PLUGIN([portaudio])
- VLC_ADD_CXXFLAGS([portaudio],[])
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([portaudio],[-lportaudio -lwinmm -lole32])
- else
- VLC_ADD_LIBS([portaudio],[-lportaudio])
- fi
- fi])
+PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto])
dnl
dnl ALSA module
More information about the vlc-devel
mailing list