From b43442a2f27d04c729a9c1d4a3d45fab447c27f2 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Tue, 10 Apr 2018 18:19:06 -0500 Subject: [PATCH] FS-11104: [Build] check for libldns-fs.pc first when detecting libldns to allow for custom package --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f65b59997d..b8df6d1759 100644 --- a/configure.ac +++ b/configure.ac @@ -1320,6 +1320,8 @@ PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.4],[ PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19],[ AM_CONDITIONAL([HAVE_PORTAUDIO],[true])],[ AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_PORTAUDIO],[false])]) +PKG_CHECK_MODULES([LDNS], [libldns-fs >= 1.6.6],[ + AM_CONDITIONAL([HAVE_LDNS],[true])],[ PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[ AM_CONDITIONAL([HAVE_LDNS],[true])],[ AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns]) @@ -1329,7 +1331,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[ else AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false]) fi],[ - AM_CONDITIONAL([HAVE_LDNS],[true])])]) + AM_CONDITIONAL([HAVE_LDNS],[true])])])]) PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.20],[ AM_CONDITIONAL([HAVE_SNDFILE],[true])],[ AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SNDFILE],[false])])