Re: [patch 11/19] 295-gary-dont-force-ac-config-headers-on-subproject-ltdl.diff Queue

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Oct 10, 2005 at 12:26:35PM CEST:
>  libltdl/m4/ltdl.m4    |   12 ++++++++----
>  tests/old-m4-iface.at |    1 -
>  2 files changed, 8 insertions(+), 5 deletions(-)
> 
> Index: libtool--devo--1.0/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: Remove workaround.

OK after prerequisites are in, and see nit below.

Cheers,
Ralf

> Index: libtool--devo--1.0/libltdl/m4/ltdl.m4
> ===================================================================
> --- libtool--devo--1.0.orig/libltdl/m4/ltdl.m4
> +++ libtool--devo--1.0/libltdl/m4/ltdl.m4
> @@ -274,10 +274,14 @@ _LTDL_MODE_DISPATCH
>  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])])])])])

Should we AC_CONFIG_HEADERS([config.h:config-h.in]) for filesystem
portability?

>  AC_SUBST([LT_CONFIG_H])
>  
>  AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
> Index: libtool--devo--1.0/tests/old-m4-iface.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/old-m4-iface.at
> +++ libtool--devo--1.0/tests/old-m4-iface.at
> @@ -182,7 +182,6 @@ foo (const char *str)
>  }
>  ]])
>  
> -touch config.h.in  # bug in current ltdl.m4
>  LT_AT_LIBTOOLIZE([--ltdl --install])
>  LT_AT_ACLOCAL([-I libltdl/m4])
>  LT_AT_AUTOCONF([--force])
>