Fixed bug #830: pkg-config support. YAZ installs yaz.pc for Debian

package libyaz-dev and Redhat package libyaz-devel.

diff --git a/.cvsignore b/.cvsignore
index a55e449..cecafb0 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,6 +8,7 @@ configure
 libtool
 yaz-config
 yaz.spec
 libtool
 yaz-config
 yaz.spec

+yaz.pc

 Doxyfile
 dox
 autom4te.cache
 Doxyfile
 dox
 autom4te.cache

diff --git a/Makefile.am b/Makefile.am
index 5459ebe..f1f3705 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.

-## $Id: Makefile.am,v 1.39 2007-01-03 08:42:13 adam Exp $
+## $Id: Makefile.am,v 1.40 2007-01-24 10:09:31 adam Exp $

 
 AUTOMAKE_OPTIONS = foreign 
 
 
 AUTOMAKE_OPTIONS = foreign 
 

@@ -12,9 +12,12 @@ aclocaldir=$(datadir)/aclocal
 
 aclocal_DATA = m4/yaz.m4
 
 
 aclocal_DATA = m4/yaz.m4
 

+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = yaz.pc
+

 SPEC_FILE=$(PACKAGE).spec
 EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO \
 SPEC_FILE=$(PACKAGE).spec
 EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO \

-       yaz-config.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
+       yaz-config.in yaz.pc.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \

        Doxyfile.in
 
 dist-hook:
        Doxyfile.in
 
 dist-hook:

diff --git a/NEWS b/NEWS
index 9e9239d..8594aae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Fixed bug #830: pkg-config support.
+

 --- 2.1.48 2007/01/23
 
 Extended ZOOM result set options with two options that may be read by
 --- 2.1.48 2007/01/23
 
 Extended ZOOM result set options with two options that may be read by

diff --git a/configure.ac b/configure.ac
index d32ab22..84119e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1995-2007
 dnl See the file LICENSE for details.
 dnl YAZ Toolkit, Index Data 1995-2007
 dnl See the file LICENSE for details.

-dnl $Id: configure.ac,v 1.58 2007-01-23 20:02:09 adam Exp $
+dnl $Id: configure.ac,v 1.59 2007-01-24 10:09:31 adam Exp $

 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.49],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.49],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)

@@ -428,6 +428,7 @@ doc/common/Makefile
 doc/common/print.dsl
 etc/Makefile
 yaz-config
 doc/common/print.dsl
 etc/Makefile
 yaz-config

+yaz.pc

 Doxyfile
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
 
 Doxyfile
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
 

diff --git a/debian/libyaz-dev.install b/debian/libyaz-dev.install
index cad9e51..98e7964 100644 (file)
--- a/debian/libyaz-dev.install
+++ b/debian/libyaz-dev.install
@@ -1,4 +1,5 @@
 debian/tmp/usr/include/yaz
 debian/tmp/usr/include/yaz

+debian/tmp/usr/lib/pkgconfig/yaz.pc

 debian/tmp/usr/lib/libyaz*.a
 debian/tmp/usr/lib/libyaz*.so
 debian/tmp/usr/lib/libyaz*.la
 debian/tmp/usr/lib/libyaz*.a
 debian/tmp/usr/lib/libyaz*.so
 debian/tmp/usr/lib/libyaz*.la

diff --git a/yaz.pc.in b/yaz.pc.in
new file mode 100644 (file)
index 0000000..546b5ed
--- /dev/null
+++ b/yaz.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: YAZ
+Version: @VERSION@
+Description: YAZ library.
+Requires: libexslt
+Libs: -L${libdir} -lyaz
+Libs.private: @LIBS@
+Cflags: @YAZ_CONFIG_CFLAGS@

diff --git a/yaz.spec.in b/yaz.spec.in
index 8a19e3d..a692036 100644 (file)
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -82,6 +82,7 @@ rm -fr ${RPM_BUILD_ROOT}
 /usr/bin/yaz-config
 /usr/bin/yaz-asncomp
 /usr/include/yaz
 /usr/bin/yaz-config
 /usr/bin/yaz-asncomp
 /usr/include/yaz

+/usr/lib/pkgconfig/yaz.pc

 /usr/lib/*.so
 /usr/lib/*.a
 /usr/lib/*.la
 /usr/lib/*.so
 /usr/lib/*.a
 /usr/lib/*.la