18:36. incorporated proposed cleanups from gtk-devel-list.

Sat Jul 24 20:11:35 1999  Tim Janik  <timj@gtk.org>

        * merged GLib 1.3.0 with glib-1.2.3 from Fri Jul 16 22:18:36.
        * incorporated proposed cleanups from gtk-devel-list.

        * bumped version number to GLib-1.3.1

        * glib.h:
        * gqueue.c:
        * gstring.c:
        * glist.c:
        removed string tokenisation (we got g_strsplit() and g_strjoin()
        already) and readline functions.
        s/g_list_delete/g_list_delete_link.
        implemented g_slist_delete_link.
        removed notion of g_ATEXIT() macro in glib.h, this is an *internal*
        macro, g_atexit() is provided for public consumption.
        added GTrashStack inline utility functions.
        reimplement double eneded queues.
        removed GStack implementation, people can use a queue or a (singly)
        linked list for this task.
        deprecated g_strescape(), we need the SunOS variants here.

        * gdate.c: added DEBUG_MSG() macro to wrap old messages.

        * *.*: CVS merges.

        * upgrade to libtool 1.3.3.

3 files changed, 55 insertions, 1 deletions

diff --git a/docs/.cvsignore b/docs/.cvsignore
index 61df8a423..20e7d2df3 100644
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -16,3 +16,4 @@ Makefile.in
 *.cps
 *.fns
 *.vrs
+glib-config.1
diff --git a/docs/Makefile.am b/docs/Makefile.am
index ee04fe1bb..da6a13d41 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,7 +4,7 @@ info_TEXINFOS = glib.texi
 
 man_MANS = glib-config.1
 
-EXTRA_DIST = glib-config.1	\
+EXTRA_DIST = glib-config.1.in	\
 	     glib.html 		\
 	     glib_toc.html
 
diff --git a/docs/glib-config.1.in b/docs/glib-config.1.in
new file mode 100644
index 000000000..2abf9fa1d
--- /dev/null
+++ b/docs/glib-config.1.in
@@ -0,0 +1,53 @@
+.TH GLIB 1 "16 December 1998" Version @VERSION@
+.SH NAME
+glib-config - script to get information about the installed version of GLib
+.SH SYNOPSIS
+.B  glib-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] [LIBRARIES]
+.SH DESCRIPTION
+.PP
+\fIglib-config\fP is a tool that is used to configure to determine
+the compiler and linker flags that should be used to compile
+and link programs that use \fIGLib\fP. It is also used internally
+to the .m4 macros for GNU autoconf that are included with \fIGLib\fP.
+.
+.SH OPTIONS
+.l
+\fIglib-config\fP accepts the following options:
+.TP 8
+.B  LIBRARIES
+\fIGLib\fP has three libraries 'glib', 'gmodule' and 'gthread'.  If you specify one of
+them, only the appropriate things for that library will be printed.
+.TP 8
+.B  \-\-version
+Print the currently installed version of \fIGLib\fP on the standard output.
+.TP 8
+.B  \-\-libs
+Print the linker flags that are necessary to link a \fIGLib\fP program.
+.TP 8
+.B  \-\-cflags
+Print the compiler flags that are necessary to compile a \fIGLib\fP program.
+.TP 8
+.B  \-\-prefix=PREFIX
+If specified, use PREFIX instead of the installation prefix that \fIGLib\fP
+was built with when computing the output for the \-\-cflags and
+\-\-libs options. This option is also used for the exec prefix
+if \-\-exec\-prefix was not specified. This option must be specified
+before any \-\-libs or \-\-cflags options.
+.TP 8
+.B  \-\-exec\-prefix=PREFIX
+If specified, use PREFIX instead of the installation exec prefix that
+\fIGLib\fP was built with when computing the output for the \-\-cflags
+and \-\-libs options.  This option must be specified before any
+\-\-libs or \-\-cflags options.
+.SH SEE ALSO
+.BR gtk-config (1),
+.BR gimp (1),
+.BR gimptool (1)
+.SH COPYRIGHT
+Copyright \(co  1998 Owen Taylor
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.