Changeset 940 in openpam


Ignore:
Timestamp:
Feb 20, 2019, 12:21:40 PM (5 months ago)
Author:
Dag-Erling Smørgrav
Message:

Use pkg-config / pkgconf to locate libcryb-test.

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r938 r940  
    2222LT_PREREQ([2.2.6])
    2323LT_INIT([disable-static dlopen])
     24
     25# pkg-config
     26AX_PROG_PKG_CONFIG
    2427
    2528# other programs
     
    122125AC_SUBST(SYSTEM_LIBPAM)
    123126
    124 save_LIBS="${LIBS}"
    125 LIBS=""
    126 AC_SEARCH_LIBS([cryb_test_version], [cryb-test], [
    127   CRYB_TEST_LIBS="${LIBS}"
    128 ], [
    129   CRYB_TEST_LIBS=""
    130   AC_MSG_WARN([cryb-test library not available, unit tests disabled])
    131 ])
    132 LIBS="${save_LIBS}"
    133 AC_SUBST(CRYB_TEST_LIBS)
     127CRYB_INIT()
     128CRYB_LIB_REQUIRE([test])
     129CRYB_RESOLVE
     130dnl AX_PKG_CONFIG_CHECK([cryb-test],
     131dnl   [AC_MSG_NOTICE([Cryb test framework found, unit tests enabled.])],
     132dnl   [AC_MSG_WARN([Cryb test framework not found, unit tests disabled.])])
    134133AM_CONDITIONAL([WITH_TEST], [ test x"$CRYB_TEST_LIBS" != x"" ])
    135134
  • trunk/t/Makefile.am

    r938 r940  
    33if WITH_TEST
    44
    5 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
     5AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \
     6        $(CRYB_TEST_CFLAGS)
    67
    78AM_TESTS_ENVIRONMENT = \
Note: See TracChangeset for help on using the changeset viewer.