pkg-config data files

2000-07-31  Havoc Pennington  <hp@redhat.com>

        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
	gobject-2.0.pc.in: pkg-config data files

	* Makefile.am: Install/dist the .pc files

	* configure.in: Output the .pc files

diff --git a/ChangeLog b/ChangeLog
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 34c24d2..d3eb10c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2000-07-31  Havoc Pennington  <hp@redhat.com>
+
+        * glib-2.0.pc.in, gobject-2.0.pc.in, gmodule-2.0.pc.in,
+       gobject-2.0.pc.in: pkg-config data files         
+       
+       * Makefile.am: Install/dist the .pc files
+
+       * configure.in: Output the .pc files
+
 2000-07-31  Tor Lillqvist  <tml@iki.fi>
 
        * giowin32.c (buffer_read): The code didn't compile (must

diff --git a/Makefile.am b/Makefile.am
index ea0bce5..421cdb1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,6 +110,9 @@ testgdateparser_LDADD = libglib-1.3.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
+
 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

diff --git a/configure.in b/configure.in
index 3722b19..dae9d8d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1554,6 +1554,10 @@ esac
 ])
 
 AC_OUTPUT([
+glib-2.0.pc
+gmodule-2.0.pc
+gthread-2.0.pc
+gobject-2.0.pc
 glib.spec
 Makefile
 glib-config-2.0

diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
new file mode 100644 (file)
index 0000000..e361a1c
--- /dev/null
+++ b/glib-2.0.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GLib
+Description: C Utility Library
+Version: @VERSION@
+Libs: -L${libdir} -lglib-1.3
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib/include 

diff --git a/glib/Makefile.am b/glib/Makefile.am
index ea0bce5..421cdb1 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -110,6 +110,9 @@ testgdateparser_LDADD = libglib-1.3.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib-2.0.m4
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
+
 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

diff --git a/gmodule-2.0.pc.in b/gmodule-2.0.pc.in
new file mode 100644 (file)
index 0000000..393a473
--- /dev/null
+++ b/gmodule-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GModule
+Description: Dynamic module loader for GLib
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib/include 

diff --git a/gobject-2.0.pc.in b/gobject-2.0.pc.in
new file mode 100644 (file)
index 0000000..95f6b60
--- /dev/null
+++ b/gobject-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GObject
+Description: Object/type system for GLib
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lgobject-1.3
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib/include 

diff --git a/gthread-2.0.pc.in b/gthread-2.0.pc.in
new file mode 100644 (file)
index 0000000..a4a9cc8
--- /dev/null
+++ b/gthread-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GThread
+Description: Thread support for GLib
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lgthread-1.3 @G_THREAD_LIBS@
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib/include