From a31df2979265339f71fe3e2d587c4176375b1eff Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik 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/libpopt.m4 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/external/libpopt.m4') diff --git a/src/external/libpopt.m4 b/src/external/libpopt.m4 index e59b2610..a3681ead 100644 --- a/src/external/libpopt.m4 +++ b/src/external/libpopt.m4 @@ -3,7 +3,15 @@ AC_SUBST(POPT_OBJ) AC_SUBST(POPT_LIBS) AC_SUBST(POPT_CFLAGS) -AC_CHECK_HEADERS([popt.h], - [AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ], [AC_MSG_ERROR([POPT must support poptGetContext])])], - [AC_MSG_ERROR([POPT development libraries not installed])] +PKG_CHECK_MODULES([POPT], [popt], [found_popt=yes], [found_popt=no]) + +SSS_AC_EXPAND_LIB_DIR() +AS_IF([test x"$found_popt" != xyes], + [AC_CHECK_HEADERS([popt.h], + [AC_CHECK_LIB([popt], + [poptGetContext], + [POPT_LIBS="-L$sss_extra_libdir -lpopt"], + [AC_MSG_ERROR([POPT library must support poptGetContext])], + [-L$sss_extra_libdir])], + [AC_MSG_ERROR([POPT header files are not installed])])] ) -- cgit