Re: [gnutls-dev] [PATCH] Detect GAA and fix out-of-source-tree builds

[Ludovic Courtès]

Hi!

(and best wishes!)

Simon Josefsson <address@hidden> writes:

> Hi!  Thanks for the patches.  GAA shouldn't be required to build
> GnuTLS, so bombing out with an error seems wrong.  The generated files
> are distributed with GnuTLS.  Maybe you could modify that patch to use
> AC_MSG_WARN and to suggest that GAA is only needed if the user wishes
> to modify the source code of the command line description files?

The patch below should do the trick.

Thanks!

Ludovic.


ChangeLog entry:

        * configure.in: Look for `gaa', issuing a warning with the URL
        if not found.
        * src/Makefile.am (*-gaa.c): Use `$(GAA)' instead of `gaa'.
        Mark `.gaa' files as being in `$(srcdir)', thereby allowing for
        out-of-source-tree builds.

--- orig/configure.in
+++ mod/configure.in
@@ -96,6 +96,14 @@
 AC_PROG_CXX
 AC_PROG_LN_S
 GTK_DOC_CHECK(1.1)
+AC_PATH_PROG([GAA], [gaa])
+if test "x$GAA" = "x"; then
+   AC_MSG_WARN([[***
+*** GAA was not found.  It is only needed if you wish to modify
+*** the source code or command-line description files.  In this case,
+*** you may want to get it from http://gaa.sourceforge.net/
+***]])
+fi
 
 AC_MSG_RESULT([***
 *** Detecting compiler options...
@@ -617,7 +625,7 @@
        doc/Makefile doc/examples/Makefile doc/scripts/Makefile \
        doc/manpages/Makefile doc/reference/Makefile \
        gl/Makefile lgl/Makefile \
-       tests/Makefile tests/rsa-md5-collision/Makefile tests/userid/Makefile \
+       tests/Makefile tests/rsa-md5-collision/Makefile \
        tests/pkcs1-padding/Makefile tests/pkcs8-decode/Makefile \
        tests/pkcs12-decode/Makefile \
        includes/Makefile includes/gnutls/gnutls.h \

--- orig/src/Makefile.am
+++ mod/src/Makefile.am
@@ -78,16 +78,16 @@
 
 
 
-psk-gaa.c: psk.gaa
-       -gaa psk.gaa -o psk-gaa.c -i psk-gaa.h
-crypt-gaa.c: crypt.gaa
-       -gaa crypt.gaa -o crypt-gaa.c -i crypt-gaa.h
-certtool-gaa.c: certtool.gaa
-       -gaa certtool.gaa -o certtool-gaa.c -i certtool-gaa.h
-cli-gaa.c: cli.gaa
-       -gaa cli.gaa -o cli-gaa.c -i cli-gaa.h
-tls_test-gaa.c: tls_test.gaa
-       -gaa tls_test.gaa -o tls_test-gaa.c -i tls_test-gaa.h
-serv-gaa.c: serv.gaa
-       -gaa serv.gaa -o serv-gaa.c -i serv-gaa.h
+psk-gaa.c: $(srcdir)/psk.gaa
+       -$(GAA) $< -o psk-gaa.c -i psk-gaa.h
+crypt-gaa.c: $(srcdir)/crypt.gaa
+       -$(GAA) $< -o crypt-gaa.c -i crypt-gaa.h
+certtool-gaa.c: $(srcdir)/certtool.gaa
+       -$(GAA) $< -o certtool-gaa.c -i certtool-gaa.h
+cli-gaa.c: $(srcdir)/cli.gaa
+       -$(GAA) $< -o cli-gaa.c -i cli-gaa.h
+tls_test-gaa.c: $(srcdir)/tls_test.gaa
+       -$(GAA) $< -o tls_test-gaa.c -i tls_test-gaa.h
+serv-gaa.c: $(srcdir)/serv.gaa
+       -$(GAA) $< -o serv-gaa.c -i serv-gaa.h