On Tue, Aug 06, 2002 at 02:11:58PM -0500, Karl Fogel wrote:
> Hmmm.
>
> This means maintaining the release number in two places, because it's
> already deduced at build time from subversion/include/svn_version.h.
>
> Is there another way to do this, such that we can avoid the "two
> masters" problem?
>
I've changed the AC_INIT call to one without arguements, rebuilt
configure, and reconfigured a build, which is running now (and I
expect will finish without problems). Calling this macro without
arguments doesn't appear to cause a problem here, and it avoids
the version problem you mention.
> Also, can you write a log message, the way you'd want to read about it
> in a commit message? (See the HACKING file for more on log messages.)
>
> >From reading your paragraph, and the patch, I _sort_ of understand
> what's going on, but not quite -- it seems you haven't just changed
> the way we call AC_INIT and AC_OUTPUT (as your paragraph implies), but
> also added new calls to macros that were not called before. A
> complete log message might clear this up.
>
The extra macros are needed to DTRT if the AC_INIT/AC_OUTPUT macros
are changed to the new formats. Log message and modified patch
below.
Art
* configure.in
Replaced old style AC_INIT and AC_OUTPUT macros with
autoconf-2.5X style calls, and added AC_CONFIG_SRCDIR,
AC_CONFIG_FILES, and AC_CONFIG_COMMANDS macros in
concert with the above changes.
Index: ./configure.in
===================================================================
--- ./configure.in
+++ ./configure.in 2002-08-06 14:38:31.000000000 -0500
@@ -8,8 +8,9 @@
dnl Don't even think about removing this check!
AC_PREREQ(2.50)
-dnl First line is *required*; sanity-checks that the our src dir exists.
-AC_INIT(subversion/include/svn_types.h)
+dnl AC_CONFIG_SRCDIR *required*; sanity-checks that the our src dir exists.
+AC_INIT
+AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
AC_CONFIG_AUX_DIR(ac-helpers)
abs_srcdir="`cd $srcdir && pwd`"
@@ -409,7 +410,10 @@
dnl Final step: create the Makefile ----------------------------
-AC_OUTPUT([Makefile svn-config], [chmod +x svn-config])
+AC_CONFIG_FILES([Makefile svn-config])
+AC_CONFIG_COMMANDS([default], [chmod +x svn-config])
+
+AC_OUTPUT
dnl Create all of the build directories
--
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 6 21:52:33 2002