lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Have libmdb.pc reflect --disable-glib

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -200,6 +200,5 @@ script:
- ./src/util/mdb-sql -i test/sql/nwind.sql test/data/nwind.mdb - ./src/util/mdb-sql -i test/sql/nwind.sql test/data/nwind.mdb
- ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner - ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner
- env MDBPATH=test/data ./src/odbc/unittest - env MDBPATH=test/data ./src/odbc/unittest
- sudo make install - env PKG_CONFIG_PATH=. pkg-config libmdb --exists
- pkg-config libmdb --exists - env PKG_CONFIG_PATH=. pkg-config libmdbsql --exists
- pkg-config libmdbsql --exists

4
configure.ac
View File

@ -212,9 +212,11 @@ AC_ARG_ENABLE(glib,
[enable_glib=$enableval], [enable_glib=yes]) [enable_glib=$enableval], [enable_glib=yes])
if test "$enable_glib" = "yes"; then 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 if test "x$HAVE_GLIB" = "xtrue"; then
GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_GLIB=1" GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_GLIB=1"
AC_SUBST(GLIB_PACKAGE)
else else
enable_glib=no enable_glib=no
fi fi

2
libmdb.pc.in
View File

@ -9,7 +9,7 @@ includedir=@includedir@
Name: libmdb Name: libmdb
Description: core MDB file support library Description: core MDB file support library
Requires: glib-2.0 Requires: @GLIB_PACKAGE@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lmdb Libs: -L${libdir} -lmdb
Cflags: Cflags: