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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
$NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
- Builtin krb5-config in platforms such as solaris do not support
the gssapi option, and need an explicit -lgss
- On Darwin, do not append custom CFLAGS.
- Do not strip debug flags.
- Support Minix.
--- configure.orig 2019-03-25 21:03:50.000000000 +0000
+++ configure
@@ -3746,6 +3746,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
;;
esac
done
+ xc_bad_var_cflags=no
if test $xc_bad_var_cflags = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
$as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
@@ -7881,7 +7882,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -8347,12 +8348,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
- fi
+netbsd* | netbsdelf*-gnu | minix*)
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
;;
newos6*)
@@ -12559,14 +12556,13 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- fi
+ netbsd* | netbsdelf*-gnu | minix*)
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ output_verbose_link_cmd=func_echo_all
;;
solaris*)
@@ -13249,15 +13245,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
esac
;;
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- hardcode_libdir_flag_spec='-R$libdir'
+ netbsd* | netbsdelf*-gnu | minix*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ output_verbose_link_cmd=func_echo_all
;;
newsos6)
@@ -14363,6 +14357,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
+minix*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Minix ld.elf_so'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
@@ -16931,7 +16937,7 @@ squeeze() {
#
- if test "$compiler_id" != "unknown"; then
+ if false; then
#
if test "$compiler_id" = "GNU_C" ||
test "$compiler_id" = "CLANG"; then
@@ -17259,13 +17265,6 @@ $as_echo_n "checking if compiler accepts
tmp_options="$flags_dbg_off"
fi
#
- if test "$flags_prefer_cppflags" = "yes"; then
- CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
- CFLAGS="$tmp_CFLAGS"
- else
- CPPFLAGS="$tmp_CPPFLAGS"
- CFLAGS="$tmp_CFLAGS $tmp_options"
- fi
squeeze CPPFLAGS
squeeze CFLAGS
@@ -18933,7 +18932,7 @@ $as_echo "no" >&6; }
tst_cflags="no"
case $host_os in
darwin*)
- tst_cflags="yes"
+ tst_cflags="no"
;;
esac
@@ -21934,7 +21933,11 @@ $as_echo "yes" >&6; }
if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$KRB5CONFIG"; then
- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+ if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then
+ GSSAPI_INCS=`$KRB5CONFIG --cflags`
+ else
+ GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+ fi
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
@@ -22107,7 +22110,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
LIBS="-lgss $LIBS"
;;
*)
- LIBS="-lgssapi $LIBS"
+ LIBS="-lgssapi -lkrb5 $LIBS"
;;
esac
fi
|
