Permalink
Browse files

Default to --disable-gtk-doc, to avoid Jade setup hassles.

Sun Mar  3 21:09:24 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.
  • Loading branch information...
1 parent f797702 commit fc8fd6f8cb01ac93933d372e8056765de04092ae Owen Taylor committed with Owen Taylor Mar 5, 2002
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -1,3 +1,22 @@
+Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <timj@gtk.org>
* glib/gscanner.h (_GScannerConfig): added padding.
View
@@ -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
View
@@ -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"
View
2 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.
View
@@ -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."
View
@@ -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
@@ -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
View
@@ -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
View
@@ -12,10 +12,10 @@ rm $ZIP
zip -r $ZIP -@ <<EOF
COPYING.LIB-2
bin/gspawn-win32-helper.exe
-lib/libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll
+lib/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
EOF
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
@@ -27,14 +27,14 @@ bin/glib-gettextize
bin/glib-mkenums
bin/gobject-query.exe
include/glib-2.0
-lib/libglib-1.3.dll.a
-lib/glib-1.3.lib
-lib/libgmodule-1.3.dll.a
-lib/gmodule-1.3.lib
-lib/libgobject-1.3.dll.a
-lib/gobject-1.3.lib
-lib/libgthread-1.3.dll.a
-lib/gthread-1.3.lib
+lib/libglib-2.0.dll.a
+lib/glib-2.0.lib
+lib/libgmodule-2.0.dll.a
+lib/gmodule-2.0.lib
+lib/libgobject-2.0.dll.a
+lib/gobject-2.0.lib
+lib/libgthread-2.0.dll.a
+lib/gthread-2.0.lib
lib/glib-2.0
lib/pkgconfig/glib-2.0.pc
lib/pkgconfig/gmodule-2.0.pc
View
@@ -4,7 +4,7 @@ Version: @VERSION@
Release: 1
License: LGPL
Group: Development/Libraries
-Source: ftp://ftp.gimp.org/pub/gtk/v1.3/glib-%{version}.tar.gz
+Source: ftp://ftp.gimp.org/pub/gtk/v2.0/glib-%{version}.tar.gz
BuildRoot: /var/tmp/%{name}-%{version}-root
URL: http://www.gtk.org
View
@@ -1,6 +1,6 @@
Makefile
Makefile.in
-libglib-1.3.la
+libglib-2.0.la
makefile.mingw
makefile.msc
glib.rc
Oops, something went wrong.

0 comments on commit fc8fd6f

Please sign in to comment.