lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-18 09:50:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #206 from evanmiller/test-pkg-config-2

Browse Source 
Verify pkg-config on Travis
This commit is contained in:
Evan Miller
2020-12-04 09:29:53 -05:00
committed by GitHub
parent b3ed12d8fa d186a98119
commit 774b8487c6
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -101,6 +101,7 @@ jobs:
- bison - bison
- gawk - gawk
- gtk-doc - gtk-doc
- pkg-config
env: env:
- CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --disable-glib" - CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --disable-glib"
- YACC="/usr/local/opt/bison/bin/bison" - YACC="/usr/local/opt/bison/bin/bison"
@@ -115,6 +116,7 @@ jobs:
- bison - bison
- gawk - gawk
- gtk-doc - gtk-doc
- pkg-config
env: env:
- CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --enable-glib" - CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --enable-glib"
- YACC="/usr/local/opt/bison/bin/bison" - YACC="/usr/local/opt/bison/bin/bison"
@@ -128,6 +130,7 @@ jobs:
- bison - bison
- gawk - gawk
- gtk-doc - gtk-doc
- pkg-config
env: env:
- CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --disable-glib" - CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --disable-glib"
- YACC="/usr/local/opt/bison/bin/bison" - YACC="/usr/local/opt/bison/bin/bison"
@@ -142,6 +145,7 @@ jobs:
- bison - bison
- gawk - gawk
- gtk-doc - gtk-doc
- pkg-config
env: env:
- CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --enable-glib" - CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --enable-glib"
- YACC="/usr/local/opt/bison/bin/bison" - YACC="/usr/local/opt/bison/bin/bison"
@@ -155,6 +159,7 @@ jobs:
- bison - bison
- gawk - gawk
- gtk-doc - gtk-doc
- pkg-config
env: env:
- CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --disable-glib" - CONFIGURE_FLAGS="--with-iodbc=/usr/local/opt --disable-glib"
- YACC="/usr/local/opt/bison/bin/bison" - YACC="/usr/local/opt/bison/bin/bison"
@@ -168,6 +173,7 @@ jobs:
- bison - bison
- gawk - gawk
- gtk-doc - gtk-doc
- pkg-config
env: env:
- CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --disable-glib" - CONFIGURE_FLAGS="--with-unixodbc=/usr/local/opt --disable-glib"
- YACC="/usr/local/opt/bison/bin/bison" - 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-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
- env PKG_CONFIG_PATH=. pkg-config libmdb --exists
- env PKG_CONFIG_PATH=. 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: