Tiny patch from ludovic.courtes@laas.fr (Ludovic Courtès).

* 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.

diff --git a/configure.in b/configure.in
index 8133ee2d0564ba184ad1d0d8a4c4e5232a751914..33e0abd933235a0951e94346f6d1bdc312cda096 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -96,6 +96,14 @@ AC_PROG_CC
 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 @@ AC_CONFIG_FILES([Makefile po/Makefile.in \
        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 \

diff --git a/src/Makefile.am b/src/Makefile.am
index e62dc3d3ae1428e1891a618bdc383fc582db2183..450cae60b18e24ab1b2f2e978ac36a629769729f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,16 +78,16 @@ errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)
 
 
 
-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