diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-06-08 22:25:48 +0200 |
---|---|---|
committer | Maarten Bosmans <mkbosmans@gmail.com> | 2011-06-20 16:01:38 +0200 |
commit | 429512dd5fdbc5137005967689a93a919ce411da (patch) | |
tree | 012f5a9c7276117f79f003a4aa20bf4e86fe2e09 | |
parent | 71d05f553d87db2dbb5e641b9d35f3a04e6f13c0 (diff) |
build-sys: Move acx_lirc.m4 contents to configure.ac
The file is so small, that it is clearer just to do it in the main file.
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | m4/acx_lirc.m4 | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index bc0a4e8f..7213db15 100644 --- a/configure.ac +++ b/configure.ac @@ -895,8 +895,15 @@ AC_SUBST(LIBWRAP_LIBS) AC_ARG_ENABLE([lirc], AS_HELP_STRING([--disable-lirc],[Disable optional LIRC support])) +LIRC_CFLAGS= +LIRC_LIBS= + AS_IF([test "x$enable_lirc" != "xno"], - [ACX_LIRC], + [ + HAVE_LIRC=1 + AC_CHECK_HEADER(lirc/lirc_client.h, [], [HAVE_LIRC=0]) + AC_CHECK_LIB(lirc_client, lirc_init, [LIRC_LIBS=-llirc_client], [HAVE_LIRC=0]) + ], HAVE_LIRC=0) AS_IF([test "x$enable_lirc" = "xyes" && test "x$HAVE_LIRC" = "x0"], diff --git a/m4/acx_lirc.m4 b/m4/acx_lirc.m4 deleted file mode 100644 index d3f8ea73..00000000 --- a/m4/acx_lirc.m4 +++ /dev/null @@ -1,6 +0,0 @@ -AC_DEFUN([ACX_LIRC], [ -LIRC_CFLAGS= -LIRC_LIBS= -AC_CHECK_HEADER(lirc/lirc_client.h,[AC_CHECK_LIB(lirc_client,lirc_init,[HAVE_LIRC=1 -LIRC_LIBS=-llirc_client],HAVE_LIRC=0)],HAVE_LIRC=0) -]) |