Re: [patch 13/19] 297-gary-LT_WITH_LTDL-recursive.diff Queue

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Oct 10, 2005 at 12:26:37PM CEST:
>  libltdl/m4/ltdl.m4 |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletion(-)
> 
> Index: libtool--devo--1.0/ChangeLog
> from  Gary V. Vaughan  <address@hidden>
>       Support 'recursive' mode for building libltdl: Automake will
>       recursively descend into the libltdl directory, and use libltdl's
>       Makefile.am code to build libltdl:
>       * ltdl.m4 (LT_CONFIG_LTDL_DIR): Don't barf on 'recursive' mode
>       for 2nd argument.
>       (_LTDL_MODE_DISPATCH): Handle recursive mode.

OK after prerequisites.

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
> @@ -34,7 +34,7 @@ m4_popdef([_ARG_DIR])
>  dnl If not otherwise defined, default to the 1.5.x compatible subproject 
> mode:
>  m4_if(_LTDL_MODE, [],
>       [m4_define([_LTDL_MODE], m4_default([$2], [subproject]))
> -     m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|nonrecursive\)])],
> +     m4_if([-1], [m4_bregexp(_LTDL_MODE, 
> [\(subproject\|\(non\)?recursive\)])],
>               [AC_MSG_ERROR([unknown libltdl mode: ]_LTDL_MODE)])])
>  ])# LT_CONFIG_LTDL_DIR
>  
> @@ -141,6 +141,7 @@ m4_if(_LTDL_DIR, [],
>         [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR)
>                         _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])],
>         [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])],
> +       [recursive], [],
>       [AC_MSG_ERROR([unknown libltdl mode: ]_LTDL_MODE)])])dnl
>  dnl Be careful not to expand twice:
>  m4_define([$0], [])