From 85ac44db841d844d07cf0d3823b84ada2b06a78d Mon Sep 17 00:00:00 2001 From: brianb Date: Sun, 2 May 2004 12:13:28 +0000 Subject: [PATCH] patch from Michael Meeks for pkg-config stuff --- .cvsignore | 2 ++ ChangeLog | 7 +++++++ Makefile.am | 5 ++++- configure.in | 19 ++++++++++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index a0d52e8..09dd1ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,5 @@ libtool ltmain.sh mdbtools.spec autom4te.cache +libmdb.pc +libmdbsql.pc diff --git a/ChangeLog b/ChangeLog index 1484e2f..44f8b48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,13 @@ Sat May 1 00:02:09 CDT 2004 Jeff Smith * src/libmdb/stats.c: Fold several functions into mdb_open/mdb_close * doc/reference/libmdb/.cvsignore: Added this file +2004-04-29 Michael Meeks + * configure.in + * Makefile.am: add mdbtools pkgconfig bits + * libmdb.pc.in + * libmdbsql.pc.in: add mdbtools pkgconfig templates. + + Sat Apr 24 21:39:10 CDT 2004 Jeff Smith * src/libmdb/file.c: * src/libmdb/mem.c: Moving some NULL pointer tests diff --git a/Makefile.am b/Makefile.am index fa958f6..0ffd9e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,7 @@ SUBDIRS = src include doc DEFDIR = $(prefix) -EXTRA_DIST = HACKING +EXTRA_DIST = HACKING libmdb.pc.in libmdbsql.pc.in + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libmdb.pc libmdbsql.pc diff --git a/configure.in b/configure.in index 3394070..55bc856 100644 --- a/configure.in +++ b/configure.in @@ -173,4 +173,21 @@ AC_SUBST(READLINE_LIBS) localedir=${datadir}/locale AC_SUBST(localedir) -AC_OUTPUT(src/util/Makefile src/extras/Makefile Makefile include/Makefile src/libmdb/Makefile src/sql/Makefile src/odbc/Makefile doc/Makefile src/gmdb2/Makefile src/gmdb2/gladefiles/Makefile src/gmdb2/pixmaps/Makefile src/gmdb2/help/Makefile src/gmdb2/help/C/Makefile mdbtools.spec include/mdbver.h doc/reference/libmdb/Makefile) +AC_OUTPUT([ +libmdb.pc +libmdbsql.pc +src/util/Makefile +src/extras/Makefile +Makefile include/Makefile +src/libmdb/Makefile +src/sql/Makefile +src/odbc/Makefile +doc/Makefile +src/gmdb2/Makefile +src/gmdb2/gladefiles/Makefile +src/gmdb2/pixmaps/Makefile +src/gmdb2/help/Makefile +src/gmdb2/help/C/Makefile +mdbtools.spec +include/mdbver.h +doc/reference/libmdb/Makefile])