summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2011-12-23 09:04:54 -0500
committerSteve Dickson <steved@redhat.com>2012-01-05 15:42:40 -0500
commitd33381555310aacaa9a5da05ccb3b156abea2971 (patch)
treeb6ce350170f9e28a7f968b02a7f5b6b09924e636
parentace87c773e2ac5c6f59f984563290f57cdbcfd88 (diff)
downloadnfs-utils-d33381555310aacaa9a5da05ccb3b156abea2971.tar.gz
nfs-utils-d33381555310aacaa9a5da05ccb3b156abea2971.tar.xz
nfs-utils-d33381555310aacaa9a5da05ccb3b156abea2971.zip
autoconf: fix up libevent autoconf test
Have it set LIBEVENT to -levent and use that in the Makefiles instead of hardcoding it. Signed-off-by: Jeff Layton <jlayton@redhat.com>
-rw-r--r--aclocal/libevent.m43
-rw-r--r--utils/idmapd/Makefile.am2
2 files changed, 3 insertions, 2 deletions
diff --git a/aclocal/libevent.m4 b/aclocal/libevent.m4
index 3c962b3..b5ac00f 100644
--- a/aclocal/libevent.m4
+++ b/aclocal/libevent.m4
@@ -2,8 +2,9 @@ dnl Checks for libevent
AC_DEFUN([AC_LIBEVENT], [
dnl Check for libevent, but do not add -levent to LIBS
- AC_CHECK_LIB([event], [event_dispatch], [libevent=1],
+ AC_CHECK_LIB([event], [event_dispatch], [LIBEVENT=-levent],
[AC_MSG_ERROR([libevent not found.])])
+ AC_SUBST(LIBEVENT)
AC_CHECK_HEADERS([event.h], ,
[AC_MSG_ERROR([libevent headers not found.])])
diff --git a/utils/idmapd/Makefile.am b/utils/idmapd/Makefile.am
index 4328e41..f8578b0 100644
--- a/utils/idmapd/Makefile.am
+++ b/utils/idmapd/Makefile.am
@@ -16,7 +16,7 @@ idmapd_SOURCES = \
nfs_idmap.h \
queue.h
-idmapd_LDADD = -levent -lnfsidmap ../../support/nfs/libnfs.a
+idmapd_LDADD = $(LIBEVENT) -lnfsidmap ../../support/nfs/libnfs.a
MAINTAINERCLEANFILES = Makefile.in