~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/02_Add-libnettle-as-option-for-sha1.diff

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
---
11
11
--- a/configure.ac
12
12
+++ b/configure.ac
13
 
@@ -1360,7 +1360,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
 
13
@@ -1356,7 +1356,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
14
14
 
15
15
 # SHA1 hashing
16
16
 AC_ARG_WITH([sha1],
19
19
                             [choose SHA1 implementation])])
20
20
 AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
21
21
 if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
22
 
@@ -1443,6 +1443,16 @@ if test "x$with_sha1" = xlibcrypto; then
 
22
@@ -1439,6 +1439,16 @@ if test "x$with_sha1" = xlibcrypto; then
23
23
                SHA1_CFLAGS="$OPENSSL_CFLAGS"
24
24
        fi
25
25
 fi