# HG changeset patch # User Darren Salt # Date 1268754560 0 # Node ID a89347673097053d89675e991ab403cda04d94cd # Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11 Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing. --- a/m4/_xine.m4 Sun Mar 14 18:04:46 2010 +0000 +++ b/m4/_xine.m4 Tue Mar 16 15:49:20 2010 +0000 @@ -25,14 +25,14 @@ dnl AC_DEFUN([AC_CHECK_LIRC], [AC_ARG_ENABLE(lirc, - [ --disable-lirc Turn off LIRC support.], - [], enable_lirc=yes) + [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])], + [given=Y], [given=N; enable_lirc=yes]) found_lirc=no if test x"$enable_lirc" = xyes; then have_lirc=yes - PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], []) - if test "$LIRC_CFLAGS" != ''; then + PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:]) + if test "$found_lirc" = yes; then LIRC_INCLUDE="$LIRC_CFLAGS" else AC_REQUIRE_CPP @@ -42,15 +42,20 @@ if test x"$LIRC_PREFIX" != "x"; then lirc_libprefix="$LIRC_PREFIX/lib" - LIRC_INCLUDE="-I$LIRC_PREFIX/include" + LIRC_INCLUDE="-I$LIRC_PREFIX/include" fi for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do - AC_CHECK_FILE(["$llirc/liblirc_client.a"], - [LIRC_LIBS="$llirc/liblirc_client.a" - found_lirc=yes],,) + AC_CHECK_FILE(["$llirc/liblirc_client.so"], + [LIRC_LIBS="$llirc/liblirc_client.so"] + AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), + AC_CHECK_FILE(["$llirc/liblirc_client.a"], + [LIRC_LIBS="$llirc/liblirc_client.a" + found_lirc=yes],,) + ) done else - AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); + test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available]) + AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]) fi fi fi @@ -59,7 +64,6 @@ fi AC_SUBST(LIRC_LIBS) AC_SUBST(LIRC_INCLUDE) - AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"]) ]) dnl AC_C_ATTRIBUTE_ALIGNED