From a31df2979265339f71fe3e2d587c4176375b1eff Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Sat, 31 Aug 2013 12:17:38 +0200
Subject: AUTOTOOLS: Use pkg-config to detect libraries.

We used pkg-config only as a fallback if header files was not found,
but detection of library failed in case of available header file and
linking problem (missing -Ldir).

This patch prefers pkg-config.
---
 src/external/libtevent.m4 | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/external/libtevent.m4')

diff --git a/src/external/libtevent.m4 b/src/external/libtevent.m4
index f19f27bf..d40b9d42 100644
--- a/src/external/libtevent.m4
+++ b/src/external/libtevent.m4
@@ -2,12 +2,15 @@ AC_SUBST(TEVENT_OBJ)
 AC_SUBST(TEVENT_CFLAGS)
 AC_SUBST(TEVENT_LIBS)
 
-AC_CHECK_HEADER(tevent.h,
-   [AC_CHECK_LIB(
-       tevent,
-       tevent_context_init,
-       [TEVENT_LIBS="-ltevent -ltalloc"],
-       [AC_MSG_ERROR([libtevent missing tevent_context_init])],
-       [-ltalloc]) ],
-   [PKG_CHECK_MODULES(TEVENT, tevent)],
-   )
+PKG_CHECK_MODULES([TEVENT], [tevent], [found_tevent=yes], [found_tevent=no])
+
+SSS_AC_EXPAND_LIB_DIR()
+AS_IF([test x"$found_tevent" != xyes],
+    [AC_CHECK_HEADER([tevent.h],
+        [AC_CHECK_LIB([tevent],
+                      [tevent_context_init],
+                      [TEVENT_LIBS="-L$sss_extra_libdir -ltevent -ltalloc"],
+                      [AC_MSG_ERROR([libtevent missing tevent_context_init])],
+                      [-L$sss_extra_libdir -ltalloc])],
+        [AC_MSG_ERROR([tevent header files are not installed])])]
+)
-- 
cgit