[SCM] GNU gnutls branch, master, updated. gnutls_3_0_15-45-g8363622

[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=8363622e423eccad8d8e8db4c5e06f6273c49545

The branch, master has been updated
       via  8363622e423eccad8d8e8db4c5e06f6273c49545 (commit)
       via  c0fa72a1bb2cdc1a64a144b287464646c8692b5e (commit)
      from  080f43e1485e36addcaf4279a39848cf8b66a4df (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 8363622e423eccad8d8e8db4c5e06f6273c49545
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 15 19:00:47 2012 +0100

    corrected makefile

commit c0fa72a1bb2cdc1a64a144b287464646c8692b5e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 15 18:58:18 2012 +0100

    Added missing elf part.

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

Summary of changes:
 configure.ac                    |    2 +
 lib/accelerated/x86/Makefile.am |   46 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index f1a602e..6b0ade5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,11 +71,13 @@ case "$host" in
     have_macosx=yes
   ;;
   *)
+    have_elf=yes
   ;;
 esac
 
 AM_CONDITIONAL(WINDOWS, test "$have_win" = yes)
 AM_CONDITIONAL(MACOSX, test "$have_macosx" = yes)
+AM_CONDITIONAL(ELF, test "$have_elf" = yes)
 
 dnl Hardware Acceleration
 AC_ARG_ENABLE(hardware-acceleration,
diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index 7040847..9abadfd 100644
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -38,34 +38,34 @@ noinst_LTLIBRARIES = libx86.la
 libx86_la_SOURCES = sha-padlock.c hmac-padlock.c aes-x86.c aes-padlock.c 
aes-gcm-padlock.c aes-padlock.h aes-x86.h x86.h sha-padlock.h
 
 if ASM_X86_64
- AM_CFLAGS += -DASM_X86_64 -DASM_X86
- libx86_la_SOURCES += aes-gcm-x86.c
+AM_CFLAGS += -DASM_X86_64 -DASM_X86
+libx86_la_SOURCES += aes-gcm-x86.c
 
- if WINDOWS
-  libx86_la_SOURCES += asm-coff/appro-aes-x86-64-coff.s 
asm-coff/padlock-x86-64-coff.s asm-coff/cpuid-x86-64-coff.s 
asm-coff/appro-aes-gcm-x86-64-coff.s
- endif
-
- if MACOSX
-  libx86_la_SOURCES += asm-macosx/appro-aes-x86-64-macosx.s 
asm-macosx/padlock-x86-64-macosx.s asm-macosx/cpuid-x86-64-macosx.s 
asm-macosx/appro-aes-gcm-x86-64-macosx.s
- endif
+if WINDOWS
+libx86_la_SOURCES += asm-coff/appro-aes-x86-64-coff.s 
asm-coff/padlock-x86-64-coff.s asm-coff/cpuid-x86-64-coff.s 
asm-coff/appro-aes-gcm-x86-64-coff.s
+endif
 
- if ELF
-  libx86_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s 
asm/padlock-x86-64.s asm/cpuid-x86-64.s
- endif
+if MACOSX
+libx86_la_SOURCES += asm-macosx/appro-aes-x86-64-macosx.s 
asm-macosx/padlock-x86-64-macosx.s asm-macosx/cpuid-x86-64-macosx.s 
asm-macosx/appro-aes-gcm-x86-64-macosx.s
+endif
 
-else
- AM_CFLAGS += -DASM_X86_32 -DASM_X86
+if ELF
+libx86_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s 
asm/padlock-x86-64.s asm/cpuid-x86-64.s
+endif
 
- if WINDOWS
-  libx86_la_SOURCES += asm-coff/appro-aes-x86-coff.s 
asm-coff/padlock-x86-coff.s asm-coff/cpuid-x86-coff.s
- endif
+else #ASM_X86_64
+AM_CFLAGS += -DASM_X86_32 -DASM_X86
 
- if MACOSX
-  libx86_la_SOURCES += asm-macosx/appro-aes-x86-macosx.s 
asm-macosx/padlock-x86-macosx.s asm-macosx/cpuid-x86-macosx.s
- endif
+if WINDOWS
+libx86_la_SOURCES += asm-coff/appro-aes-x86-coff.s asm-coff/padlock-x86-coff.s 
asm-coff/cpuid-x86-coff.s
+endif
 
- if ELF
-  libx86_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
- endif
+if MACOSX
+libx86_la_SOURCES += asm-macosx/appro-aes-x86-macosx.s 
asm-macosx/padlock-x86-macosx.s asm-macosx/cpuid-x86-macosx.s
+endif
 
+if ELF
+libx86_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
 endif
+
+endif #ASM_X86_64


hooks/post-receive
-- 
GNU gnutls