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

[Ludovic Courtès]

Hi,

The two patches below (against HEAD) make compilation smoother by
detecting GAA and allowing for out-of-source-tree builds.

Thanks,
Ludovic.


ChangeLog entry:

        * configure.in: Look for `gaa', returning an error 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.

        * doc/Makefile.am: Refer to `sort2.pl' as
        `$(srcdir)/scripts/sort2.pl' instead of `scripts/sort2.pl'.
        * doc/manpages/Makefile.am: Refer to `gdoc' as
        `$(top_srcdir)/doc/scripts/gdoc' instead of `../scripts/gdoc'.
        * doc/lib/Makefile.am: Likewise.
        * doc/lib/x509/Makefile.am: Likewise.
        * doc/libextra/Makefile.am: Likewise.
        * doc/libextra/openpgp/Makefile.am: Likewise.


--- orig/configure.in
+++ mod/configure.in
@@ -96,6 +96,13 @@
 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_ERROR([[***
+*** GAA was not found.  You may want to get it from
+*** http://gaa.sourceforge.net/
+***]])
+fi
 
 AC_MSG_RESULT([***
 *** Detecting compiler options...


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



--- orig/doc/Makefile.am
+++ mod/doc/Makefile.am
@@ -81,19 +81,19 @@
        cd ../libextra && make ia-api.texi
 
 gnutls-api.texi: ../lib/gnutls-api.texi
-       -scripts/sort2.pl < ../lib/gnutls-api.texi > gnutls-api.texi
+       -$(srcdir)/scripts/sort2.pl < ../lib/gnutls-api.texi > gnutls-api.texi
 
 gnutls-extra-api.texi: ../libextra/gnutls-extra-api.texi
-       -scripts/sort2.pl < ../libextra/gnutls-extra-api.texi > 
gnutls-extra-api.texi
+       -$(srcdir)/scripts/sort2.pl < ../libextra/gnutls-extra-api.texi > 
gnutls-extra-api.texi
 
 x509-api.texi: ../lib/x509/x509-api.texi
-       -scripts/sort2.pl < ../lib/x509/x509-api.texi > x509-api.texi
+       -$(srcdir)/scripts/sort2.pl < ../lib/x509/x509-api.texi > x509-api.texi
 
 pgp-api.texi: ../libextra/openpgp/pgp-api.texi
-       -scripts/sort2.pl < ../libextra/openpgp/pgp-api.texi > pgp-api.texi
+       -$(srcdir)/scripts/sort2.pl < ../libextra/openpgp/pgp-api.texi > 
pgp-api.texi
 
 ia-api.texi: ../libextra/ia-api.texi
-       -scripts/sort2.pl < ../libextra/ia-api.texi > ia-api.texi
+       -$(srcdir)/scripts/sort2.pl < ../libextra/ia-api.texi > ia-api.texi
 
 error_codes.texi: ../lib/gnutls_errors.c ../src/errcodes.c
        -../src/errcodes > error_codes.texi


--- orig/doc/manpages/Makefile.am
+++ mod/doc/manpages/Makefile.am
@@ -41,7 +41,7 @@
        make doit
 
 update-makefile:
-       FUNCS=`../scripts/gdoc -listfunc \
+       FUNCS=`$(top_srcdir)/doc/scripts/gdoc -listfunc \
                $(top_srcdir)/{lib,libextra,lib/x509,libextra/openpgp}/*.c`; \
        MANS=""; \
        SRPMANS=""; \
@@ -56,9 +56,9 @@
        perl -pi -e "s/^SRPMANS =.*/SRPMANS =$$SRPMANS/" Makefile.am
 
 doit:
-       @for i in `../scripts/gdoc -listfunc $(top_srcdir)/lib/*.c`; do \
+       @for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc 
$(top_srcdir)/lib/*.c`; do \
                echo -n "Creating man page for $$i... " && \
-               ../scripts/gdoc -man \
+               $(top_srcdir)/doc/scripts/gdoc -man \
                        -module $(PACKAGE) -sourceversion $(VERSION) \
                        -bugsto $(PACKAGE_BUGREPORT) \
                        -include "gnutls/gnutls.h" \
@@ -68,9 +68,9 @@
                        $(top_srcdir)/lib/*.c >> $$i.3 && \
                echo "ok"; \
        done; \
-       for i in `../scripts/gdoc -listfunc $(top_srcdir)/libextra/*.c`; do \
+       for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc 
$(top_srcdir)/libextra/*.c`; do \
                echo -n "Creating man page in extra/ for $$i... " && \
-               ../scripts/gdoc -man \
+               $(top_srcdir)/doc/scripts/gdoc -man \
                        -module $(PACKAGE) -sourceversion $(VERSION) \
                        -bugsto $(PACKAGE_BUGREPORT) \
                        -include "gnutls/extra.h" \
@@ -80,9 +80,9 @@
                        $(top_srcdir)/libextra/*.c >> $$i.3 && \
                echo "ok"; \
        done; \
-       for i in `../scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep 
-v gnutls_pkcs12`; do \
+       for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc 
$(top_srcdir)/lib/x509/*.c | grep -v gnutls_pkcs12`; do \
                echo -n "Creating man page in lib/x509/ for $$i... " && \
-               ../scripts/gdoc -man \
+               $(top_srcdir)/doc/scripts/gdoc -man \
                        -module $(PACKAGE) -sourceversion $(VERSION) \
                        -bugsto $(PACKAGE_BUGREPORT) \
                        -include "gnutls/x509.h" \
@@ -92,9 +92,9 @@
                        $(top_srcdir)/lib/x509/*.c >> $$i.3 && \
                echo "ok"; \
        done; \
-       for i in `../scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep 
gnutls_pkcs12`; do \
+       for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc 
$(top_srcdir)/lib/x509/*.c | grep gnutls_pkcs12`; do \
                echo -n "Creating man page in lib/x509/ (pkcs12) for $$i... " 
&& \
-               ../scripts/gdoc -man \
+               $(top_srcdir)/doc/scripts/gdoc -man \
                        -module $(PACKAGE) -sourceversion $(VERSION) \
                        -bugsto $(PACKAGE_BUGREPORT) \
                        -include "gnutls/pkcs12.h" \
@@ -104,9 +104,9 @@
                        $(top_srcdir)/lib/x509/*.c >> $$i.3 && \
                echo "ok"; \
        done; \
-       for i in `../scripts/gdoc -listfunc 
$(top_srcdir)/libextra/openpgp/*.c`; do \
+       for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc 
$(top_srcdir)/libextra/openpgp/*.c`; do \
                echo -n "Creating man page in libextra/openpgp/ for $$i... " && 
\
-               ../scripts/gdoc -man \
+               $(top_srcdir)/doc/scripts/gdoc -man \
                        -module $(PACKAGE) -sourceversion $(VERSION) \
                        -bugsto $(PACKAGE_BUGREPORT) \
                        -include "gnutls/openpgp.h" \


--- orig/lib/Makefile.am
+++ mod/lib/Makefile.am
@@ -151,7 +151,7 @@
        @echo "" > gnutls-api.texi
        @for i in $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS); do \
                echo -n "Creating documentation for file $$i... " && \
-               ../doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi && \
+               $(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi 
&& \
                echo "ok"; \
        done
 


--- orig/lib/x509/Makefile.am
+++ mod/lib/x509/Makefile.am
@@ -41,7 +41,7 @@
        @echo "" > x509-api.texi
        @for i in $(libgnutls_x509_la_SOURCES); do \
                echo -n "Creating documentation for file $$i... " && \
-               ../../doc/scripts/gdoc -texinfo $$i >> x509-api.texi && \
+               $(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> x509-api.texi && 
\
                echo "ok"; \
        done
 


--- orig/libextra/Makefile.am
+++ mod/libextra/Makefile.am
@@ -144,7 +144,7 @@
        @echo "" > $@
        @for i in $<; do \
                echo -n "Creating documentation for file $$i... " && \
-               ../doc/scripts/gdoc -texinfo $$i >> $@ && \
+               $(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> $@ && \
                echo "ok"; \
        done
 
@@ -152,7 +152,7 @@
        @echo "" > $@
        @for i in $<; do \
                echo -n "Creating documentation for file $$i... " && \
-               ../doc/scripts/gdoc -texinfo $$i >> $@ && \
+               $(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> $@ && \
                echo "ok"; \
        done
 


--- orig/libextra/openpgp/Makefile.am
+++ mod/libextra/openpgp/Makefile.am
@@ -44,7 +44,7 @@
        @echo "" > pgp-api.texi
        @for i in ../gnutls_openpgp.c $(COBJECTS); do \
                echo -n "Creating documentation for file $$i... " && \
-               ../../doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
+               $(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
                echo "ok"; \
        done