← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/inspircd/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/02_fix_gnutls_config.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Bradley Smith
  • Date: 2009-01-04 19:00:13 UTC
  • mfrom: (3.2.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20090104190013-zvnnmwhyvv1km6b1
Tags: 1.1.22+dfsg-3
http://bugs.debian.org/510748
02_fix_gnutls_config.dpatch - Fix configure script so GnuTLS module is
built. Closes: #510748.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix_gnutls_config.dpatch
 
1
#!/bin/sh -e
 
2
## 02_fix_gnutls_config.dpatch
 
3
##
 
4
## DP: Fix configure script to make sure GnuTLS module is built.
 
5
## DP: Cherry picked from upstream.
 
6
 
 
7
if [ $# -ne 1 ]; then
 
8
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
9
    exit 1
 
10
fi
 
11
 
 
12
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
13
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
 
14
 
 
15
case "$1" in
 
16
       -patch) patch $patch_opts -p1 < $0;;
 
17
       -unpatch) patch $patch_opts -p1 -R < $0;;
 
18
        *)
 
19
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
20
                exit 1;;
 
21
esac
 
22
 
 
23
exit 0
 
24
 
 
25
@DPATCH@
 
26
diff -Naur a/configure b/configure
 
27
--- a/configure 2009-01-04 19:08:57.000000000 +0000
 
28
+++ b/configure 2009-01-04 19:10:15.000000000 +0000
 
29
@@ -139,10 +139,10 @@
 
30
 chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);          # Openssl version
 
31
 chomp($gnutls_ver = $config{HAS_GNUTLS});
 
32
 chomp($openssl_ver = $config{HAS_OPENSSL});
 
33
-$config{HAS_GNUTLS}        = "n";
 
34
+$config{USE_GNUTLS}        = "n";
 
35
 if (defined $opt_use_gnutls)
 
36
 {
 
37
-       $config{HAS_GNUTLS} = "y";                                      # Use gnutls.
 
38
+       $config{USE_GNUTLS} = "y";                                      # Use gnutls.
 
39
 }
 
40
 $config{USE_OPENSSL}   = "n";                                          # Use openssl.
 
41
 if (defined $opt_use_openssl)