Created attachment 15310 [details] [review]
gtk-automake17.patch (rev 1)

It looks like autogen.sh still points you at automake 1.4 if 1.7 isn't
found

Oops.  I will fix that (won't bother uploading a new patch for it though)

Basically, looks good to commit; few comments:

* The usage of shell variables vs. m4 defines in configure.in  
  seems a bit random at times. For instance, GLIB_REQUIRED_VERSION
  seems to have been about half replaced with a m4 define,
  but a shell variable is still defined and used in some places.

  Is there some reason for this?

* In the extreme pickiness department, I think 

foo =         \
  blah-blah.c \
  blah-blah.h \
  aaa.c      

Is nicer than

foo = \
  blah-blah.c \
  blah.blah.h \
  aaa.c

  (Hate to mention it considering the number of places that
  occurs, but perhaps easier to get it right now than go
  back and change later.)
 
* Noted while reading the patch - the comment:

#
 # Note: files added here may need to be be propagated to gdk_headers
in gtk/Makefile.am
 #
  
  in gdk/Makefile.am is way obsolete and should be removed.

* Hmm:

+DISTCLEANFILES = gdkconfig.h
+MAINTAINERCLEANFILES += stamp-gc-h

  Why is stamp-gc-h in MAINTAINERCLEANFILES it doesn't
  seem to require special tools to build to me...? And I thought
  that autoconf already tried to avoid updating timestamps
  on config.h when it didn't change. is gdkconfig.h differnet?

* Don't BUILT_SOURCES get built before automake recurses?
  If so, is the:

 ###########################################
 # Hack to get gdkenumtypes.h built first
 ###########################################
  
  Stuff in the gdk/ subdirs needed any more?

* In gtk/Makefile.am, perhaps LIBTOOL_OPTS/LIBADD
  should be libtool_opts/libadd? There is, to some extent, a 
  convention in our Makefiles to use lowercase for local 
  variables, and leave uppercase for standard variable
  names.

* gtk.immodules should be in CLEANFILES not DISTCLEANFILES
suggestsuggest

if the "extreme pickiness department" commment about backslash
positioning is holding this up, just forget about it. I'm
worried that we'll start getting conflicts if we don't get
this in soon.

Tue May  6 16:50:52 2003  Owen Taylor  <otaylor@redhat.com>
 
        Patch from James Henstridge to update to automake-1.7
        (#109542)
  
        * autogen.sh: update to call newer tools.
  
        * configure.in: various updates, to use M4 macros to put
        variables that change each release at the top.
        Use AC_HELP_STRING to format help strings.
        Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
  
        * Makefile.am: require Automake 1.7.  Remove gdk-2.0.pc and
        gtk+-2.0.pc on uninstall.  Pass --enable-gtk-doc to configure
        during distcheck.
  
        * docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
        makefile fragment.
  
        * */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
        Use BUILT_SOURCES where appropriate.
        Build generated files in builddir rather than srcdir.
        Fix uninstall and distclean targets to satisfy distcheck.
 
        ===
 
        * gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
        built first, since we are now using BUILT_SOURCES.
 
        * gdk/Makefile.am: Remove an outdated comment about gdk_headers.
 
        * demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
        with geninclude.pl.
 
        * configure.in: Update versions to 2.3.0.