diff --git a/.travis.yml b/.travis.yml index 8c55207..42fbcf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,6 +101,7 @@ jobs: - bison - gawk - gtk-doc + - pkg-config env: - CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --disable-glib" - YACC="/usr/local/opt/bison/bin/bison" @@ -115,6 +116,7 @@ jobs: - bison - gawk - gtk-doc + - pkg-config env: - CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --enable-glib" - YACC="/usr/local/opt/bison/bin/bison" @@ -128,6 +130,7 @@ jobs: - bison - gawk - gtk-doc + - pkg-config env: - CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --disable-glib" - YACC="/usr/local/opt/bison/bin/bison" @@ -142,6 +145,7 @@ jobs: - bison - gawk - gtk-doc + - pkg-config env: - CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --enable-glib" - YACC="/usr/local/opt/bison/bin/bison" @@ -155,6 +159,7 @@ jobs: - bison - gawk - gtk-doc + - pkg-config env: - CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --disable-glib" - YACC="/usr/local/opt/bison/bin/bison" @@ -168,6 +173,7 @@ jobs: - bison - gawk - gtk-doc + - pkg-config env: - CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --disable-glib" - YACC="/usr/local/opt/bison/bin/bison" @@ -194,3 +200,5 @@ script: - ./src/util/mdb-sql -i test/sql/nwind.sql test/data/nwind.mdb - ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner - env MDBPATH=test/data ./src/odbc/unittest + - env PKG_CONFIG_PATH=. pkg-config libmdb --exists + - env PKG_CONFIG_PATH=. pkg-config libmdbsql --exists diff --git a/configure.ac b/configure.ac index d90aa04..9550c07 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/libmdb.pc.in b/libmdb.pc.in index ba11061..8b4b94c 100644 --- a/libmdb.pc.in +++ b/libmdb.pc.in @@ -9,7 +9,7 @@ includedir=@includedir@ Name: libmdb Description: core MDB file support library -Requires: glib-2.0 +Requires: @GLIB_PACKAGE@ Version: @VERSION@ Libs: -L${libdir} -lmdb Cflags: