FYI: don't force ac_config_headers on subproject ltdl [295]

[Gary V. Vaughan]

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

Applied to HEAD.

  * looking for address@hidden/libtool--devo--1.0--patch-359 to compare with
  * comparing to address@hidden/libtool--devo--1.0--patch-359
  M  libltdl/m4/ltdl.m4
  M  tests/old-m4-iface.at
  M  ChangeLog
  M  tests/subproject.at
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
        * libltdl/m4/ltdl.m4 (LTDL_INIT): Don't force running
        AC_CONFIG_HEADERS for subproject ltdl.
        * tests/old-m4-iface.at, tests/subproject.at: Remove workaround.
  
  2005-11-07  Gary V. Vaughan  <address@hidden>
  
  --- orig/libltdl/m4/ltdl.m4
  +++ mod/libltdl/m4/ltdl.m4
  @@ -280,10 +280,14 @@
   AC_CONFIG_COMMANDS_PRE([dnl
   m4_pattern_allow([^LT_CONFIG_H$])dnl
   m4_ifset([AH_HEADER],
  -      [LT_CONFIG_H=AH_HEADER],
  -      [m4_ifset([AC_LIST_HEADERS],
  -                [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[      
]]*,,;s,[[ :]].*$,,'`],
  -                [LT_CONFIG_H=config.h;AC_CONFIG_HEADERS([config.h])])])])
  +    [LT_CONFIG_H=AH_HEADER],
  +    [m4_ifset([AC_LIST_HEADERS],
  +         [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[      ]]*,,;s,[[ 
:]].*$,,'`],
  +     [LT_CONFIG_H=config.h
  +     dnl subproject mode libltdl has its own config.h...
  +     m4_if(_LTDL_MODE, [subproject],
  +             [],
  +         [AC_CONFIG_HEADERS([config.h:config-h.in])])])])])
   AC_SUBST([LT_CONFIG_H])
   
   AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
  
  
  --- orig/tests/old-m4-iface.at
  +++ mod/tests/old-m4-iface.at
  @@ -182,7 +182,6 @@
   }
   ]])
   
  -touch config.h.in  # bug in current ltdl.m4
   LT_AT_LIBTOOLIZE([--ltdl --install])
   LT_AT_ACLOCAL([-I libltdl/m4])
   LT_AT_AUTOCONF([--force])
  
  
  --- orig/tests/subproject.at
  +++ mod/tests/subproject.at
  @@ -42,8 +42,6 @@
   ]])
   
   echo 'static int dummy = 0;' > foo.c
  -
  -touch config.h.in
   ])# _LTDL_SETUP
   
   ## ------------------------ ##
  @@ -97,11 +95,12 @@
   prefix=`pwd`/_inst
   
   _LTDL_SETUP
  -touch config.h.in
  +
   LT_AT_LIBTOOLIZE([--copy --ltdl])
   LT_AT_ACLOCAL([-I sub/ltdl/m4])
   LT_AT_AUTOMAKE([--add-missing --copy])
   LT_AT_AUTOCONF
  +
   LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
   LT_AT_MAKE([all install])
   
  
  
  
- -- 
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 tlaapply version 1.0
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFDb0vrFRMICSmD1gYRAmPoAJ9FJ1iUY8TgGhuQMhbi6l9ijvHPPwCghhOE
HhFy+cEmQy+2u7jB5VmEPY8=
=/Ivy
-----END PGP SIGNATURE-----