Re: 282-gary-libtoolize-copy-ltdl-m4-properly.diff

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Thu, Sep 29, 2005 at 05:56:13PM CEST:
> Okay to commit?

Yes, with the nit below addressed:

Thanks,
Ralf

> from  Gary V. Vaughan  <address@hidden>
>       * tests/libtoolize.at: Add a new test to catch a regression I
>       almost introduced with respect to copying macro files when
>       AC_CONFIG_MACRO_DIR is shared with libltdl subproject.
> 
> Index: libtool--devo--1.0/tests/libtoolize.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/libtoolize.at
> +++ libtool--devo--1.0/tests/libtoolize.at
> @@ -278,5 +278,70 @@ libtoolize: `m4/ltversion.m4' is already
>  
>  LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout)
>  
> +AT_CLEANUP
> +
> +## ---------------------------- ##
> +## Make sure ltdl.m4 is copied. ##
> +## ---------------------------- ##
> +
> +AT_SETUP([copy ltdl.m4 with shared macro directory])
> +
> +AT_DATA([configure.ac],
> +[[AC_INIT([libtoolize-demo], []]AT_PACKAGE_VERSION[[], 
> []]AT_PACKAGE_BUGREPORT[[])

This causes output to be this:
AC_INIT([libtoolize-demo], []2.1a[], address@hidden)

You can just use 
+[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)

instead, and you could also adjust the other occurrences of this in the
same source file.  :)

> +LT_CONFIG_LTDL_DIR([ltdl])
> +AC_CONFIG_AUX_DIR([ltdl/config])
> +AC_CONFIG_MACRO_DIR([ltdl/m4])
> +LT_INIT
> +LT_WITH_LTDL
> +AC_OUTPUT
> +]])
> +
> +AT_DATA(expout,
> +[[libtoolize: linking file `ltdl/COPYING.LIB'
> +libtoolize: linking file `ltdl/README'
> +libtoolize: linking file `ltdl/Makefile.am'
> +libtoolize: linking file `ltdl/configure.ac'
> +libtoolize: linking file `ltdl/aclocal.m4'
> +libtoolize: linking file `ltdl/Makefile.in'
> +libtoolize: linking file `ltdl/config-h.in'
> +libtoolize: linking file `ltdl/configure'
> +libtoolize: linking file `ltdl/argz_.h'
> +libtoolize: linking file `ltdl/argz.c'
> +libtoolize: linking file `ltdl/loaders/dld_link.c'
> +libtoolize: linking file `ltdl/loaders/dlopen.c'
> +libtoolize: linking file `ltdl/loaders/dyld.c'
> +libtoolize: linking file `ltdl/loaders/load_add_on.c'
> +libtoolize: linking file `ltdl/loaders/loadlibrary.c'
> +libtoolize: linking file `ltdl/loaders/shl_load.c'
> +libtoolize: linking file `ltdl/lt__dirent.c'
> +libtoolize: linking file `ltdl/lt__strl.c'
> +libtoolize: linking file `ltdl/libltdl/lt__alloc.h'
> +libtoolize: linking file `ltdl/libltdl/lt__dirent.h'
> +libtoolize: linking file `ltdl/libltdl/lt__glibc.h'
> +libtoolize: linking file `ltdl/libltdl/lt__private.h'
> +libtoolize: linking file `ltdl/libltdl/lt__strl.h'
> +libtoolize: linking file `ltdl/libltdl/lt_dlloader.h'
> +libtoolize: linking file `ltdl/libltdl/lt_error.h'
> +libtoolize: linking file `ltdl/libltdl/lt_system.h'
> +libtoolize: linking file `ltdl/libltdl/slist.h'
> +libtoolize: linking file `ltdl/loaders/preopen.c'
> +libtoolize: linking file `ltdl/lt__alloc.c'
> +libtoolize: linking file `ltdl/lt_dlloader.c'
> +libtoolize: linking file `ltdl/lt_error.c'
> +libtoolize: linking file `ltdl/ltdl.c'
> +libtoolize: linking file `ltdl/ltdl.h'
> +libtoolize: linking file `ltdl/slist.c'
> +libtoolize: putting files in AC_CONFIG_AUX_DIR, `ltdl/config'.
> +libtoolize: linking file `ltdl/config/ltmain.sh'
> +libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
> +libtoolize: linking file `ltdl/m4/libtool.m4'
> +libtoolize: linking file `ltdl/m4/ltdl.m4'
> +libtoolize: linking file `ltdl/m4/argz.m4'
> +libtoolize: linking file `ltdl/m4/ltoptions.m4'
> +libtoolize: linking file `ltdl/m4/ltsugar.m4'
> +libtoolize: linking file `ltdl/m4/ltversion.m4'
> +]])
> +
> +LT_AT_CHECK_LIBTOOLIZE([--ltdl], 0, expout)
>  
>  AT_CLEANUP