FYI: 6-gary-honour-libobj-dir.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.

  Index: ChangeLog
  from  Gary V. Vaughan  <address@hidden>
  
        * lib/autoconf/general.m4 (_AC_LIBOBJS_NORMALIZE): Prepend each
        object named in LIBOBJS and LTLIBOBJS with the ${LIBOBJDIR}, as
        set by latest automake.
  
  Index: doc/autoconf.texi
  ===================================================================
  RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
  retrieving revision 1.893
  diff -u -p -u -r1.893 autoconf.texi
  --- doc/autoconf.texi 2 May 2005 05:46:47 -0000 1.893
  +++ doc/autoconf.texi 2 May 2005 20:12:16 -0000
  @@ -4616,7 +4616,10 @@ to @samp{AC_CONFIG_LIBOBJ_DIR(lib)}.
   @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 (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), etc.
   @end defmac
   
   @sp 1
  @@ -15501,6 +15504,13 @@ cannot handle this task, since this is n
   
   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}
  Index: lib/autoconf/general.m4
  ===================================================================
  RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
  retrieving revision 1.851
  diff -u -p -u -r1.851 general.m4
  --- lib/autoconf/general.m4 20 Apr 2005 05:34:25 -0000 1.851
  +++ lib/autoconf/general.m4 2 May 2005 20:12:19 -0000
  @@ -2550,7 +2550,7 @@ m4_define([AC_LIBOBJ],
   
   # _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],
  @@ -2560,9 +2560,10 @@ for ac_i in : $LIB@&address@hidden; do test "x$a
     # 1. Remove the extension, and $U if already installed.
     ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
     ac_i=`echo "$ac_i" | sed "$ac_script"`
  -  # 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])
- -- 
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
__________________________________________________________
This patch notification generated by cvsapply version 0.15
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCdoqjFRMICSmD1gYRAseBAJ0ZqygodNgGYrHLT2SE9kKRdGkqQACdFCwk
fy19Ow0Vm2Inz1OfeuyVR2U=
=sWJC
-----END PGP SIGNATURE-----