summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--ChangeLog.pre-2-019
-rw-r--r--ChangeLog.pre-2-1019
-rw-r--r--ChangeLog.pre-2-1219
-rw-r--r--ChangeLog.pre-2-219
-rw-r--r--ChangeLog.pre-2-419
-rw-r--r--ChangeLog.pre-2-619
-rw-r--r--ChangeLog.pre-2-819
-rw-r--r--INSTALL4
-rw-r--r--Makefile.am4
-rw-r--r--NEWS1
-rw-r--r--README2
-rw-r--r--configure.in5
-rw-r--r--docs/Makefile.am2
-rw-r--r--docs/glib-config.1.in (renamed from docs/glib-config.1)2
-rw-r--r--glib/Makefile.am4
-rw-r--r--glibconfig.h.win32.in (renamed from glibconfig.h.win32)6
-rwxr-xr-xsanity_check2
18 files changed, 171 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 79e84d4a4..222242510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 79e84d4a4..222242510 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,22 @@
+Wed Mar 24 21:23:47 CST 1999 Shawn T. Amundson <amundson@gtk.org>
+
+ * Released GLib 1.2.1
+
+ * README:
+ INSTALL:
+ NEWS:
+ sanity_check: updated
+
+ * glibconfig.h.win32.in:
+ Makefile.am:
+ docs/glib-config.1.in:
+ docs/Makefile.am: Added files used to generate new files.
+
+ * glibconfig.h.win32:
+ docs/glib-config.1: Removed, now generated.
+
+ * configure.in: Added to output now-generated files.
+
Tue Mar 23 13:43:39 PST 1999 Manish Singh <yosh@gimp.org>
* giounix.c: add user_data param to check and prepare functions
diff --git a/INSTALL b/INSTALL
index d4f38aee4..b95765d9b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Simple install procedure
========================
- % gzip -cd glib-1.2.0.tar.gz | tar xvf - # unpack the sources
- % cd glib-1.2.0 # change to the toplevel directory
+ % gzip -cd glib-1.2.1.tar.gz | tar xvf - # unpack the sources
+ % cd glib-1.2.1 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GLIB
[ Become root if necessary ]
diff --git a/Makefile.am b/Makefile.am
index faba56379..045992eed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
glib.def \
makefile.msc \
giowin32.c \
- glibconfig.h.win32 \
+ glibconfig.h.win32.in \
config.h.win32
lib_LTLIBRARIES = libglib.la
@@ -99,4 +99,4 @@ snapshot:
$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
dist-hook:
- cp glib.spec $(distdir) \ No newline at end of file
+ cp glib.spec $(distdir)
diff --git a/NEWS b/NEWS
index 7f29eb545..c45539e51 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Overview of Changes in GLib 1.2.1:
* g_realloc() fix for SunOS (please report further problems).
* Continued the never ending fix vendetta regarding getpwuid(),
this time AIX has been the culprit.
+* Upgrade to libtool 1.2f
* Miscellaneous other buglets fixed.
What's new in GLib 1.2.0 (since GLib 1.0.x):
diff --git a/README b/README
index 4d36ff070..77fac3bee 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
General Information
===================
-This is GLib version 1.2.0. GLib is a library which includes support
+This is GLib version 1.2.1. GLib is a library which includes support
routines for C such as lists, trees, hashes, memory allocation, and
many other things.
diff --git a/configure.in b/configure.in
index 11d82c892..0f35f4b26 100644
--- a/configure.in
+++ b/configure.in
@@ -40,6 +40,9 @@ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
dnl
AC_DIVERT_POP()dnl
+AC_SUBST(GLIB_MAJOR_VERSION)
+AC_SUBST(GLIB_MINOR_VERSION)
+AC_SUBST(GLIB_MICRO_VERSION)
AC_SUBST(GLIB_VERSION)
# libtool versioning
@@ -1288,12 +1291,14 @@ g_mutex_contents="$glib_cv_byte_contents_gmutex"
AC_OUTPUT([
glib.spec
+glibconfig.h.win32
Makefile
glib-config
gmodule/gmoduleconf.h
gmodule/Makefile
gthread/Makefile
docs/Makefile
+docs/glib-config.1
tests/Makefile
],[case "$CONFIG_FILES" in
*glib-config*)chmod +x glib-config;;
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 b/docs/glib-config.1.in
index 75b0878cc..2abf9fa1d 100644
--- a/docs/glib-config.1
+++ b/docs/glib-config.1.in
@@ -1,4 +1,4 @@
-.TH GLIB 1 "16 December 1998" Version 1.2.0
+.TH GLIB 1 "16 December 1998" Version @VERSION@
.SH NAME
glib-config - script to get information about the installed version of GLib
.SH SYNOPSIS
diff --git a/glib/Makefile.am b/glib/Makefile.am
index faba56379..045992eed 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
glib.def \
makefile.msc \
giowin32.c \
- glibconfig.h.win32 \
+ glibconfig.h.win32.in \
config.h.win32
lib_LTLIBRARIES = libglib.la
@@ -99,4 +99,4 @@ snapshot:
$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
dist-hook:
- cp glib.spec $(distdir) \ No newline at end of file
+ cp glib.spec $(distdir)
diff --git a/glibconfig.h.win32 b/glibconfig.h.win32.in
index 663d28375..34305845b 100644
--- a/glibconfig.h.win32
+++ b/glibconfig.h.win32.in
@@ -76,9 +76,9 @@ typedef unsigned __int64 guint64;
#define G_HAVE_ALLOCA 1
#define alloca _alloca
-#define GLIB_MAJOR_VERSION 1
-#define GLIB_MINOR_VERSION 2
-#define GLIB_MICRO_VERSION 0
+#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
+#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
+#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
#ifdef __cplusplus
#define G_HAVE_INLINE 1
diff --git a/sanity_check b/sanity_check
index 87673c93a..ddde3eb49 100755
--- a/sanity_check
+++ b/sanity_check
@@ -13,7 +13,7 @@ echo "Checking glib-$VERSION.tar.gz..."
tar xfz glib-$VERSION.tar.gz
-for file in README NEWS glib.spec docs/glib-config.1
+for file in README NEWS
do
echo -n "$file... "
if [ "x`grep $VERSION glib-$VERSION/$file | wc -l | awk -F' ' '{print $1}'`" == "x1" ]; then
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 13:13:49 +0000