Re: gnulib-tool changes

[Simon Josefsson]

Bruno Haible <address@hidden> writes:

> Simon Josefsson wrote:
>> Yup, I'm using two configure.ac's in gsasl, but I don't want to change
>> gnutls to use the same scheme for only this reason.  And with your
>> work, I don't have to.
>
> OK, can you try it? The essential changes are already in CVS.

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, using the defaults set in configure.ac.  Is this
not supported 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$

But --help says:

      --lib=LIBRARY         Specify the library name.  Defaults to 'libgnu'.

It should default to 'libgnu', I think.  Anyway, I used this:

address@hidden:~/src/gnutls$ gnulib-tool --import --macro-prefix=lgl 
--source-base=lgl --m4-base=lgl/m4 --lib=liblgl memmem
Module list with included dependencies:
  memmem
File list:
  lib/memmem.c
  lib/memmem.h
  m4/memmem.m4
  m4/onceonly_2_57.m4
Copying file lgl/memmem.c
Copying file lgl/memmem.h
Copying file lgl/m4/memmem.m4
Copying file lgl/m4/onceonly_2_57.m4
Copying file lgl/m4/gnulib-tool.m4
Creating lgl/Makefile.am
Creating lgl/m4/gnulib-cache.m4
Creating lgl/m4/gnulib-comp.m4
Finished.

You may need to add #include directives for the following .h files.
  #include "memmem.h"

Don't forget to
  - add "lgl/Makefile" to AC_CONFIG_FILES in ./configure.in,
  - mention "lgl" in SUBDIRS in Makefile.am,
  - mention "-I lgl/m4" in ACLOCAL_AMFLAGS in Makefile.am,
  - invoke lgl_EARLY in ./configure.in, right after AC_PROG_CC,
  - invoke lgl_INIT in ./configure.in.
address@hidden:~/src/gnutls$

Looks fairly good!  Continuing:

address@hidden:~/src/gnutls$ ls -lR lgl/
lgl/:
total 16
drwxr-xr-x  2 jas jas 4096 2005-09-01 13:39 m4
-rw-r--r--  1 jas jas  962 2005-09-01 13:39 Makefile.am
lrwxrwxrwx  1 jas jas   41 2005-09-01 13:39 memmem.c -> 
/usr/local/bin/../src/gnulib/lib/memmem.c
-rw-r--r--  1 jas jas 1885 2005-09-01 13:39 memmem.c.tmp
lrwxrwxrwx  1 jas jas   41 2005-09-01 13:39 memmem.h -> 
/usr/local/bin/../src/gnulib/lib/memmem.h
-rw-r--r--  1 jas jas 1065 2005-09-01 13:39 memmem.h.tmp

lgl/m4:
total 20
-rw-r--r--  1 jas jas 1078 2005-09-01 13:39 gnulib-cache.m4
-rw-r--r--  1 jas jas 1361 2005-09-01 13:39 gnulib-comp.m4
lrwxrwxrwx  1 jas jas   46 2005-09-01 13:39 gnulib-tool.m4 -> 
/usr/local/bin/../src/gnulib/m4/gnulib-tool.m4
-rw-r--r--  1 jas jas  917 2005-09-01 13:39 gnulib-tool.m4.tmp
lrwxrwxrwx  1 jas jas   41 2005-09-01 13:39 memmem.m4 -> 
/usr/local/bin/../src/gnulib/m4/memmem.m4
-rw-r--r--  1 jas jas  542 2005-09-01 13:39 memmem.m4.tmp
lrwxrwxrwx  1 jas jas   48 2005-09-01 13:39 onceonly_2_57.m4 -> 
/usr/local/bin/../src/gnulib/m4/onceonly_2_57.m4
-rw-r--r--  1 jas jas 3585 2005-09-01 13:39 onceonly_2_57.m4.tmp
address@hidden:~/src/gnutls$

What are these *.tmp files?

Then it collides with my existing gnulib stuff:

address@hidden:~/src/gnutls$ ./buildconf
+ gtkdocize
+ autoreconf --force --install
/usr/share/aclocal/xdelta.m4:7: warning: underquoted definition of 
AM_PATH_XDELTA
  run info '(automake)Extending aclocal'
  or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
/usr/share/aclocal/oaf.m4:4: warning: underquoted definition of AM_PATH_OAF
/usr/share/aclocal/libart.m4:11: warning: underquoted definition of 
AM_PATH_LIBART
/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
/usr/share/aclocal/gconf-1.m4:4: warning: underquoted definition of 
AM_PATH_GCONF
/usr/share/aclocal/gconf-1.m4:71: warning: underquoted definition of 
AM_GCONF_SOURCE
/usr/share/aclocal/xdelta.m4:7: warning: underquoted definition of 
AM_PATH_XDELTA
  run info '(automake)Extending aclocal'
  or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
/usr/share/aclocal/oaf.m4:4: warning: underquoted definition of AM_PATH_OAF
/usr/share/aclocal/libart.m4:11: warning: underquoted definition of 
AM_PATH_LIBART
/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
/usr/share/aclocal/gconf-1.m4:4: warning: underquoted definition of 
AM_PATH_GCONF
/usr/share/aclocal/gconf-1.m4:71: warning: underquoted definition of 
AM_GCONF_SOURCE
lgl/Makefile.am:18: required file `lgl/readline.c' not found
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
Makefile.am: installing `./INSTALL'
autoreconf: automake failed with exit status: 1

I'll try to use your new stuff for the old gl/ library too.

Thanks,
Simon