Commit | Line | Data |
---|---|---|
0c050045 VM |
1 | --- configure 2010-06-22 17:07:34.000000000 +0000 |
2 | +++ configure.new 2010-11-02 19:23:08.000000000 +0000 | |
3 | @@ -11514,75 +11514,9 @@ | |
4 | ||
5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5 | |
6 | $as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; } | |
7 | - ok=no | |
8 | - if test "$LIBGCRYPT_CONFIG" != "no" ; then | |
9 | - req_major=`echo $min_libgcrypt_version | \ | |
10 | - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` | |
11 | - req_minor=`echo $min_libgcrypt_version | \ | |
12 | - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` | |
13 | - req_micro=`echo $min_libgcrypt_version | \ | |
14 | - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` | |
15 | - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` | |
16 | - major=`echo $libgcrypt_config_version | \ | |
17 | - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` | |
18 | - minor=`echo $libgcrypt_config_version | \ | |
19 | - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` | |
20 | - micro=`echo $libgcrypt_config_version | \ | |
21 | - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` | |
22 | - if test "$major" -gt "$req_major"; then | |
23 | - ok=yes | |
24 | - else | |
25 | - if test "$major" -eq "$req_major"; then | |
26 | - if test "$minor" -gt "$req_minor"; then | |
27 | - ok=yes | |
28 | - else | |
29 | - if test "$minor" -eq "$req_minor"; then | |
30 | - if test "$micro" -ge "$req_micro"; then | |
31 | - ok=yes | |
32 | - fi | |
33 | - fi | |
34 | - fi | |
35 | - fi | |
36 | - fi | |
37 | - fi | |
38 | - if test $ok = yes; then | |
39 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5 | |
40 | -$as_echo "yes ($libgcrypt_config_version)" >&6; } | |
41 | - else | |
42 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
43 | -$as_echo "no" >&6; } | |
44 | - fi | |
45 | - if test $ok = yes; then | |
46 | - # If we have a recent libgcrypt, we should also check that the | |
47 | - # API is compatible | |
48 | - if test "$req_libgcrypt_api" -gt 0 ; then | |
49 | - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` | |
50 | - if test "$tmp" -gt 0 ; then | |
51 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5 | |
52 | -$as_echo_n "checking LIBGCRYPT API version... " >&6; } | |
53 | - if test "$req_libgcrypt_api" -eq "$tmp" ; then | |
54 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5 | |
55 | -$as_echo "okay" >&6; } | |
56 | - else | |
57 | - ok=no | |
58 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5 | |
59 | -$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; } | |
60 | - fi | |
61 | - fi | |
62 | - fi | |
63 | - fi | |
64 | - if test $ok = yes; then | |
65 | LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` | |
66 | LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` | |
67 | have_ssl=yes | |
68 | - else | |
69 | - LIBGCRYPT_CFLAGS="" | |
70 | - LIBGCRYPT_LIBS="" | |
71 | - have_ssl=no | |
72 | - fi | |
73 | - | |
74 | - | |
75 | - | |
76 | fi | |
77 | fi | |
78 | if test "$have_ssl" = "yes"; then |