configure.ac: added LIRC configure switch

Detect liblircclient with pkg-config.

diff --git a/configure.ac b/configure.ac
index d46045fc5e004c446d67ec40e39558d068e552f7..4c9e1dfc22903389df961d45432b9c9fc6ffe35f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -175,9 +175,19 @@ if test "x$use_colors" = "xyes" ; then
 fi
 
 dnl test for LIRC support
-AC_CHECK_LIB(lirc_client, lirc_init)
-AC_SUBST(LIRC_LIBS)
-AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
+
+AC_ARG_ENABLE([lirc],
+       AC_HELP_STRING([--enable-lirc],
+               [Enable LIRC support]),
+       [enable_lirc=$enableval],
+       [enable_lirc=no])
+if test x$enable_lirc = xyes; then
+       PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+               [AC_MSG_ERROR([liblircclient0 not found])])
+       AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
+fi
+
+AM_CONDITIONAL(ENABLE_LIRC, test x$enable_lirc = xyes)
 
 dnl Debugging 
 AC_MSG_CHECKING([whether to build with debug support])

diff --git a/src/Makefile.am b/src/Makefile.am
index 57d1eb605ac3af7e147a9501668a5a480dd2b2f9..af91939b146cfc22d7cb521abab25d7d05eb711d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,12 +3,14 @@
 AM_CPPFLAGS = \
   $(GLIB_CFLAGS)\
   $(GTHREAD_CFLAGS)\
+       $(LIBLIRCCLIENT_CFLAGS) \
   -DLOCALE_DIR=\""$(datadir)/locale"\"\
   -DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_LDADD = \
   $(GLIB_LIBS)\
-  $(GTHREAD_LIBS)
+  $(GTHREAD_LIBS) \
+       $(LIBLIRCCLIENT_LIBS)
 
 ncmpc_headers = \
   libmpdclient.h\