[git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-87-g70dcac6

[by Werner Koch]

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 "The GNU crypto library".

The branch, master has been updated
       via  70dcac663de06b012417015c175973d64e6980df (commit)
       via  fb48ebf7081400a24ee48f8a9894a361e8834b6e (commit)
      from  0da77955a097bfd2469ad084b3e9fcac4fb1e3fa (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 70dcac663de06b012417015c175973d64e6980df
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Feb 20 20:44:19 2013 +0100

    Fix building of hwf-x86.c
    
    * src/Makefile.am (AM_CFLAGS): Set to GPG_ERROR_CFLAGS
    (AM_CCASFLAGS): Set NOEXECSTACK_FLAGS.
    --
    
    Without that fix we might have used a different gcrypt.h version if we
    explicitly requested a newer one.  Note that dynamically added modules
    use different rules than the static ones (.c.lo: vs. .c.la:).
    
    AM_CCASFLAGS might not be needed right now but may be useful in the
    future.

diff --git a/src/Makefile.am b/src/Makefile.am
index cdfe0c6..9e7dcd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,8 @@ arch_gpg_error_cflags =
 arch_gpg_error_libs   =
 endif
 
+AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_CCASFLAGS = $(NOEXECSTACK_FLAGS)
 
 if HAVE_LD_VERSION_SCRIPT
   libgcrypt_version_script_cmd = -Wl,--version-script=$(srcdir)/libgcrypt.vers

commit fb48ebf7081400a24ee48f8a9894a361e8834b6e
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Feb 20 20:36:39 2013 +0100

    Remove build hacks for FreeBSD.
    
    * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
    LDFLAGS.
    --
    
    Back in ~2000 we introduced a quick hack to make building of Libgcrypt
    on FreeBSD easier by always adding -I/usr/local/include and
    -L/usr/local/lib .  It turned out that this is a bad idea if one wants
    to build with library version which is not installed in /usr/local.

diff --git a/configure.ac b/configure.ac
index 4a4a2aa..1f057f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,12 +244,6 @@ case "${host}" in
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         ;;
 
-    *-*-freebsd*)
-       # FreeBSD
-       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       ;;
-
     *-*-hpux*)
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"

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

Summary of changes:
 configure.ac    |    6 ------
 src/Makefile.am |    2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org