Re: [PATCH] Support AC_CONFIG_LIBOBJ_DIR (fixes PR/401)

[Gary V. Vaughan]

Paul Eggert wrote:
> "Gary V. Vaughan" <address@hidden> writes:
>
>
>>Is that an implicit go-ahead for me to commit the Autoconf part
>>of the patch (pending changes below)?
>
>
> Could you please redo the patch according to his comments?
> The idea is fine but I would like to double-check the details.
> Thanks.

Sure.  Attached.

Cheers,
        Gary.
--
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook

--- lib/autoconf/general.m4.orig        2003-10-27 11:10:56.000000000 +0000
+++ lib/autoconf/general.m4     2005-04-25 17:56:48.000000000 +0100
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Parameterized macros.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, Free Software Foundation, Inc.
+# 2002, 2003, 2005, Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -2435,7 +2435,7 @@

 # _AC_LIBOBJS_NORMALIZE
 # ---------------------
-# Clean up LIBOBJS abd LTLIBOBJS so that they work with 1. ac_objext,
+# Clean up LIBOBJS and LTLIBOBJS so that they work with 1. ac_objext,
 # 2. Automake's ANSI2KNR, 3. Libtool, 4. combination of the three.
 # Used with AC_CONFIG_COMMANDS_PRE.
 AC_DEFUN([_AC_LIBOBJS_NORMALIZE],
@@ -2445,9 +2445,10 @@
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 AC_SUBST([LIB@&address@hidden, [$ac_libobjs])
 AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- doc/autoconf.texi.orig      2005-04-25 18:04:28.000000000 +0100
+++ doc/autoconf.texi   2005-04-25 18:18:15.000000000 +0100
@@ -4330,7 +4330,10 @@
 @command{configure} might need to know the replacement directory for the
 following reasons: (i) some checks use the replacement files, (ii) some
 macros bypass broken system headers by installing links to the
-replacement headers, etc.
+replacement headers, etc. (iii) when used in conjunction with Automake,
+within each @file{Makefile}, @var{directory} is used as a relative path
+from @code{$(top_srcdir)} to each object named in @code(LIBOBJS) and
address@hidden(LTLIBOBJS).
 @end defmac

 @sp 1
@@ -14447,6 +14450,13 @@

 Note that @code{U} must not be used in your Makefiles.

address@hidden LIBOBJDIR
+When used with Automake 1.10 or newer, a suitable value for
address@hidden is set so that the @code{LIBOBJS} and @code{LTLIBOBJS}
+can be referenced from any @file{Makefile.am}.  Even without Automake,
+arranging for @code{LIBOBJDIR} to be set correctly will enable
+referencing @code{LIBOBJS} and @code{LTLIBOBJS} in another directory.
+

 @node AC_FOO_IFELSE vs AC_TRY_FOO
 @subsection @code{AC_FOO_IFELSE} vs.@: @code{AC_TRY_FOO}

signature.asc
Description: OpenPGP digital signature