synced to HEAD (pkg-config support)

diff --git a/GiNaC.spec.in b/GiNaC.spec.in
index e3aafb746cda81bfc2c7ec64ead199f2d8e30b7b..ec8298d6fff061dbc00152cdc24c09990aca3ef6 100644 (file)
--- a/GiNaC.spec.in
+++ b/GiNaC.spec.in
@@ -99,11 +99,12 @@ fi
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
-%{_includedir}/ginac/*.h
+%{_libdir}/pkgconfig/ginac.pc
+%{_includedir}/ginac
 %{_infodir}/*.info*
 %{_mandir}/man1/ginac-config.1*
 %{_bindir}/ginac-config
-%{_datadir}/aclocal/*
+%{_datadir}/aclocal/ginac.m4
 
 %files utils
 %defattr(-,root,root)
@@ -113,6 +114,9 @@ fi
 %{_mandir}/man1/viewgar.1*
 
 %changelog
+* Thu Nov 20 2003 Christian Bauer <Christian.Bauer@uni-mainz.de>
+- added pkg-config metadata file to devel package
+
 * Thu Nov  1 2001 Christian Bauer <Christian.Bauer@uni-mainz.de>
 - moved ginsh and viewgar to "utils" package
 

diff --git a/Makefile.am b/Makefile.am
index 6f8e63fed9287517021f783a05618865881fc411..dff0466518c7349583eb5114cc12836c443070fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,8 @@ AUTOMAKE_OPTIONS = 1.4
 
 # GiNaC runtime configuration script
 bin_SCRIPTS = ginac-config
+BUILT_SOURCES = ginac-config
+ginac-config: ginac-config.in
 
 # Man pages
 man_MANS = ginac-config.1
@@ -15,8 +17,13 @@ man_MANS = ginac-config.1
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ginac.m4
 
+# pkg-config metadata
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ginac.pc
+$(pkgconfig_DATA): config.status
+
 # All the rest of the distributed files
-EXTRA_DIST = ginac.m4 GiNaC.spec depcomp
+EXTRA_DIST = ginac.m4 ginac.pc GiNaC.spec depcomp
 
 # Rule to build tar-bzipped distribution package
 $(PACKAGE)-$(VERSION).tar.gz: dist

diff --git a/configure.ac b/configure.ac
index d9b98c9c9a3a369c15d5c1c3d9d84979e0012935..63972c38e365dbc7ca8b9256c781a4f13f0299f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,7 @@ Makefile
 GiNaC.spec
 ginac-config
 ginac-config.1
+ginac.pc
 ginac/Makefile
 ginac/version.h
 check/Makefile

diff --git a/ginac.pc.in b/ginac.pc.in
new file mode 100644 (file)
index 0000000..47aeacc
--- /dev/null
+++ b/ginac.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GiNaC
+Description: C++ library for symbolic calculations
+Version: @VERSION@
+# uncomment this when a pkg-config'd cln exists
+# CAUTION: this will merge in the cln libs and cflags which are already in
+#          GINACLIB_LIBS and GINACLIB_CPPFLAGS
+#Requires: cln >= 1.1.0
+Libs: -L${libdir} -lginac @GINACLIB_LIBS@
+Cflags: -I${includedir} @GINACLIB_CPPFLAGS@