From d6cc0b79ef3c7f15df5ef524b76bbbafe01e84eb Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Tue, 12 May 2009 13:20:37 +0200 Subject: [PATCH] dc1394 and dv1394: cleanup detection in configure.ac --- configure.ac | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 1ec11f8b67..41dc3c210a 100644 --- a/configure.ac +++ b/configure.ac @@ -2024,28 +2024,28 @@ AC_ARG_ENABLE(dc1394, [ --enable-dc1394 dc1394 access module (default disabled)]) if test "${enable_dc1394}" = "yes" then - AC_CHECK_HEADERS(libraw1394/raw1394.h, [ - AC_CHECK_LIB( raw1394, raw1394_get_nodecount, [ - AC_CHECK_HEADERS(libdc1394/dc1394_control.h , [ -dnl AC_CHECK_LIB( dc1394_control, dc1394_setup_capture, [ - VLC_ADD_PLUGIN([dc1394]) - VLC_ADD_LIBS([dc1394],[-ldc1394_control -lraw1394]) -dnl ], -dnl [ -dnl AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) -dnl ]) - ], - [ - AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) - ]) + dnl + dnl Check for libraw1394 + dnl + PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1, + [ + VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libraw1394`]) + VLC_ADD_CPPFLAGS([dc1394],[`${PKG_CONFIG} --cflags libraw1394`]) ], + [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])] + ) + + dnl + dnl Check for libdc1394 + dnl + PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.2, [ - AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) - ]) - ], - [ - AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) - ]) + VLC_ADD_PLUGIN([dc1394]) + VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libdc1394-2`]) + VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libdc1394-2`]) + ], + [AC_MSG_ERROR([Couldn't find libdc1394 >= 2.0.2, install libdc1394 development package])] + ) fi dnl @@ -2060,11 +2060,10 @@ then dnl PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1, [ - VLC_ADD_PLUGIN([access_dv]) VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libraw1394`]) VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libraw1394`]) ], - [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package ?])] + [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])] ) dnl @@ -2076,7 +2075,7 @@ then VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libavc1394`]) VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libavc1394`]) ], - [AC_MSG_ERROR([Couldn't find libavc1394 >= 0.5.1, install libavc1394 development package ?])] + [AC_MSG_ERROR([Couldn't find libavc1394 >= 0.5.1, install libavc1394 development package])] ) fi -- 2.20.1