Re: [bug-gnulib] Re: Separate csharpcomp.sh, and a license problem

[Bruno Haible]

Simon Josefsson wrote on 2005-12-06:
> >> Shouldn't csharpcomp-script and javacomp-script also invoke
> >> AC_CONFIG_FILES on the scripts?  I need to do that manually now, and
> >> gnulib-tool didn't tell me about it.
> >>
> >> I can't come up with a simple patch -- the AC_CONFIG_FILES statement
> >> would have to include the directory somehow.
> >
> > You can probably assume that the .sh.in file is in the build-aux dir,
> > i.e. in $top_srcdir/$ac_aux_dir, and that the .sh file will be put into
> > the $top_builddir. Like for libtool for example. This should
> > simplify things.
> 
> This doesn't hold for csharpcomp.sh.in, does it?  It is in lib/.

I'm moving it to build-aux.

> >> Should we add another line in the modules-file, i.e.:
> >>
> >> Config-files:
> >> lib/csharpcomp.sh
> >
> > I don't think this is needed.
> 
> Generating the AC_CONFIG_FILES statements like a good thing.  How
> could that be achieved without a Config-files: statement?

A line in the 'configure.ac:' section is sufficient:
  AC_CONFIG_FILES([csharpcomp.sh:build-aux/csharpcomp.sh.in])

Bruno


2006-01-09  Bruno Haible  <address@hidden>

        * build-aux/javacomp.sh.in: New file, moved from lib/.
        * modules/javacomp-script (Files): Update.
        (configure.ac): Add AC_CONFIG_FILES invocation.
        (EXTRA_DIST): Remove variable.

        * build-aux/javaexec.sh.in: New file, moved from lib/.
        * modules/javaexec (Files): Update.
        (configure.ac): Add AC_CONFIG_FILES invocation.
        (EXTRA_DIST): Remove javaexec.sh.in.

        * build-aux/csharpcomp.sh.in: New file, moved from lib/.
        * modules/csharpcomp-script (Files): Update.
        (configure.ac): Add AC_CONFIG_FILES invocation.
        (EXTRA_DIST): Remove variable.

        * build-aux/csharpexec.sh.in: New file, moved from lib/.
        * modules/csharpexec (Files): Update.
        (configure.ac): Add AC_CONFIG_FILES invocation.
        (EXTRA_DIST): Remove csharpexec.sh.in.

diff -c -3 -r1.1 javacomp-script
*** modules/javacomp-script     2 Dec 2005 13:36:42 -0000       1.1
--- modules/javacomp-script     9 Jan 2006 13:43:07 -0000
***************
*** 2,17 ****
  Script to compile a Java program.
  
  Files:
! lib/javacomp.sh.in
  m4/javacomp.m4
  
  Depends-on:
  
  configure.ac:
  gt_JAVACOMP
  
  Makefile.am:
- EXTRA_DIST += javacomp.sh.in
  
  License:
  GPLed build tool
--- 2,17 ----
  Script to compile a Java program.
  
  Files:
! build-aux/javacomp.sh.in
  m4/javacomp.m4
  
  Depends-on:
  
  configure.ac:
  gt_JAVACOMP
+ AC_CONFIG_FILES([javacomp.sh:build-aux/javacomp.sh.in])
  
  Makefile.am:
  
  License:
  GPLed build tool
diff -c -3 -r1.2 javaexec
*** modules/javaexec    6 Jul 2005 15:58:47 -0000       1.2
--- modules/javaexec    9 Jan 2006 13:43:07 -0000
***************
*** 2,10 ****
  Execute a Java program.
  
  Files:
  lib/javaexec.h
  lib/javaexec.c
- lib/javaexec.sh.in
  m4/javaexec.m4
  
  Depends-on:
--- 2,10 ----
  Execute a Java program.
  
  Files:
+ build-aux/javaexec.sh.in
  lib/javaexec.h
  lib/javaexec.c
  m4/javaexec.m4
  
  Depends-on:
***************
*** 21,31 ****
  
  configure.ac:
  gt_JAVAEXEC
  
  Makefile.am:
  DEFS += -DEXEEXT=\"$(EXEEXT)\"
  lib_SOURCES += javaexec.h javaexec.c
- EXTRA_DIST += javaexec.sh.in
  
  Include:
  "javaexec.h"
--- 21,31 ----
  
  configure.ac:
  gt_JAVAEXEC
+ AC_CONFIG_FILES([javaexec.sh:build-aux/javaexec.sh.in])
  
  Makefile.am:
  DEFS += -DEXEEXT=\"$(EXEEXT)\"
  lib_SOURCES += javaexec.h javaexec.c
  
  Include:
  "javaexec.h"
diff -c -3 -r1.1 csharpcomp-script
*** modules/csharpcomp-script   2 Dec 2005 13:36:59 -0000       1.1
--- modules/csharpcomp-script   9 Jan 2006 13:43:07 -0000
***************
*** 2,8 ****
  Script to compile a C# program.
  
  Files:
! lib/csharpcomp.sh.in
  m4/csharpcomp.m4
  m4/csharp.m4
  
--- 2,8 ----
  Script to compile a C# program.
  
  Files:
! build-aux/csharpcomp.sh.in
  m4/csharpcomp.m4
  m4/csharp.m4
  
***************
*** 10,18 ****
  
  configure.ac:
  gt_CSHARPCOMP
  
  Makefile.am:
- EXTRA_DIST += csharpcomp.sh.in
  
  License:
  GPLed build tool
--- 10,18 ----
  
  configure.ac:
  gt_CSHARPCOMP
+ AC_CONFIG_FILES([csharpcomp.sh:build-aux/csharpcomp.sh.in])
  
  Makefile.am:
  
  License:
  GPLed build tool
diff -c -3 -r1.4 csharpexec
*** modules/csharpexec  6 Jul 2005 15:58:47 -0000       1.4
--- modules/csharpexec  9 Jan 2006 13:43:07 -0000
***************
*** 2,10 ****
  Execute a C# program.
  
  Files:
  lib/csharpexec.h
  lib/csharpexec.c
- lib/csharpexec.sh.in
  lib/classpath.h
  lib/classpath.c
  m4/csharpexec.m4
--- 2,10 ----
  Execute a C# program.
  
  Files:
+ build-aux/csharpexec.sh.in
  lib/csharpexec.h
  lib/csharpexec.c
  lib/classpath.h
  lib/classpath.c
  m4/csharpexec.m4
***************
*** 22,32 ****
  
  configure.ac:
  gt_CSHARPEXEC
  
  Makefile.am:
  DEFS += -DEXEEXT=\"$(EXEEXT)\"
  lib_SOURCES += csharpexec.h csharpexec.c
! EXTRA_DIST += csharpexec.sh.in classpath.h classpath.c
  
  Include:
  "csharpexec.h"
--- 22,33 ----
  
  configure.ac:
  gt_CSHARPEXEC
+ AC_CONFIG_FILES([csharpexec.sh:build-aux/csharpexec.sh.in])
  
  Makefile.am:
  DEFS += -DEXEEXT=\"$(EXEEXT)\"
  lib_SOURCES += csharpexec.h csharpexec.c
! EXTRA_DIST += classpath.h classpath.c
  
  Include:
  "csharpexec.h"