[PATCH] trivial patch for configure.in



Hi.

Here are a few trivial changes for the configure.in file in
the latest gnumeric.

1) When using the autoconf-2.5X AC_INIT macro with 3 arguments,
   automake can pick up the package and version from arguments
   1 and 2. It doesn't need them specified as arguments to itself.
   I'm using automake-1.6c, and I believe this change is still
   valid for automake-1.5. Earlier versions I can't say, but I
   don't believe they work well with autoconf-2.5X, so I think
   this change is alright.

2) New automakes want AM_INIT_AUTOMAKE to occur before any other
   automake macros are used, such as AM_CONFIG_HEADER. Simply move
   the call to after AM_INIT_AUTOMAKE.

3) Autoconf-2.5X modified the AC_OUTPUT macro. Previously it listed
   the files that autoconf should configure, but now that's handled
   by AC_CONFIG_FILES. AC_OUTPUT should be the final macro call in
   the template, and not called with any arguments.

4) src/Makefile was listed twice in the list of files to configure.

I've just downloaded the development branch of gnumeric to build,
and these things popped out to me. Maybe more patches to come later,
such as adding AC_HELP_STRING macros, extra quoting in configure.in,
etc.

Art Haas

Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnumeric/configure.in,v
retrieving revision 1.474
diff -u -r1.474 configure.in
--- configure.in        13 Aug 2002 16:53:18 -0000      1.474
+++ configure.in        14 Aug 2002 19:23:25 -0000
@@ -4,9 +4,9 @@
        http://bugzilla.gnome.org/enter_bug.cgi?product=gnumeric)
 
 AC_CONFIG_SRCDIR(src/sheet.h)
-AM_CONFIG_HEADER(gnumeric-config.h)
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(gnumeric-config.h)
 
 AM_MAINTAINER_MODE
 
@@ -639,14 +639,13 @@
 dnl = End tests for jw
 dnl ====================================
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 gnumeric.spec
 GNOME_Gnumeric.server.in
 Makefile
 src/Makefile
 icons/Makefile
 idl/Makefile
-src/Makefile
 src/dialogs/Makefile
 src/pixmaps/Makefile
 src/widgets/Makefile
@@ -716,6 +715,7 @@
 templates/autoformat/Makefile
 stamp.h
 ])
+AC_OUTPUT
 
 
 echo "
-- 
They that can give up essential liberty to obtain a little temporary
safety deserve neither liberty nor safety.
 -- Benjamin Franklin, Historical Review of Pennsylvania, 1759



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]