From fc8fd6f8cb01ac93933d372e8056765de04092ae Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 5 Mar 2002 05:18:23 +0000 Subject: [PATCH] Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0. --- ChangeLog | 19 +++++++++++++++++++ ChangeLog.pre-2-0 | 19 +++++++++++++++++++ ChangeLog.pre-2-10 | 19 +++++++++++++++++++ ChangeLog.pre-2-12 | 19 +++++++++++++++++++ ChangeLog.pre-2-2 | 19 +++++++++++++++++++ ChangeLog.pre-2-4 | 19 +++++++++++++++++++ ChangeLog.pre-2-6 | 19 +++++++++++++++++++ ChangeLog.pre-2-8 | 19 +++++++++++++++++++ INSTALL | 4 ++-- Makefile.am | 24 ++++++++++++++++++++++++ README | 2 +- autogen.sh | 2 +- configure.in | 11 ++++++----- glib-2.0-uninstalled.pc.in | 2 +- glib-2.0.pc.in | 2 +- glib-zip.in | 24 ++++++++++++------------ glib.spec.in | 2 +- glib/.cvsignore | 2 +- glib/Makefile.am | 28 ++++++++++++++-------------- gmodule-2.0-uninstalled.pc.in | 2 +- gmodule-2.0.pc.in | 2 +- gmodule/Makefile.am | 26 +++++++++++++------------- gobject-2.0-uninstalled.pc.in | 2 +- gobject-2.0.pc.in | 2 +- gobject/Makefile.am | 30 +++++++++++++++--------------- gthread-2.0-uninstalled.pc.in | 2 +- gthread-2.0.pc.in | 2 +- gthread/Makefile.am | 26 +++++++++++++------------- m4macros/glib-2.0.m4 | 2 +- tests/Makefile.am | 8 ++++---- tests/makefile.mingw.in | 12 ++++++------ 31 files changed, 274 insertions(+), 97 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae70edb4..1a98ecdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ae70edb4..1a98ecdb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,22 @@ +Sun Mar 3 21:09:24 2002 Owen Taylor + + * configure.in: Default to --disable-gtk-doc, to avoid + Jade setup hassles. + + * autogen.sh: Add --enable-gtk-doc. + + * configure.in: Default to --disable-static to go + along with Pango, GTK+ where we need to do that for + bin-compat reasons. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + + * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 + tests/makefile.mingw.in: Switch everything over to + glib-2.0. + Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. diff --git a/INSTALL b/INSTALL index 07cf9c27..07240c0d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Simple install procedure ======================== - % gzip -cd glib-1.3.15.tar.gz | tar xvf - # unpack the sources - % cd glib-1.3.15 # change to the toplevel directory + % gzip -cd glib-2.0.0.tar.gz | tar xvf - # unpack the sources + % cd glib-2.0.0 # change to the toplevel directory % ./configure # run the `configure' script % make # build GLIB diff --git a/Makefile.am b/Makefile.am index 416cee81..ce534454 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,3 +102,27 @@ dist-hook: $(BUILT_EXTRA_DIST) for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done + +# This is a version of the automake-1.4 distcheck rule modified +# to pass --enable-gtk-doc to ./configure +# +mydistcheck: dist + -rm -rf $(distdir) + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" diff --git a/README b/README index ecbeda86..c602e6e9 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ version is meant for developers of GLib only: General Information =================== -This is GLib version 1.3.15. GLib is a library which includes support +This is GLib version 2.0.0. GLib is a library which includes support routines for C such as lists, trees, hashes, memory allocation, and many other things. diff --git a/autogen.sh b/autogen.sh index 24012686..0159c212 100755 --- a/autogen.sh +++ b/autogen.sh @@ -86,7 +86,7 @@ autoconf cd $ORIGDIR if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode "$@" + $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@" echo echo "Now type 'make' to compile $PROJECT." diff --git a/configure.in b/configure.in index 42920e79..3702809c 100644 --- a/configure.in +++ b/configure.in @@ -31,9 +31,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([ # if backwards compatibility has been broken, # set GLIB_BINARY_AGE _and_ GLIB_INTERFACE_AGE to 0. # -GLIB_MAJOR_VERSION=1 -GLIB_MINOR_VERSION=3 -GLIB_MICRO_VERSION=15 +GLIB_MAJOR_VERSION=2 +GLIB_MINOR_VERSION=0 +GLIB_MICRO_VERSION=0 GLIB_INTERFACE_AGE=0 GLIB_BINARY_AGE=0 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION @@ -292,6 +292,7 @@ GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale" AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR,"$GLIB_LOCALE_DIR") dnl Initialize libtool +AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL @@ -1613,9 +1614,9 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) +AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=no) -if test x$enable_gtk_doc = xauto ; then +if test x$enable_gtk_doc = xyes ; then if test x$GTKDOC = xtrue ; then enable_gtk_doc=yes else diff --git a/glib-2.0-uninstalled.pc.in b/glib-2.0-uninstalled.pc.in index e74011d4..0290ea78 100644 --- a/glib-2.0-uninstalled.pc.in +++ b/glib-2.0-uninstalled.pc.in @@ -5,5 +5,5 @@ glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums Name: GLib Uninstalled Description: C Utility Library, Not Installed Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-2.0.la @ICONV_LIBS@ @INTLLIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in index 28f11b3c..61207411 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -10,5 +10,5 @@ glib_mkenums=glib-mkenums Name: GLib Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -lglib-1.3 @INTLLIBS@ @ICONV_LIBS@ +Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include diff --git a/glib-zip.in b/glib-zip.in index 50874d91..df15bbe7 100755 --- a/glib-zip.in +++ b/glib-zip.in @@ -12,10 +12,10 @@ rm $ZIP zip -r $ZIP -@ <= $min_glib_version) if test x$PKG_CONFIG != xno ; then diff --git a/tests/Makefile.am b/tests/Makefile.am index c9c7fb8c..59d08313 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,10 +2,10 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule @GLIB_DE EFENCE= -libglib = $(top_builddir)/glib/libglib-1.3.la -libgthread = $(top_builddir)/gthread/libgthread-1.3.la -libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la -libgobject = $(top_builddir)/gobject/libgobject-1.3.la +libglib = $(top_builddir)/glib/libglib-2.0.la +libgthread = $(top_builddir)/gthread/libgthread-2.0.la +libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la +libgobject = $(top_builddir)/gobject/libgobject-2.0.la if PLATFORM_WIN32 libadd_libgmodule = $(libgmodule) diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in index c666e251..ed9a791c 100644 --- a/tests/makefile.mingw.in +++ b/tests/makefile.mingw.in @@ -56,20 +56,20 @@ all: $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS) .SUFFIXES: .c .i .exe .c.exe: - $(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-1.3 -L ../glib -lglib-1.3 + $(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-2.0 -L ../glib -lglib-2.0 module-test.exe : module-test.o - $(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS) + $(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o - $(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS) + $(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o - $(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS) + $(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) libmoduletestplugin_a.dll : libmoduletestplugin_a.o - $(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 + $(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 libmoduletestplugin_b.dll : libmoduletestplugin_b.o - $(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 + $(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 check: all @for P in $(TESTS) ; do echo $$P; PATH=../glib:../gmodule:../gobject:../gthread:$$PATH ./$$P; done -- 2.34.1