Re: gnulib-tool changes

[Bruno Haible]

Simon Josefsson wrote:
> I'll use GnuTLS as the test subject for this.  First impressions:
>
> address@hidden:~/src/gnutls$ gnulib-tool --import
> gnulib-tool: *** missing --source-base option
> gnulib-tool: *** Stop.
> address@hidden:~/src/gnutls$
>
> That used to work

Fixed now.

> Then I tried to create a lgl/ directory with the gnulib files used by
> the library:
>
> address@hidden:~/src/gnutls$ gnulib-tool --import --macro-prefix=lgl
> --source-base=lgl --m4-base=lgl/m4 memmem gnulib-tool: *** missing --lib
> option
> gnulib-tool: *** Stop.
> address@hidden:~/src/gnutls$
>
> It should default to 'libgnu'

Yes. Fixed now as well.

> What are these *.tmp files?

The contain the contents of the file to install. Forgot to remove them.
Now also fixed.

> lgl/Makefile.am:18: required file `lgl/memmove.c' not found
> lgl/Makefile.am:18: required file `lgl/getdelim.c' not found
> lgl/Makefile.am:18: required file `lgl/error.c' not found
> lgl/Makefile.am:18: required file `lgl/error.h' not found
> lgl/Makefile.am:18: required file `lgl/vasnprintf.c' not found
> lgl/Makefile.am:18: required file `lgl/getdelim.h' not found
> lgl/Makefile.am:18: required file `lgl/readline.h' not found
> lgl/Makefile.am:18: required file `lgl/printf-args.c' not found
> lgl/Makefile.am:18: required file `lgl/printf-parse.c' not found
> lgl/Makefile.am:18: required file `lgl/asnprintf.c' not found
> lgl/Makefile.am:18: required file `lgl/getpass.c' not found
> lgl/Makefile.am:18: required file `lgl/getline.h' not found
> lgl/Makefile.am:18: required file `lgl/getline.c' not found
> lgl/Makefile.am:18: required file `lgl/getpass.h' not found
> lgl/Makefile.am:18: required file `lgl/snprintf.c' not found

This appears to be unrelated. You asked for the module 'memmem', and
you got no error about 'memmem'.

The trick to overcome these errors from 'automake' in general is to use
a construct like this: (replace "cook" with the name of the subdirectory).


dnl Like AC_LIBOBJ, except that the module name goes into COOKOBJS
dnl instead of into LIBOBJS.
AC_DEFUN([gt_COOK_OBJ],
  [COOKOBJS="$COOKOBJS $1.$ac_objext"])

dnl Like AC_REPLACE_FUNCS, except that the module name goes into COOKOBJS
dnl instead of into LIBOBJS.
AC_DEFUN([gt_COOK_REPLACE_FUNCS],
  [AC_CHECK_FUNCS([$1], , [gt_COOK_OBJ($ac_func)])])

dnl Like AC_LIBSOURCES, except that it does nothing. This is needed to
dnl silence automake errors "required file `lib/error.h' not found" and
dnl "required file `lib/error.c' not found" that are triggered by the
dnl AC_LIBSOURCES invocation inside AC_FUNC_ERROR_AT_LINE.
AC_DEFUN([gt_COOK_SOURCES], [])

dnl Checks for the cook directory.
m4_pushdef([AC_LIBOBJ], m4_defn([gt_COOK_OBJ]))
m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gt_COOK_REPLACE_FUNCS]))
m4_pushdef([AC_LIBSOURCES], m4_defn([gt_COOK_SOURCES]))
gl_ERROR
gl_GETOPT
AC_REPLACE_FUNCS([stpcpy])
m4_popdef([AC_LIBSOURCES])
m4_popdef([AC_REPLACE_FUNCS])
m4_popdef([AC_LIBOBJ])
AC_SUBST([COOKOBJS])


Bruno