[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-70-g26b01a9

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=26b01a940e1f1c7a3634b8dbca8ccccc7d03783a

The branch, master has been updated
       via  26b01a940e1f1c7a3634b8dbca8ccccc7d03783a (commit)
       via  015e54f187cf501d1493f4a215c50fbabf951abe (commit)
       via  d434c0adf9287d69ceade1f975993607af243eb5 (commit)
       via  4c620f19d381c72dc85ce60e01ee7d18bf6aee47 (commit)
       via  b942403749d705044d8164d3b90867f905b3a184 (commit)
      from  66c7e7d87f4bbfc426b15e2c125a5ac25bbf5e59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 26b01a940e1f1c7a3634b8dbca8ccccc7d03783a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 27 00:17:04 2012 +0100

    updated

commit 015e54f187cf501d1493f4a215c50fbabf951abe
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 26 20:28:39 2012 +0100

    re-updated

commit d434c0adf9287d69ceade1f975993607af243eb5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 26 20:27:38 2012 +0100

    Revert "always link against the distributed libopts"
    
    This reverts commit ae3033fee01f058a028406648ebc32294774e282.

commit 4c620f19d381c72dc85ce60e01ee7d18bf6aee47
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 26 20:05:28 2012 +0100

    replace @VERSION@ in the program documentation.

commit b942403749d705044d8164d3b90867f905b3a184
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 26 20:03:32 2012 +0100

    document autogen minimum version

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am  |    1 +
 NEWS         |    6 +++++-
 README-alpha |    2 +-
 configure.ac |    3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c6efbf6..a59db29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ dist-hook:
        make ChangeLog
        cp -f ChangeLog $(distdir)/
        sed 's/address@hidden@/$(VERSION)/g' -i $(distdir)/src/args-std.def
+       sed 's/address@hidden@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
        cd $(distdir)/src/ && for i in *.def;do \
                if test x"$$i" = x"args-std.def";then  continue; fi; \
                autogen $$i; \
diff --git a/NEWS b/NEWS
index c002717..0bb8f92 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,11 @@ See the end for copying conditions.
 
 * Version 3.0.15 (unreleased)
 
-** command line apps: Always link with local libopts.
+** test suite: Only run under valgrind in the development
+system (the full git repository)
+
+** command line apps: Link with local libopts if the 
+installed is an old one.
 
 ** libgnutls: Cryptodev updates and fixes.
 
diff --git a/README-alpha b/README-alpha
index b06969a..21fcab7 100644
--- a/README-alpha
+++ b/README-alpha
@@ -10,7 +10,7 @@ We require several tools to build the software, including:
 - Make <http://www.gnu.org/software/make/>
 - Automake <http://www.gnu.org/software/automake/>
 - Autoconf <http://www.gnu.org/software/autoconf/>
-- Autogen <http://www.gnu.org/software/autogen/>
+- Autogen <http://www.gnu.org/software/autogen/> (use 5.15pre15 or better)
 - Libtool <http://www.gnu.org/software/libtool/>
 - Gettext <http://www.gnu.org/software/gettext/>
 - Texinfo <http://www.gnu.org/software/texinfo/>
diff --git a/configure.ac b/configure.ac
index 3d0a617..4550adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,8 +148,8 @@ fi
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
 dnl Checks for programs in src/ 
+PKG_CHECK_MODULES([autoopts], autoopts >= 36.2.11,, [enable_local_libopts=yes])
 
-enable_local_libopts=yes
 NEED_LIBOPTS_DIR=true
 LIBOPTS_CHECK([src/libopts])
 
@@ -504,6 +504,7 @@ if features are disabled)
 AC_MSG_NOTICE([Optional applications:
 
   crywrap app:      $libidn
+  local libopts:    $enable_local_libopts
 ])
 
 AC_MSG_NOTICE([Optional libraries:


hooks/post-receive
-- 
GNU gnutls