Remove warnings about conflicts with the stable version.

Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Remove warnings about conflicts with the
        stable version.

	 * glib-2.0.m4: Fix some of the error text to be halfway
        up to date.

        * README.in INSTALL.in: Add these to generate README, INSTAL
        (as in the stable branch). Update.

	  * HACKING: Update.

ChangeLog

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-0

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-10

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-12

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-2

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-4

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-6

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

ChangeLog.pre-2-8

@@ -1,3 +1,16 @@
+Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove warnings about conflicts with the
+	stable version.
+
+	* glib-2.0.m4: Fix some of the error text to be halfway
+	up to date.
+
+	* README.in INSTALL.in: Add these to generate README, INSTAL
+	(as in the stable branch). Update.
+
+	* HACKING: Update.
+
 2001-04-16  Havoc Pennington  <hp@redhat.com>
 
 	* gqsort.c: docs

HACKING

@@ -1,4 +1,4 @@
-If you want to hack on the Gtk+ project, it will make you life easier
+If you want to hack on the GLib project, it will make you life easier
 to have the following packages installed:
 
 	- GNU autoconf 2.13
@@ -30,10 +30,4 @@ Note that autogen.sh runs configure for you.  If you wish to pass
 options like --prefix=/usr to configure you can give those options
 to autogen.sh and they will be passed on to configure.
 
-Please submit patches to the gtk-list@redhat.com mailing list (you must
+For information about submitting patches see the README file.
-subscribe before you post, e-mail gtk-list-request@redhat.com with a
-subject of "subscribe"). All kinds of contributions are accepted.
-Patches that you wish to go into the distribution should also be uploaded 
-to ftp://ftp.gimp.org/incoming.  Follow the rules there for naming your
-patches. 
-

INSTALL

@@ -1,11 +1,13 @@
 Simple install procedure
 ========================
 
-  % gzip -cd glib-1.3.1.tar.gz | tar xvf -  # unpack the sources
+  % gzip -cd glib-1.3.4.tar.gz | tar xvf -  # unpack the sources
-  % cd glib-1.3.1                           # change to the toplevel directory
+  % cd glib-1.3.4                           # change to the toplevel directory
   % ./configure                             # run the `configure' script
   % make                                    # build GLIB
+
   [ Become root if necessary ]
+  % rm -rf /install-prefix/include/glib.h /install-prefix/include/gmodule.h
   % make install                            # install GLIB
 
 Requirements

INSTALL.in

@@ -0,0 +1,89 @@
+Simple install procedure
+========================
+
+  % gzip -cd glib-@GLIB_VERSION@.tar.gz | tar xvf -  # unpack the sources
+  % cd glib-@GLIB_VERSION@                           # change to the toplevel directory
+  % ./configure                             # run the `configure' script
+  % make                                    # build GLIB
+
+  [ Become root if necessary ]
+  % rm -rf /install-prefix/include/glib.h /install-prefix/include/gmodule.h
+  % make install                            # install GLIB
+
+Requirements
+============
+
+In order to implement conversions between character sets,
+GLib requires an implementation of the standard iconv() routine.
+Most modern systems will have a suitable implementation, however
+many older systems lack an iconv() implementation. On such systems, 
+you must install the libiconv library. This can be found at:
+
+ http://clisp.cons.org/~haible/packages-libiconv.html
+
+If your system has an iconv implementation but you want to use
+libiconv instead, you can pass the --with-libiconv option to
+configure. This forces libiconv to be used. 
+
+Note that if you have libiconv installed in your default include
+search path (for instance, in /usr/local/), but don't enable
+it, you will get an error while compiling GTK+ because the
+iconv.h that libiconv installs hides the system iconv.
+
+The Nitty-Gritty
+================
+
+The 'configure' script can be given a number of options to enable
+and disable various features. For a complete list, type:
+
+  ./configure --help
+
+A few of the more important ones:
+
+*  --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [ Defaults to /usr/local ]
+
+*  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [ Defaults to the value given to --prefix ]
+
+Options can be given to the compiler and linker by setting
+environment variables before running configure. A few of the more
+important ones:
+
+ CC       : The C compiler to use
+ CPPFLAGS : Flags for the C preprocesser such as -I and -D
+ CFLAGS   : C compiler flags
+
+The most important use of this is to set the
+optimization/debugging flags. For instance, to compile with no
+debugging information at all, run configure as:
+
+ CFLAGS=-O2 ./configure           # Bourne compatible shells (sh/bash/zsh)
+
+or,
+
+ setenv CFLAGS -O2 ; ./configure  # csh and variants
+
+
+Installation directories
+========================
+
+The location of the installed files is determined by the --prefix
+and --exec-prefix options given to configure. There are also more
+detailed flags to control individual directories. However, the
+use of these flags is not tested.
+
+One particular detail to note, is that the architecture-dependent
+include file glibconfig.h is installed in:
+
+  $exec_pref/lib/glib/include/
+
+if you have a version in $prefix/include, this is out of date
+and should be deleted.
+
+A shell script glib-config is created during the configure
+process, and installed in the bin/ directory
+($exec_prefix/bin). This is used to determine the location of glib
+when building applications.  If you move glib after installation,
+it will be necessary to edit this file.
+

Makefile.am

@@ -235,7 +235,8 @@ snapcheck:
 	$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 dist-hook: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)'; \
+	cd $(top_builddir) && CONFIG_FILES="INSTALL README" CONFIG_HEADERS= $(SHELL) ./config.status
+	files='$(BUILT_EXTRA_DIST)' INSTALL README; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
-	  cp $$d/$$f $(distdir) || exit 1; done
+	  rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done

README

@@ -7,24 +7,13 @@ version is meant for developers of GLib only:
  * You should not base stable software on this version of GLib.
  * GNOME developers should use a stable version of GLib.
 
-Distributions should *NOT* ship a development package of this GLib.
-Do not ship the headers and do not ship the glib-config script.  These
-things will conflict with the stable 1.2 series.  Package only enough
-to satisfy the requirements of some other package.  Package only the
-library itself.  Doing otherwise will do no favors to the community.
-
-If you install this version of GLib, we strongly recommend that you
-install it in a different prefix than GLib 1.2.  Use --prefix as an
-argument to configure to do this.  Otherwise, you will not be able to
-do development with GLib 1.2 any longer.
-
 *** You should be using GLib 1.2 instead. ***
 
 
 General Information
 ===================
 
-This is GLib version 1.3.1. GLib is a library which includes support
+This is GLib version 1.3.4. GLib is a library which includes support
 routines for C such as lists, trees, hashes, memory allocation, and
 many other things.
 
@@ -34,12 +23,11 @@ The official ftp site is:
 The official web site is:
   http://www.gtk.org/
 
-A mailing list is located at:
+Information about mailing lists can be found at
-  gtk-list@redhat.com
+  http://www.gtk.org/mailinglists.html
-
-To subscribe: mail -s subscribe gtk-list-request@redhat.com < /dev/null
-(Send mail to gtk-list-request@redhat.com with the subject "subscribe")
 
+To subscribe: mail -s subscribe gtk-list-request@gnome.org < /dev/null
+(Send mail to gtk-list-request@gnome.org with the subject "subscribe")
 
 Installation
 ============
@@ -49,26 +37,23 @@ See the file 'INSTALL'
 How to report bugs
 ==================
 
-To report a bug, send mail either to gtk-list, as mentioned
+Bugs should be reported to the GNOME bug tracking system. 
-above, or to gtk-bugs@gtk.org. If you send mail to gtk-list, you
+(http://bugzilla.gnome.org, product glib.) You will need
-must be subscribed yourself.
+to create an account for yourself.
 
-In the mail include:
+In the bug report please include:
-
-* The version of GLib
 
 * Information about your system. For instance:
 
    - What operating system and version
-   - What version of X
    - For Linux, what version of the C library
 
   And anything else you think is relevant.
 
 * How to reproduce the bug. 
 
-  If you can reproduce it with the testglib program that is built 
+  If you can reproduce it with the testgtk program that is built 
-  in the glib/ directory, that will be most convenient.  Otherwise, 
+  in the gtk/ subdirectory, that will be most convenient.  Otherwise, 
   please include a short test program that exhibits the behavior. 
   As a last resort, you can also provide a pointer to a larger piece 
   of software that can be downloaded.
@@ -82,9 +67,16 @@ In the mail include:
 Patches
 =======
 
-Patches can be uploaded to the incoming/ directory on
+Patches should also be submitted to bugzilla.gnome.org. If the
-ftp.gtk.org.  Please follow the instructions there, and include
+patch fixes an existing bug, add the patch as an attachment
-your name and email address in the README file.
+to that bug report.
 
-If the patch fixes a bug, it is usually a good idea to include
+Otherwise, enter a new bug report that describes the patch,
-all the information described in "How to Report Bugs".
+and attach the patch to that bug report.
+
+Bug reports containing patches should include the PATCH keyword
+in their keyword fields. If the patch adds to or changes the GLib 
+programming interface, the API keyword should also be included.
+
+Patches should be in unified diff form. (The -u option to GNU
+diff.)

README.in

@@ -0,0 +1,82 @@
+ *** IMPORTANT *** 
+
+This is a development version of GLib.  You should be using a stable
+version, which is available at ftp://ftp.gtk.org/pub/gtk/v1.2/.  This
+version is meant for developers of GLib only:
+
+ * You should not base stable software on this version of GLib.
+ * GNOME developers should use a stable version of GLib.
+
+*** You should be using GLib 1.2 instead. ***
+
+
+General Information
+===================
+
+This is GLib version @GLIB_VERSION@. GLib is a library which includes support
+routines for C such as lists, trees, hashes, memory allocation, and
+many other things.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html
+
+To subscribe: mail -s subscribe gtk-list-request@gnome.org < /dev/null
+(Send mail to gtk-list-request@gnome.org with the subject "subscribe")
+
+Installation
+============
+
+See the file 'INSTALL'
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking system. 
+(http://bugzilla.gnome.org, product glib.) You will need
+to create an account for yourself.
+
+In the bug report please include:
+
+* Information about your system. For instance:
+
+   - What operating system and version
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug. 
+
+  If you can reproduce it with the testgtk program that is built 
+  in the gtk/ subdirectory, that will be most convenient.  Otherwise, 
+  please include a short test program that exhibits the behavior. 
+  As a last resort, you can also provide a pointer to a larger piece 
+  of software that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out
+  when the crash occured.
+
+* Further information such as stack traces may be useful, but
+  is not necessary.
+
+Patches
+=======
+
+Patches should also be submitted to bugzilla.gnome.org. If the
+patch fixes an existing bug, add the patch as an attachment
+to that bug report.
+
+Otherwise, enter a new bug report that describes the patch,
+and attach the patch to that bug report.
+
+Bug reports containing patches should include the PATCH keyword
+in their keyword fields. If the patch adds to or changes the GLib 
+programming interface, the API keyword should also be included.
+
+Patches should be in unified diff form. (The -u option to GNU
+diff.)

configure.in

@@ -1981,10 +1981,5 @@ echo ""
 echo "  * You should not base stable software on this version of GLib."
 echo "  * GNOME developers should use a stable version of GLib."
 echo ""
-echo "If you install this version of GLib, we strongly recommend that you"
-echo "install it in a different prefix than GLib 1.2.  Use --prefix as an"
-echo "argument to configure to do this.  Otherwise, you will not be able to"
-echo "do development with GLib 1.2 any longer."
-echo ""
 echo " *** You should be using GLib 1.2 instead. ***"
 ])

glib-2.0.m4

@@ -2,12 +2,12 @@
 # Owen Taylor     1997-2001
 
 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to glib-config
+dnl gthread is specified in MODULES, pass to pkg-config
 dnl
 AC_DEFUN(AM_PATH_GLIB_2_0,
 [dnl 
-dnl Get the cflags and libraries from the glib-config-2.0 script
+dnl Get the cflags and libraries from pkg-config
 dnl
 AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
 		    , enable_glibtest=yes)
@@ -61,7 +61,7 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and ru
       LIBS="$GLIB_LIBS $LIBS"
 dnl
 dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config-2.0 to some extent
+dnl checks the results of pkg-config to some extent)
 dnl
       rm -f conf.glibtest
       AC_TRY_RUN([
@@ -167,12 +167,7 @@ main ()
           echo "*** is required on your system"
 	  echo "***"
           echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
           echo "*** or that you have moved GLIB since it was installed. In the latter case, you"

glib/Makefile.am

@@ -235,7 +235,8 @@ snapcheck:
 	$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 dist-hook: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)'; \
+	cd $(top_builddir) && CONFIG_FILES="INSTALL README" CONFIG_HEADERS= $(SHELL) ./config.status
+	files='$(BUILT_EXTRA_DIST)' INSTALL README; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
-	  cp $$d/$$f $(distdir) || exit 1; done
+	  rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done

m4macros/glib-2.0.m4

@@ -2,12 +2,12 @@
 # Owen Taylor     1997-2001
 
 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to glib-config
+dnl gthread is specified in MODULES, pass to pkg-config
 dnl
 AC_DEFUN(AM_PATH_GLIB_2_0,
 [dnl 
-dnl Get the cflags and libraries from the glib-config-2.0 script
+dnl Get the cflags and libraries from pkg-config
 dnl
 AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
 		    , enable_glibtest=yes)
@@ -61,7 +61,7 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and ru
       LIBS="$GLIB_LIBS $LIBS"
 dnl
 dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config-2.0 to some extent
+dnl checks the results of pkg-config to some extent)
 dnl
       rm -f conf.glibtest
       AC_TRY_RUN([
@@ -167,12 +167,7 @@ main ()
           echo "*** is required on your system"
 	  echo "***"
           echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
           echo "*** or that you have moved GLIB since it was installed. In the latter case, you"