blob: 64b1684fb4ac1e8add06a32ea8a2886b0d7674d8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- elinks-0.15.0/configure.orig 2021-12-24 20:57:15.000000000 +0100
+++ elinks-0.15.0/configure 2023-03-27 08:37:42.627732227 +0200
@@ -10345,18 +10345,10 @@
fi
fi
- for ac_header in term.h
-do :
- ac_fn_cxx_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "$ac_includes_default"
-if test "x$ac_cv_header_term_h" = xyes
-then :
+ac_cv_header_term_h=yes
printf "%s\n" "#define HAVE_TERM_H 1" >>confdefs.h
CONFIG_TERMINFO=yes
-else $as_nop
- CONFIG_TERMINFO=no; break;
-fi
-done
if test "$CONFIG_TERMINFO" = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -ltinfo" >&5
printf %s "checking for setupterm in -ltinfo... " >&6; }
@@ -13347,59 +13339,9 @@
chosen_ssl_library="GNUTLS"
- # Extract the first word of "libgcrypt-config", so it can be a program name with args.
-set dummy libgcrypt-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_LIBGCRYPT_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- case $LIBGCRYPT_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_LIBGCRYPT_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
- ;;
-esac
-fi
-LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
-if test -n "$LIBGCRYPT_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
-printf "%s\n" "$LIBGCRYPT_CONFIG" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
- if test "$LIBGCRYPT_CONFIG" = no; then
- as_fn_error $? "libgcrypt-config not found." "$LINENO" 5
- fi
-
# gcry_create_nounce is part of libgcrypt
- LIBGCRYPT_CFLAGS=`libgcrypt-config --cflags`
- LIBGCRYPT_LIBS=`libgcrypt-config --libs`
+ LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt`
+ LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt`
LIBS="$LIBGCRYPT_LIBS $GNUTLS_LIBS $LIBS"
|
