Have libmdb.pc reflect --disable-glib

Also try to work around Travis issues with sudo, libtool, and clang
This commit is contained in:
Evan Miller
2020-12-04 07:33:51 -05:00
parent 60cbfe821c
commit d186a98119
3 changed files with 6 additions and 5 deletions

View File

@@ -212,9 +212,11 @@ AC_ARG_ENABLE(glib,
[enable_glib=$enableval], [enable_glib=yes])
if test "$enable_glib" = "yes"; then
PKG_CHECK_MODULES([GLIB], [glib-2.0], HAVE_GLIB=true, HAVE_GLIB=false)
GLIB_PACKAGE=glib-2.0
PKG_CHECK_MODULES([GLIB], [GLIB_PACKAGE], HAVE_GLIB=true, HAVE_GLIB=false)
if test "x$HAVE_GLIB" = "xtrue"; then
GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_GLIB=1"
AC_SUBST(GLIB_PACKAGE)
else
enable_glib=no
fi