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/libtalloc.m4 | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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

diff --git a/src/external/libtalloc.m4 b/src/external/libtalloc.m4
index a4c5b8a9d..a26cb8853 100644
--- a/src/external/libtalloc.m4
+++ b/src/external/libtalloc.m4
@@ -2,6 +2,15 @@ AC_SUBST(TALLOC_OBJ)
 AC_SUBST(TALLOC_CFLAGS)
 AC_SUBST(TALLOC_LIBS)
 
-AC_CHECK_HEADER(talloc.h,
-   [AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"]) ],
-   [PKG_CHECK_MODULES(TALLOC, talloc)])
+PKG_CHECK_MODULES([TALLOC], [talloc], [found_talloc=yes], [found_talloc=no])
+
+SSS_AC_EXPAND_LIB_DIR()
+AS_IF([test x"$found_talloc" != xyes],
+    [AC_CHECK_HEADER([talloc.h],
+        [AC_CHECK_LIB([talloc],
+                      [talloc_init],
+                      [TALLOC_LIBS="-L$sss_extra_libdir -ltalloc"],
+                      [AC_MSG_ERROR([libtalloc missing talloc_init])],
+                      [-L$sss_extra_libdir])],
+        [AC_MSG_ERROR([libtalloc header files are not installed])])]
+)
-- 
cgit