Skip to content

Commit fc8fd6f

Browse files
owtaylorOwen Taylor
owtaylor
authored and
Owen Taylor
committed
Default to --disable-gtk-doc, to avoid Jade setup hassles.
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]> * 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.
1 parent f797702 commit fc8fd6f

31 files changed

+274
-97
lines changed

Diff for: ‎ChangeLog

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-0

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-10

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-12

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-2

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-4

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-6

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎ChangeLog.pre-2-8

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Sun Mar 3 21:09:24 2002 Owen Taylor <[email protected]>
2+
3+
* configure.in: Default to --disable-gtk-doc, to avoid
4+
Jade setup hassles.
5+
6+
* autogen.sh: Add --enable-gtk-doc.
7+
8+
* configure.in: Default to --disable-static to go
9+
along with Pango, GTK+ where we need to do that for
10+
bin-compat reasons.
11+
12+
* Makefile.am: Add a slightly modified distcheck rule
13+
that passes --enable-gtk-doc to the configure inside.
14+
(So that 'make dist' succeeds inside.)
15+
16+
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
17+
tests/makefile.mingw.in: Switch everything over to
18+
glib-2.0.
19+
120
Sun Mar 3 02:30:05 2002 Tim Janik <[email protected]>
221

322
* glib/gscanner.h (_GScannerConfig): added padding.

Diff for: ‎INSTALL

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Simple install procedure
22
========================
33

4-
% gzip -cd glib-1.3.15.tar.gz | tar xvf - # unpack the sources
5-
% cd glib-1.3.15 # change to the toplevel directory
4+
% gzip -cd glib-2.0.0.tar.gz | tar xvf - # unpack the sources
5+
% cd glib-2.0.0 # change to the toplevel directory
66
% ./configure # run the `configure' script
77
% make # build GLIB
88

Diff for: ‎Makefile.am

+24
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,27 @@ dist-hook: $(BUILT_EXTRA_DIST)
102102
for f in $$files; do \
103103
if test -f $$f; then d=.; else d=$(srcdir); fi; \
104104
rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done
105+
106+
# This is a version of the automake-1.4 distcheck rule modified
107+
# to pass --enable-gtk-doc to ./configure
108+
#
109+
mydistcheck: dist
110+
-rm -rf $(distdir)
111+
GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
112+
mkdir $(distdir)/=build
113+
mkdir $(distdir)/=inst
114+
dc_install_base=`cd $(distdir)/=inst && pwd`; \
115+
cd $(distdir)/=build \
116+
&& ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
117+
&& $(MAKE) $(AM_MAKEFLAGS) \
118+
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
119+
&& $(MAKE) $(AM_MAKEFLAGS) check \
120+
&& $(MAKE) $(AM_MAKEFLAGS) install \
121+
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
122+
&& $(MAKE) $(AM_MAKEFLAGS) dist
123+
-rm -rf $(distdir)
124+
@banner="$(distdir).tar.gz is ready for distribution"; \
125+
dashes=`echo "$$banner" | sed s/./=/g`; \
126+
echo "$$dashes"; \
127+
echo "$$banner"; \
128+
echo "$$dashes"

Diff for: ‎README

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version is meant for developers of GLib only:
1313
General Information
1414
===================
1515

16-
This is GLib version 1.3.15. GLib is a library which includes support
16+
This is GLib version 2.0.0. GLib is a library which includes support
1717
routines for C such as lists, trees, hashes, memory allocation, and
1818
many other things.
1919

Diff for: ‎autogen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ autoconf
8686
cd $ORIGDIR
8787

8888
if test -z "$AUTOGEN_SUBDIR_MODE"; then
89-
$srcdir/configure --enable-maintainer-mode "$@"
89+
$srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
9090

9191
echo
9292
echo "Now type 'make' to compile $PROJECT."

Diff for: ‎configure.in

+6-5
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([
3131
# if backwards compatibility has been broken,
3232
# set GLIB_BINARY_AGE _and_ GLIB_INTERFACE_AGE to 0.
3333
#
34-
GLIB_MAJOR_VERSION=1
35-
GLIB_MINOR_VERSION=3
36-
GLIB_MICRO_VERSION=15
34+
GLIB_MAJOR_VERSION=2
35+
GLIB_MINOR_VERSION=0
36+
GLIB_MICRO_VERSION=0
3737
GLIB_INTERFACE_AGE=0
3838
GLIB_BINARY_AGE=0
3939
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
@@ -292,6 +292,7 @@ GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale"
292292
AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR,"$GLIB_LOCALE_DIR")
293293

294294
dnl Initialize libtool
295+
AM_DISABLE_STATIC
295296
AC_LIBTOOL_WIN32_DLL
296297
AM_PROG_LIBTOOL
297298

@@ -1613,9 +1614,9 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false)
16131614
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
16141615

16151616
dnl Let people disable the gtk-doc stuff.
1616-
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
1617+
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=no)
16171618

1618-
if test x$enable_gtk_doc = xauto ; then
1619+
if test x$enable_gtk_doc = xyes ; then
16191620
if test x$GTKDOC = xtrue ; then
16201621
enable_gtk_doc=yes
16211622
else

Diff for: ‎glib-2.0-uninstalled.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums
55
Name: GLib Uninstalled
66
Description: C Utility Library, Not Installed
77
Version: @VERSION@
8-
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
8+
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-2.0.la @ICONV_LIBS@ @INTLLIBS@
99
Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib

Diff for: ‎glib-2.0.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ glib_mkenums=glib-mkenums
1010
Name: GLib
1111
Description: C Utility Library
1212
Version: @VERSION@
13-
Libs: -L${libdir} -lglib-1.3 @INTLLIBS@ @ICONV_LIBS@
13+
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
1414
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include

Diff for: ‎glib-zip.in

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ rm $ZIP
1212
zip -r $ZIP -@ <<EOF
1313
COPYING.LIB-2
1414
bin/gspawn-win32-helper.exe
15-
lib/libglib-1.3-@[email protected]
16-
lib/libgmodule-1.3-@[email protected]
17-
lib/libgobject-1.3-@[email protected]
18-
lib/libgthread-1.3-@[email protected]
15+
lib/libglib-2.0-@[email protected]
16+
lib/libgmodule-2.0-@[email protected]
17+
lib/libgobject-2.0-@[email protected]
18+
lib/libgthread-2.0-@[email protected]
1919
EOF
2020

2121
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
@@ -27,14 +27,14 @@ bin/glib-gettextize
2727
bin/glib-mkenums
2828
bin/gobject-query.exe
2929
include/glib-2.0
30-
lib/libglib-1.3.dll.a
31-
lib/glib-1.3.lib
32-
lib/libgmodule-1.3.dll.a
33-
lib/gmodule-1.3.lib
34-
lib/libgobject-1.3.dll.a
35-
lib/gobject-1.3.lib
36-
lib/libgthread-1.3.dll.a
37-
lib/gthread-1.3.lib
30+
lib/libglib-2.0.dll.a
31+
lib/glib-2.0.lib
32+
lib/libgmodule-2.0.dll.a
33+
lib/gmodule-2.0.lib
34+
lib/libgobject-2.0.dll.a
35+
lib/gobject-2.0.lib
36+
lib/libgthread-2.0.dll.a
37+
lib/gthread-2.0.lib
3838
lib/glib-2.0
3939
lib/pkgconfig/glib-2.0.pc
4040
lib/pkgconfig/gmodule-2.0.pc

Diff for: ‎glib.spec.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Version: @VERSION@
44
Release: 1
55
License: LGPL
66
Group: Development/Libraries
7-
Source: ftp://ftp.gimp.org/pub/gtk/v1.3/glib-%{version}.tar.gz
7+
Source: ftp://ftp.gimp.org/pub/gtk/v2.0/glib-%{version}.tar.gz
88
BuildRoot: /var/tmp/%{name}-%{version}-root
99
URL: http://www.gtk.org
1010

Diff for: ‎glib/.cvsignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Makefile
22
Makefile.in
3-
libglib-1.3.la
3+
libglib-2.0.la
44
makefile.mingw
55
makefile.msc
66
glib.rc

0 commit comments

Comments
 (0)