Mercurial > dropbear
annotate configure.ac @ 1567:2799a1d55b59
don't try clang-5.0
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 01 Mar 2018 22:58:39 +0800 |
parents | 86e4995bbedf |
children | ee7a546e3e6d |
rev | line source |
---|---|
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
1 # -*- Autoconf -*- |
28
45ee5ffd6ea0
Mention that autoheader should also be run
Matt Johnston <matt@ucc.asn.au>
parents:
4
diff
changeset
|
2 # Process this file with autoconf and autoheader to produce a configure script. |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
3 |
67 | 4 # This Autoconf file was cobbled from various locations. In particular, a bunch |
5 # of the platform checks have been taken straight from OpenSSH's configure.ac | |
6 # Huge thanks to them for dealing with the horrible platform-specifics :) | |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
7 |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
8 AC_PREREQ(2.59) |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
9 AC_INIT |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
10 AC_CONFIG_SRCDIR(buffer.c) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
11 |
1530 | 12 # Record which revision is being built |
1564
86e4995bbedf
more portable for `which hg` test
Matt Johnston <matt@ucc.asn.au>
parents:
1559
diff
changeset
|
13 if test -s "`which hg`" && test -d "$srcdir/.hg"; then |
1530 | 14 hgrev=`hg id -i -R "$srcdir"` |
1558
2f64cb3d3007
- #if not #ifdef for DROPBEAR_FUZZ
Matt Johnston <matt@ucc.asn.au>
parents:
1557
diff
changeset
|
15 AC_MSG_NOTICE([Source directory Mercurial base revision $hgrev]) |
1530 | 16 fi |
17 | |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
18 # Checks for programs. |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
19 AC_PROG_CC |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
20 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
21 if test -z "$LD" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
22 LD=$CC |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
23 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
24 AC_SUBST(LD) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
25 |
1469
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
26 AC_DEFUN(DB_TRYADDCFLAGS, |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
27 [{ |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
28 OLDFLAGS="$CFLAGS" |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
29 TESTFLAGS="$1" |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
30 CFLAGS="$CFLAGS $TESTFLAGS" |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
31 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
32 [AC_MSG_NOTICE([Setting $TESTFLAGS])], |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
33 [AC_MSG_NOTICE([Not setting $TESTFLAGS]); CFLAGS="$OLDFLAGS" ] |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
34 ) |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
35 }]) |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
36 |
1427
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
37 # set compile flags prior to other tests |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
38 if test -z "$OLDCFLAGS" && test "$GCC" = "yes"; then |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
39 AC_MSG_NOTICE(No \$CFLAGS set... using "-Os -W -Wall" for GCC) |
1469
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
40 CFLAGS="-Os -W -Wall" |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
41 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
42 |
1469
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
43 AC_MSG_NOTICE([Checking if compiler '$CC' supports -Wno-pointer-sign]) |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
44 DB_TRYADDCFLAGS([-Wno-pointer-sign]) |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
45 |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
46 AC_MSG_NOTICE([Checking if compiler '$CC' supports -fno-strict-overflow]) |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
47 DB_TRYADDCFLAGS([-fno-strict-overflow]) |
1416
33d90d219e03
Compile with -fno-strict-overflow if possible.
Matt Johnston <matt@ucc.asn.au>
parents:
1407
diff
changeset
|
48 |
1446
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
49 STATIC=0 |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
50 AC_ARG_ENABLE(static, |
1447
8f88f4290b22
document --enable-static in place of STATIC=1
Matt Johnston <matt@ucc.asn.au>
parents:
1446
diff
changeset
|
51 [ --enable-static Build static binaries], |
1446
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
52 [ |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
53 if test "x$enableval" = "xyes"; then |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
54 STATIC=1 |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
55 AC_MSG_NOTICE(Static Build) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
56 fi |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
57 ], []) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
58 AC_SUBST(STATIC) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
59 |
1427
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
60 hardenbuild=1 |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
61 AC_ARG_ENABLE(harden, |
1444
bfed37d12d90
improve configure --help alignment
Matt Johnston <matt@ucc.asn.au>
parents:
1429
diff
changeset
|
62 [ --disable-harden Don't set hardened build flags], |
1427
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
63 [ |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
64 if test "x$enableval" = "xno"; then |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
65 hardenbuild=0 |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
66 AC_MSG_NOTICE(Disabling hardened build flags) |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
67 fi |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
68 ], []) |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
69 |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
70 if test "$hardenbuild" -eq 1; then |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
71 AC_MSG_NOTICE(Checking for available hardened build flags:) |
1446
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
72 # relocation flags don't make sense for static builds |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
73 if test "$STATIC" -ne 1; then |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
74 # pie |
1469
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
75 DB_TRYADDCFLAGS([-fPIE]) |
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
76 |
1446
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
77 OLDLDFLAGS="$LDFLAGS" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
78 TESTFLAGS="-Wl,-pie" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
79 LDFLAGS="$LDFLAGS $TESTFLAGS" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
80 AC_LINK_IFELSE([AC_LANG_PROGRAM([])], |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
81 [AC_MSG_NOTICE([Setting $TESTFLAGS])], |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
82 [ |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
83 LDFLAGS="$OLDLDFLAGS" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
84 TESTFLAGS="-pie" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
85 LDFLAGS="$LDFLAGS $TESTFLAGS" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
86 AC_LINK_IFELSE([AC_LANG_PROGRAM([])], |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
87 [AC_MSG_NOTICE([Setting $TESTFLAGS])], |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
88 [AC_MSG_NOTICE([Not setting $TESTFLAGS]); LDFLAGS="$OLDLDFLAGS" ] |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
89 ) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
90 ] |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
91 ) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
92 # readonly elf relocation sections (relro) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
93 OLDLDFLAGS="$LDFLAGS" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
94 TESTFLAGS="-Wl,-z,now -Wl,-z,relro" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
95 LDFLAGS="$LDFLAGS $TESTFLAGS" |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
96 AC_LINK_IFELSE([AC_LANG_PROGRAM([])], |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
97 [AC_MSG_NOTICE([Setting $TESTFLAGS])], |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
98 [AC_MSG_NOTICE([Not setting $TESTFLAGS]); LDFLAGS="$OLDLDFLAGS" ] |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
99 ) |
b8764eee6bdb
add --enable-static configure argument. disable conflicting harden flags
Matt Johnston <matt@ucc.asn.au>
parents:
1444
diff
changeset
|
100 fi # non-static |
1427
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
101 # stack protector. -strong is good but only in gcc 4.9 or later |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
102 OLDCFLAGS="$CFLAGS" |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
103 TESTFLAGS="-fstack-protector-strong" |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
104 CFLAGS="$CFLAGS $TESTFLAGS" |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
105 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
106 [AC_MSG_NOTICE([Setting $TESTFLAGS])], |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
107 [ |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
108 CFLAGS="$OLDCFLAGS" |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
109 TESTFLAGS="-fstack-protector --param=ssp-buffer-size=4" |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
110 CFLAGS="$CFLAGS $TESTFLAGS" |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
111 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
112 [AC_MSG_NOTICE([Setting $TESTFLAGS])], |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
113 [AC_MSG_NOTICE([Not setting $TESTFLAGS]); CFLAGS="$OLDCFLAGS" ] |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
114 ) |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
115 ] |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
116 ) |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
117 # FORTIFY_SOURCE |
1469
51043e868f55
Test for -Wno-pointer-sign, move CFLAGS tests into a macro
Matt Johnston <matt@ucc.asn.au>
parents:
1463
diff
changeset
|
118 DB_TRYADDCFLAGS([-D_FORTIFY_SOURCE=2]) |
1505
55120acb9994
Add Spectre v2 mitigations for GCC (#54)
Loganaden Velvindron <logan@hackers.mu>
parents:
1490
diff
changeset
|
119 |
55120acb9994
Add Spectre v2 mitigations for GCC (#54)
Loganaden Velvindron <logan@hackers.mu>
parents:
1490
diff
changeset
|
120 # Spectre v2 mitigations |
55120acb9994
Add Spectre v2 mitigations for GCC (#54)
Loganaden Velvindron <logan@hackers.mu>
parents:
1490
diff
changeset
|
121 DB_TRYADDCFLAGS([-mfunction-return=thunk]) |
55120acb9994
Add Spectre v2 mitigations for GCC (#54)
Loganaden Velvindron <logan@hackers.mu>
parents:
1490
diff
changeset
|
122 DB_TRYADDCFLAGS([-mindirect-branch=thunk]) |
55120acb9994
Add Spectre v2 mitigations for GCC (#54)
Loganaden Velvindron <logan@hackers.mu>
parents:
1490
diff
changeset
|
123 |
1427
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
124 fi |
f0e262a46d4e
set hardened compiler/linker flags by default
Matt Johnston <matt@ucc.asn.au>
parents:
1426
diff
changeset
|
125 |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
126 # large file support is useful for scp |
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
127 AC_SYS_LARGEFILE |
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
128 |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
129 # Host specific options |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
130 # this isn't a definitive list of hosts, they are just added as required |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
131 AC_CANONICAL_HOST |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
132 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
133 case "$host" in |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
134 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
135 *-*-linux*) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
136 no_ptmx_check=1 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
137 ;; |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
138 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
139 *-*-solaris*) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
140 CFLAGS="$CFLAGS -I/usr/local/include" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
141 LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
142 conf_lastlog_location="/var/adm/lastlog" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
143 AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
144 sol2ver=`echo "$host"| sed -e 's/.*[[0-9]]\.//'` |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
145 if test "$sol2ver" -ge 8; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
146 AC_MSG_RESULT(yes) |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
147 AC_DEFINE(DISABLE_UTMP,1,Disable utmp) |
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
148 AC_DEFINE(DISABLE_WTMP,1,Disable wtmp) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
149 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
150 AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
151 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
152 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket") |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
153 AC_CHECK_LIB(nsl, yp_match, LIBS="$LIBS -lnsl") |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
154 ;; |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
155 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
156 *-*-aix*) |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
157 AC_DEFINE(AIX,1,Using AIX) |
67 | 158 # OpenSSH thinks it's broken. If it isn't, let me know. |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
159 AC_DEFINE(BROKEN_GETADDRINFO,1,Broken getaddrinfo) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
160 ;; |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
161 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
162 *-*-hpux*) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
163 LIBS="$LIBS -lsec" |
67 | 164 # It's probably broken. |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
165 AC_DEFINE(BROKEN_GETADDRINFO,1,Broken getaddrinfo) |
67 | 166 ;; |
167 *-dec-osf*) | |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
168 AC_DEFINE(BROKEN_GETADDRINFO,1,Broken getaddrinfo) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
169 ;; |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
170 esac |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
171 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
172 AC_CHECK_TOOL(AR, ar, :) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
173 AC_CHECK_TOOL(RANLIB, ranlib, :) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
174 AC_CHECK_TOOL(STRIP, strip, :) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
175 AC_CHECK_TOOL(INSTALL, install, :) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
176 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
177 dnl Can't use login() or logout() with uclibc |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
178 AC_CHECK_DECL(__UCLIBC__, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
179 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
180 no_loginfunc_check=1 |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
181 AC_MSG_NOTICE([Using uClibc - login() and logout() probably don't work, so we won't use them.]) |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
182 ],,) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
183 |
1186
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
184 dnl We test for crypt() specially. On Linux (and others?) it resides in libcrypt |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
185 dnl but we don't want link all binaries to -lcrypt, just dropbear server. |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
186 dnl OS X doesn't need -lcrypt |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
187 AC_CHECK_FUNC(crypt, found_crypt_func=here) |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
188 AC_CHECK_LIB(crypt, crypt, |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
189 [ |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
190 CRYPTLIB="-lcrypt" |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
191 found_crypt_func=here |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
192 ]) |
519
a1b7c6cdd48a
Only use -lcrypt for Dropbear server binary
Matt Johnston <matt@ucc.asn.au>
parents:
461
diff
changeset
|
193 AC_SUBST(CRYPTLIB) |
1193
da1ed4fcdc4a
The '==' comparision operator is not defined by POSIX, use '=' instead
Juergen Daubert <jue@jue.li>
parents:
1186
diff
changeset
|
194 if test "t$found_crypt_func" = there; then |
1186
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
195 AC_DEFINE(HAVE_CRYPT, 1, [crypt() function]) |
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
196 fi |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
197 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
198 # Check if zlib is needed |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
199 AC_ARG_WITH(zlib, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
200 [ --with-zlib=PATH Use zlib in PATH], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
201 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
202 # option is given |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
203 if test -d "$withval/lib"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
204 LDFLAGS="-L${withval}/lib ${LDFLAGS}" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
205 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
206 LDFLAGS="-L${withval} ${LDFLAGS}" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
207 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
208 if test -d "$withval/include"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
209 CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
210 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
211 CPPFLAGS="-I${withval} ${CPPFLAGS}" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
212 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
213 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
214 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
215 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
216 AC_ARG_ENABLE(zlib, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
217 [ --disable-zlib Don't include zlib support], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
218 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
219 if test "x$enableval" = "xno"; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
220 AC_DEFINE(DISABLE_ZLIB,1,Use zlib) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
221 AC_MSG_NOTICE(Disabling zlib) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
222 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
223 AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR([*** zlib missing - install first or check config.log ***])) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
224 AC_MSG_NOTICE(Enabling zlib) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
225 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
226 ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
227 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
228 # if not disabled, check for zlib |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
229 AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR([*** zlib missing - install first or check config.log ***])) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
230 AC_MSG_NOTICE(Enabling zlib) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
231 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
232 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
233 |
57
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
234 # Check if pam is needed |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
235 AC_ARG_WITH(pam, |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
236 [ --with-pam=PATH Use pam in PATH], |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
237 [ |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
238 # option is given |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
239 if test -d "$withval/lib"; then |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
240 LDFLAGS="-L${withval}/lib ${LDFLAGS}" |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
241 else |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
242 LDFLAGS="-L${withval} ${LDFLAGS}" |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
243 fi |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
244 if test -d "$withval/include"; then |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
245 CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
246 else |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
247 CPPFLAGS="-I${withval} ${CPPFLAGS}" |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
248 fi |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
249 ] |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
250 ) |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
251 |
122
cb7ef2f63bf0
propagate of f51a272341ee12268fe7028bc2f2bad66c603069 and ab35ee4292ea910d4871c3609d6100fe34300720 from branch 'matt.dbclient.rez' to 'matt.dbclient.work'
Matt Johnston <matt@ucc.asn.au>
parents:
119
diff
changeset
|
252 |
57
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
253 AC_ARG_ENABLE(pam, |
1444
bfed37d12d90
improve configure --help alignment
Matt Johnston <matt@ucc.asn.au>
parents:
1429
diff
changeset
|
254 [ --enable-pam Try to include PAM support], |
57
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
255 [ |
122
cb7ef2f63bf0
propagate of f51a272341ee12268fe7028bc2f2bad66c603069 and ab35ee4292ea910d4871c3609d6100fe34300720 from branch 'matt.dbclient.rez' to 'matt.dbclient.work'
Matt Johnston <matt@ucc.asn.au>
parents:
119
diff
changeset
|
256 if test "x$enableval" = "xyes"; then |
cb7ef2f63bf0
propagate of f51a272341ee12268fe7028bc2f2bad66c603069 and ab35ee4292ea910d4871c3609d6100fe34300720 from branch 'matt.dbclient.rez' to 'matt.dbclient.work'
Matt Johnston <matt@ucc.asn.au>
parents:
119
diff
changeset
|
257 AC_CHECK_LIB(pam, pam_authenticate, , AC_MSG_ERROR([*** PAM missing - install first or check config.log ***])) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
258 AC_MSG_NOTICE(Enabling PAM) |
573
d3ea8b9672f0
- Test for pam_fail_delay() function in configure
Matt Johnston <matt@ucc.asn.au>
parents:
519
diff
changeset
|
259 AC_CHECK_FUNCS(pam_fail_delay) |
122
cb7ef2f63bf0
propagate of f51a272341ee12268fe7028bc2f2bad66c603069 and ab35ee4292ea910d4871c3609d6100fe34300720 from branch 'matt.dbclient.rez' to 'matt.dbclient.work'
Matt Johnston <matt@ucc.asn.au>
parents:
119
diff
changeset
|
260 else |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
261 AC_DEFINE(DISABLE_PAM,1,Use PAM) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
262 AC_MSG_NOTICE(Disabling PAM) |
57
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
263 fi |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
264 ], |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
265 [ |
122
cb7ef2f63bf0
propagate of f51a272341ee12268fe7028bc2f2bad66c603069 and ab35ee4292ea910d4871c3609d6100fe34300720 from branch 'matt.dbclient.rez' to 'matt.dbclient.work'
Matt Johnston <matt@ucc.asn.au>
parents:
119
diff
changeset
|
266 # disable it by default |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
267 AC_DEFINE(DISABLE_PAM,1,Use PAM) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
268 AC_MSG_NOTICE(Disabling PAM) |
57
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
269 ] |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
270 ) |
3b2a5a1c4347
svr-authpam code merged and works. needs tidying a log
Matt Johnston <matt@ucc.asn.au>
parents:
28
diff
changeset
|
271 |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
272 AC_ARG_ENABLE(openpty, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
273 [ --disable-openpty Don't use openpty, use alternative method], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
274 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
275 if test "x$enableval" = "xno"; then |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
276 AC_MSG_NOTICE(Not using openpty) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
277 else |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
278 AC_MSG_NOTICE(Using openpty if available) |
1462
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
279 AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
280 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
281 ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
282 [ |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
283 AC_MSG_NOTICE(Using openpty if available) |
1462
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
284 AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
285 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
286 ) |
1462
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
287 |
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
288 if test "x$dropbear_cv_func_have_openpty" = "xyes"; then |
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
289 AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) |
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
290 no_ptc_check=yes |
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
291 no_ptmx_check=yes |
e017e46b1434
configure: add a variable to allow openpty check to be cached
Eric Bénard <eric@eukrea.com>
parents:
1447
diff
changeset
|
292 fi |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
293 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
294 AC_ARG_ENABLE(syslog, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
295 [ --disable-syslog Don't include syslog support], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
296 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
297 if test "x$enableval" = "xno"; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
298 AC_DEFINE(DISABLE_SYSLOG,1,Using syslog) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
299 AC_MSG_NOTICE(Disabling syslog) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
300 else |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
301 AC_MSG_NOTICE(Enabling syslog) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
302 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
303 ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
304 [ |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
305 AC_MSG_NOTICE(Enabling syslog) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
306 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
307 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
308 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
309 AC_ARG_ENABLE(shadow, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
310 [ --disable-shadow Don't use shadow passwords (if available)], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
311 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
312 if test "x$enableval" = "xno"; then |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
313 AC_MSG_NOTICE(Not using shadow passwords) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
314 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
315 AC_CHECK_HEADERS([shadow.h]) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
316 AC_MSG_NOTICE(Using shadow passwords if available) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
317 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
318 ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
319 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
320 AC_CHECK_HEADERS([shadow.h]) |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
321 AC_MSG_NOTICE(Using shadow passwords if available) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
322 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
323 ) |
1347
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
324 |
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
325 AC_ARG_ENABLE(fuzz, |
1559
92c93b4a3646
Fix to be able to compile normal(ish) binaries with --enable-fuzz
Matt Johnston <matt@ucc.asn.au>
parents:
1558
diff
changeset
|
326 [ --enable-fuzz Build fuzzing. Not recommended for deployment.], |
1347
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
327 [ |
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
328 AC_DEFINE(DROPBEAR_FUZZ, 1, Fuzzing) |
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
329 AC_MSG_NOTICE(Enabling fuzzing) |
1356
3677a510f545
add wrapfd. improve fuzzer in makefile
Matt Johnston <matt@ucc.asn.au>
parents:
1347
diff
changeset
|
330 DROPBEAR_FUZZ=1 |
3677a510f545
add wrapfd. improve fuzzer in makefile
Matt Johnston <matt@ucc.asn.au>
parents:
1347
diff
changeset
|
331 ], |
3677a510f545
add wrapfd. improve fuzzer in makefile
Matt Johnston <matt@ucc.asn.au>
parents:
1347
diff
changeset
|
332 [ |
1558
2f64cb3d3007
- #if not #ifdef for DROPBEAR_FUZZ
Matt Johnston <matt@ucc.asn.au>
parents:
1557
diff
changeset
|
333 AC_DEFINE(DROPBEAR_FUZZ, 0, Fuzzing) |
1356
3677a510f545
add wrapfd. improve fuzzer in makefile
Matt Johnston <matt@ucc.asn.au>
parents:
1347
diff
changeset
|
334 DROPBEAR_FUZZ=0 |
1347
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
335 ] |
1356
3677a510f545
add wrapfd. improve fuzzer in makefile
Matt Johnston <matt@ucc.asn.au>
parents:
1347
diff
changeset
|
336 |
1347
b28624698130
copy over some fuzzing code from AFL branch
Matt Johnston <matt@ucc.asn.au>
parents:
1280
diff
changeset
|
337 ) |
1356
3677a510f545
add wrapfd. improve fuzzer in makefile
Matt Johnston <matt@ucc.asn.au>
parents:
1347
diff
changeset
|
338 AC_SUBST(DROPBEAR_FUZZ) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
339 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
340 # Checks for header files. |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
341 AC_HEADER_STDC |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
342 AC_HEADER_SYS_WAIT |
1550
93a3726a36d6
Remove unused tests for headers and functions
Matt Johnston <matt@ucc.asn.au>
parents:
1505
diff
changeset
|
343 AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h \ |
93a3726a36d6
Remove unused tests for headers and functions
Matt Johnston <matt@ucc.asn.au>
parents:
1505
diff
changeset
|
344 crypt.h \ |
93a3726a36d6
Remove unused tests for headers and functions
Matt Johnston <matt@ucc.asn.au>
parents:
1505
diff
changeset
|
345 pty.h libutil.h libgen.h inttypes.h stropts.h utmp.h \ |
1426
89f8c5960527
test for linux/pkt-sched.h rather than SO_PRIORITY
Matt Johnston <matt@ucc.asn.au>
parents:
1416
diff
changeset
|
346 utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h \ |
89f8c5960527
test for linux/pkt-sched.h rather than SO_PRIORITY
Matt Johnston <matt@ucc.asn.au>
parents:
1416
diff
changeset
|
347 pam/pam_appl.h netinet/in_systm.h sys/uio.h linux/pkt_sched.h]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
348 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
349 # Checks for typedefs, structures, and compiler characteristics. |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
350 AC_C_CONST |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
351 AC_TYPE_UID_T |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
352 AC_TYPE_MODE_T |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
353 AC_TYPE_PID_T |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
354 AC_TYPE_SIZE_T |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
355 AC_HEADER_TIME |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
356 |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
357 AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t]) |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
358 AC_CHECK_TYPES([struct sockaddr_storage]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
359 AC_CHECK_TYPE([socklen_t], ,[ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
360 AC_MSG_CHECKING([for socklen_t equivalent]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
361 AC_CACHE_VAL([curl_cv_socklen_t_equiv], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
362 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
363 # Systems have either "struct sockaddr *" or |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
364 # "void *" as the second argument to getpeername |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
365 curl_cv_socklen_t_equiv= |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
366 for arg2 in "struct sockaddr" void; do |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
367 for t in int size_t unsigned long "unsigned long"; do |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
368 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
369 #include <sys/types.h> |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
370 #include <sys/socket.h> |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
371 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
372 int getpeername (int, $arg2 *, $t *); |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
373 ]],[[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
374 $t len; |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
375 getpeername(0,0,&len); |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
376 ]])],[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
377 curl_cv_socklen_t_equiv="$t" |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
378 break |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
379 ]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
380 done |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
381 done |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
382 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
383 if test "x$curl_cv_socklen_t_equiv" = x; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
384 AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
385 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
386 ]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
387 AC_MSG_RESULT($curl_cv_socklen_t_equiv) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
388 AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
389 [type to use in place of socklen_t if not defined])], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
390 [#include <sys/types.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
391 #include <sys/socket.h>]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
392 |
67 | 393 # for the fake-rfc2553 stuff - straight from OpenSSH |
394 | |
395 AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [ | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
396 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
67 | 397 #include <sys/types.h> |
398 #include <sys/socket.h> | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
399 ]], |
1088
f2a3570b5110
Test struct existance against sizeof() operator
Gaël PORTAY <gael.portay@gmail.com>
parents:
1033
diff
changeset
|
400 [[ if (sizeof(struct sockaddr_storage)) return 0 ]])], |
67 | 401 [ ac_cv_have_struct_sockaddr_storage="yes" ], |
402 [ ac_cv_have_struct_sockaddr_storage="no" ] | |
403 ) | |
404 ]) | |
405 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then | |
406 AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE) | |
407 fi | |
408 | |
409 AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [ | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
410 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
67 | 411 #include <sys/types.h> |
412 #include <netinet/in.h> | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
413 ]], |
1088
f2a3570b5110
Test struct existance against sizeof() operator
Gaël PORTAY <gael.portay@gmail.com>
parents:
1033
diff
changeset
|
414 [[ if (sizeof(struct sockaddr_in6)) return 0 ]])], |
67 | 415 [ ac_cv_have_struct_sockaddr_in6="yes" ], |
416 [ ac_cv_have_struct_sockaddr_in6="no" ] | |
417 ) | |
418 ]) | |
419 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then | |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
420 AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6,1,Have struct sockaddr_in6) |
67 | 421 fi |
422 | |
423 AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [ | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
424 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
67 | 425 #include <sys/types.h> |
426 #include <netinet/in.h> | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
427 ]], |
1088
f2a3570b5110
Test struct existance against sizeof() operator
Gaël PORTAY <gael.portay@gmail.com>
parents:
1033
diff
changeset
|
428 [[ if (sizeof(struct in6_addr)) return 0 ]])], |
67 | 429 [ ac_cv_have_struct_in6_addr="yes" ], |
430 [ ac_cv_have_struct_in6_addr="no" ] | |
431 ) | |
432 ]) | |
433 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then | |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
434 AC_DEFINE(HAVE_STRUCT_IN6_ADDR,1,Have struct in6_addr) |
67 | 435 fi |
436 | |
437 AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
438 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
67 | 439 #include <sys/types.h> |
440 #include <sys/socket.h> | |
441 #include <netdb.h> | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
442 ]], |
1088
f2a3570b5110
Test struct existance against sizeof() operator
Gaël PORTAY <gael.portay@gmail.com>
parents:
1033
diff
changeset
|
443 [[ if (sizeof(struct addrinfo)) return 0 ]])], |
67 | 444 [ ac_cv_have_struct_addrinfo="yes" ], |
445 [ ac_cv_have_struct_addrinfo="no" ] | |
446 ) | |
447 ]) | |
448 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then | |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
449 AC_DEFINE(HAVE_STRUCT_ADDRINFO,1,Have struct addrinfo) |
67 | 450 fi |
451 | |
452 | |
453 # IRIX has a const char return value for gai_strerror() | |
454 AC_CHECK_FUNCS(gai_strerror,[ | |
455 AC_DEFINE(HAVE_GAI_STRERROR) | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
456 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
67 | 457 #include <sys/types.h> |
458 #include <sys/socket.h> | |
459 #include <netdb.h> | |
460 | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
461 const char *gai_strerror(int);]],[[ |
67 | 462 char *str; |
463 | |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
464 str = gai_strerror(0);]])],[ |
67 | 465 AC_DEFINE(HAVE_CONST_GAI_STRERROR_PROTO, 1, |
466 [Define if gai_strerror() returns const char *])])]) | |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
467 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
468 # for loginrec.c |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
469 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
470 AC_CHECK_MEMBERS([struct utmp.ut_host, struct utmp.ut_pid, struct utmp.ut_type, struct utmp.ut_tv, struct utmp.ut_id, struct utmp.ut_addr, struct utmp.ut_addr_v6, struct utmp.ut_exit, struct utmp.ut_time],,,[ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
471 #include <sys/types.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
472 #if HAVE_UTMP_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
473 #include <utmp.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
474 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
475 ]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
476 |
335
e17f0333c21e
Another stab at getting ss_family happy on older glibc
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
477 AC_CHECK_MEMBERS([struct utmpx.ut_host, struct utmpx.ut_syslen, struct utmpx.ut_type, struct utmpx.ut_id, struct utmpx.ut_addr, struct utmpx.ut_addr_v6, struct utmpx.ut_time, struct utmpx.ut_tv],,,[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
478 #include <sys/types.h> |
262
a3a68c25035e
* workaround for systems such as glibc 2.1 that have
Matt Johnston <matt@ucc.asn.au>
parents:
254
diff
changeset
|
479 #include <sys/socket.h> |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
480 #if HAVE_UTMPX_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
481 #include <utmpx.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
482 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
483 ]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
484 |
336
2dd116db1956
Can't check for ss_family without #including sys/socket.h
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
485 AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],,,[ |
2dd116db1956
Can't check for ss_family without #including sys/socket.h
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
486 #include <sys/types.h> |
2dd116db1956
Can't check for ss_family without #including sys/socket.h
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
487 #include <sys/socket.h> |
2dd116db1956
Can't check for ss_family without #including sys/socket.h
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
488 ]) |
335
e17f0333c21e
Another stab at getting ss_family happy on older glibc
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
489 |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
490 AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
491 AC_CHECK_FUNCS(utmpname) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
492 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
493 AC_CHECK_FUNCS(setutxent utmpxname) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
494 AC_CHECK_FUNCS(logout updwtmp logwtmp) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
495 |
928
7cd89d4e0335
Add new monotonic_now() wrapper so that timeouts are unaffected by
Matt Johnston <matt@ucc.asn.au>
parents:
898
diff
changeset
|
496 # OS X monotonic time |
7cd89d4e0335
Add new monotonic_now() wrapper so that timeouts are unaffected by
Matt Johnston <matt@ucc.asn.au>
parents:
898
diff
changeset
|
497 AC_CHECK_HEADERS([mach/mach_time.h]) |
7cd89d4e0335
Add new monotonic_now() wrapper so that timeouts are unaffected by
Matt Johnston <matt@ucc.asn.au>
parents:
898
diff
changeset
|
498 AC_CHECK_FUNCS(mach_absolute_time) |
7cd89d4e0335
Add new monotonic_now() wrapper so that timeouts are unaffected by
Matt Johnston <matt@ucc.asn.au>
parents:
898
diff
changeset
|
499 |
1280
94d4038bb34c
Use memset_s or explicit_bzero
Matt Johnston <matt@ucc.asn.au>
parents:
1193
diff
changeset
|
500 AC_CHECK_FUNCS(explicit_bzero memset_s) |
94d4038bb34c
Use memset_s or explicit_bzero
Matt Johnston <matt@ucc.asn.au>
parents:
1193
diff
changeset
|
501 |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
502 AC_ARG_ENABLE(bundled-libtom, |
829
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
503 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
504 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
505 Default is to use system if available, otherwise bundled.], |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
506 [ |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
507 if test "x$enableval" = "xyes"; then |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
508 BUNDLED_LIBTOM=1 |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
509 AC_MSG_NOTICE(Forcing bundled libtom*) |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
510 else |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
511 BUNDLED_LIBTOM=0 |
1406
96a282e78085
Fix libtomcrypt/libtommath linking order
Andre McCurdy <armccurdy@gmail.com>
parents:
1280
diff
changeset
|
512 AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", |
898
4f1988cb79ce
Fix building with system libtomcrypt/libtommath
Matt Johnston <matt@ucc.asn.au>
parents:
866
diff
changeset
|
513 [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] ) |
1406
96a282e78085
Fix libtomcrypt/libtommath linking order
Andre McCurdy <armccurdy@gmail.com>
parents:
1280
diff
changeset
|
514 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", |
829
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
515 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) |
4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
Matt Johnston <matt@ucc.asn.au>
parents:
800
diff
changeset
|
516 fi |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
517 ], |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
518 [ |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
519 BUNDLED_LIBTOM=0 |
1406
96a282e78085
Fix libtomcrypt/libtommath linking order
Andre McCurdy <armccurdy@gmail.com>
parents:
1280
diff
changeset
|
520 AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1) |
96a282e78085
Fix libtomcrypt/libtommath linking order
Andre McCurdy <armccurdy@gmail.com>
parents:
1280
diff
changeset
|
521 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1) |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
522 ] |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
523 ) |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
524 |
587
1151059c5eff
Work properly again with bundled libtom*. autoconf is a hassle.
Matt Johnston <matt@ucc.asn.au>
parents:
585
diff
changeset
|
525 if test $BUNDLED_LIBTOM = 1 ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
526 AC_DEFINE(BUNDLED_LIBTOM,1,Use bundled libtom) |
587
1151059c5eff
Work properly again with bundled libtom*. autoconf is a hassle.
Matt Johnston <matt@ucc.asn.au>
parents:
585
diff
changeset
|
527 fi |
1151059c5eff
Work properly again with bundled libtom*. autoconf is a hassle.
Matt Johnston <matt@ucc.asn.au>
parents:
585
diff
changeset
|
528 |
898
4f1988cb79ce
Fix building with system libtomcrypt/libtommath
Matt Johnston <matt@ucc.asn.au>
parents:
866
diff
changeset
|
529 AC_SUBST(LIBTOM_LIBS) |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
530 AC_SUBST(BUNDLED_LIBTOM) |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
531 |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
532 dnl Added from OpenSSH 3.6.1p2's configure.ac |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
533 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
534 dnl allow user to disable some login recording features |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
535 AC_ARG_ENABLE(lastlog, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
536 [ --disable-lastlog Disable use of lastlog even if detected [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
537 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
538 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
539 AC_DEFINE(DISABLE_LASTLOG,1,Disable use of lastlog()) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
540 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
541 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
542 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
543 AC_ARG_ENABLE(utmp, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
544 [ --disable-utmp Disable use of utmp even if detected [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
545 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
546 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
547 AC_DEFINE(DISABLE_UTMP,1,Disable use of utmp) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
548 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
549 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
550 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
551 AC_ARG_ENABLE(utmpx, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
552 [ --disable-utmpx Disable use of utmpx even if detected [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
553 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
554 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
555 AC_DEFINE(DISABLE_UTMPX,1,Disable use of utmpx) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
556 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
557 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
558 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
559 AC_ARG_ENABLE(wtmp, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
560 [ --disable-wtmp Disable use of wtmp even if detected [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
561 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
562 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
563 AC_DEFINE(DISABLE_WTMP,1,Disable use of wtmp) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
564 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
565 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
566 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
567 AC_ARG_ENABLE(wtmpx, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
568 [ --disable-wtmpx Disable use of wtmpx even if detected [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
569 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
570 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
571 AC_DEFINE(DISABLE_WTMPX,1,Disable use of wtmpx) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
572 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
573 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
574 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
575 AC_ARG_ENABLE(loginfunc, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
576 [ --disable-loginfunc Disable use of login() etc. [no]], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
577 [ no_loginfunc_check=1 |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
578 AC_MSG_NOTICE([Not using login() etc]) ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
579 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
580 AC_ARG_ENABLE(pututline, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
581 [ --disable-pututline Disable use of pututline() etc. ([uw]tmp) [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
582 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
583 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
584 AC_DEFINE(DISABLE_PUTUTLINE,1,Disable use of pututline()) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
585 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
586 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
587 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
588 AC_ARG_ENABLE(pututxline, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
589 [ --disable-pututxline Disable use of pututxline() etc. ([uw]tmpx) [no]], |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
590 [ |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
591 if test "x$enableval" = "xno" ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
592 AC_DEFINE(DISABLE_PUTUTXLINE,1,Disable use of pututxline()) |
1397
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
593 fi |
18c0b0e450ff
Fix configure options using AC_ARG_ENABLE
Stefan Hauser <stefan@shauser.net>
parents:
1280
diff
changeset
|
594 ] |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
595 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
596 AC_ARG_WITH(lastlog, |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
597 [ --with-lastlog=FILE|DIR specify lastlog location [common locations]], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
598 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
599 if test "x$withval" = "xno" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
600 AC_DEFINE(DISABLE_LASTLOG) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
601 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
602 conf_lastlog_location=$withval |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
603 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
604 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
605 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
606 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
607 if test -z "$no_loginfunc_check"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
608 dnl Checks for libutil functions (login(), logout() etc, not openpty() ) |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
609 AC_SEARCH_LIBS(login, util bsd, [AC_DEFINE(HAVE_LOGIN,1,[Have login() function])]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
610 AC_CHECK_FUNCS(logout updwtmp logwtmp) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
611 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
612 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
613 dnl lastlog, [uw]tmpx? detection |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
614 dnl NOTE: set the paths in the platform section to avoid the |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
615 dnl need for command-line parameters |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
616 dnl lastlog and [uw]tmp are subject to a file search if all else fails |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
617 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
618 dnl lastlog detection |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
619 dnl NOTE: the code itself will detect if lastlog is a directory |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
620 AC_MSG_CHECKING([if your system defines LASTLOG_FILE]) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
621 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
622 #include <sys/types.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
623 #include <utmp.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
624 #ifdef HAVE_LASTLOG_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
625 # include <lastlog.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
626 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
627 #ifdef HAVE_PATHS_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
628 # include <paths.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
629 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
630 #ifdef HAVE_LOGIN_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
631 # include <login.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
632 #endif |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
633 ]], |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
634 [[ char *lastlog = LASTLOG_FILE; ]])], |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
635 [ AC_MSG_RESULT(yes) ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
636 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
637 AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
638 AC_MSG_CHECKING([if your system defines _PATH_LASTLOG]) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
639 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
640 #include <sys/types.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
641 #include <utmp.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
642 #ifdef HAVE_LASTLOG_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
643 # include <lastlog.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
644 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
645 #ifdef HAVE_PATHS_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
646 # include <paths.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
647 #endif |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
648 ]], |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
649 [[ char *lastlog = _PATH_LASTLOG; ]])], |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
650 [ AC_MSG_RESULT(yes) ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
651 [ |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
652 AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
653 system_lastlog_path=no |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
654 ]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
655 ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
656 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
657 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
658 if test -z "$conf_lastlog_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
659 if test x"$system_lastlog_path" = x"no" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
660 for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
661 if (test -d "$f" || test -f "$f") ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
662 conf_lastlog_location=$f |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
663 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
664 done |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
665 if test -z "$conf_lastlog_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
666 AC_MSG_WARN([** Cannot find lastlog **]) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
667 dnl Don't define DISABLE_LASTLOG - that means we don't try wtmp/wtmpx |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
668 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
669 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
670 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
671 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
672 if test -n "$conf_lastlog_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
673 AC_DEFINE_UNQUOTED(CONF_LASTLOG_FILE, "$conf_lastlog_location", lastlog file location) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
674 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
675 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
676 dnl utmp detection |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
677 AC_MSG_CHECKING([if your system defines UTMP_FILE]) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
678 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
679 #include <sys/types.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
680 #include <utmp.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
681 #ifdef HAVE_PATHS_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
682 # include <paths.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
683 #endif |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
684 ]], |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
685 [[ char *utmp = UTMP_FILE; ]])], |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
686 [ AC_MSG_RESULT(yes) ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
687 [ AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
688 system_utmp_path=no ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
689 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
690 if test -z "$conf_utmp_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
691 if test x"$system_utmp_path" = x"no" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
692 for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
693 if test -f $f ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
694 conf_utmp_location=$f |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
695 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
696 done |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
697 if test -z "$conf_utmp_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
698 AC_DEFINE(DISABLE_UTMP) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
699 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
700 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
701 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
702 if test -n "$conf_utmp_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
703 AC_DEFINE_UNQUOTED(CONF_UTMP_FILE, "$conf_utmp_location", utmp file location) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
704 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
705 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
706 dnl wtmp detection |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
707 AC_MSG_CHECKING([if your system defines WTMP_FILE]) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
708 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
709 #include <sys/types.h> |
865 | 710 #ifdef HAVE_UTMP_H |
711 # include <utmp.h> | |
712 #endif | |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
713 #ifdef HAVE_PATHS_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
714 # include <paths.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
715 #endif |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
716 ]], |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
717 [[ char *wtmp = WTMP_FILE; ]])], |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
718 [ AC_MSG_RESULT(yes) ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
719 [ AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
720 system_wtmp_path=no ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
721 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
722 if test -z "$conf_wtmp_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
723 if test x"$system_wtmp_path" = x"no" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
724 for f in /usr/adm/wtmp /var/log/wtmp; do |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
725 if test -f $f ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
726 conf_wtmp_location=$f |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
727 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
728 done |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
729 if test -z "$conf_wtmp_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
730 AC_DEFINE(DISABLE_WTMP) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
731 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
732 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
733 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
734 if test -n "$conf_wtmp_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
735 AC_DEFINE_UNQUOTED(CONF_WTMP_FILE, "$conf_wtmp_location", wtmp file location) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
736 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
737 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
738 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
739 dnl utmpx detection - I don't know any system so perverse as to require |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
740 dnl utmpx, but not define UTMPX_FILE (ditto wtmpx.) No doubt it's out |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
741 dnl there, though. |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
742 AC_MSG_CHECKING([if your system defines UTMPX_FILE]) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
743 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
744 #include <sys/types.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
745 #include <utmp.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
746 #ifdef HAVE_UTMPX_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
747 #include <utmpx.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
748 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
749 #ifdef HAVE_PATHS_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
750 # include <paths.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
751 #endif |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
752 ]], |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
753 [[ char *utmpx = UTMPX_FILE; ]])], |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
754 [ AC_MSG_RESULT(yes) ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
755 [ AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
756 system_utmpx_path=no ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
757 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
758 if test -z "$conf_utmpx_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
759 if test x"$system_utmpx_path" = x"no" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
760 AC_DEFINE(DISABLE_UTMPX) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
761 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
762 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
763 AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location", utmpx file location) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
764 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
765 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
766 dnl wtmpx detection |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
767 AC_MSG_CHECKING([if your system defines WTMPX_FILE]) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
768 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
769 #include <sys/types.h> |
865 | 770 #ifdef HAVE_UTMP_H |
771 # include <utmp.h> | |
772 #endif | |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
773 #ifdef HAVE_UTMPX_H |
865 | 774 # include <utmpx.h> |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
775 #endif |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
776 #ifdef HAVE_PATHS_H |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
777 # include <paths.h> |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
778 #endif |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
779 ]], |
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
780 [[ char *wtmpx = WTMPX_FILE; ]])], |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
781 [ AC_MSG_RESULT(yes) ], |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
782 [ AC_MSG_RESULT(no) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
783 system_wtmpx_path=no ] |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
784 ) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
785 if test -z "$conf_wtmpx_location"; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
786 if test x"$system_wtmpx_path" = x"no" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
787 AC_DEFINE(DISABLE_WTMPX) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
788 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
789 else |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
790 AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location", wtmpx file location) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
791 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
792 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
793 # Checks for library functions. |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
794 AC_PROG_GCC_TRADITIONAL |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
795 AC_FUNC_MEMCMP |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
796 AC_FUNC_SELECT_ARGTYPES |
1550
93a3726a36d6
Remove unused tests for headers and functions
Matt Johnston <matt@ucc.asn.au>
parents:
1505
diff
changeset
|
797 AC_CHECK_FUNCS([getpass getspnam getusershell putenv]) |
93a3726a36d6
Remove unused tests for headers and functions
Matt Johnston <matt@ucc.asn.au>
parents:
1505
diff
changeset
|
798 AC_CHECK_FUNCS([clearenv strlcpy strlcat daemon basename _getpty getaddrinfo ]) |
93a3726a36d6
Remove unused tests for headers and functions
Matt Johnston <matt@ucc.asn.au>
parents:
1505
diff
changeset
|
799 AC_CHECK_FUNCS([freeaddrinfo getnameinfo fork writev getgrouplist]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
800 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
801 AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
802 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
803 # Solaris needs ptmx |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
804 if test -z "$no_ptmx_check" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
805 if test x"$cross_compiling" = x"no" ; then |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
806 if test -e /dev/ptmx ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
807 AC_DEFINE(USE_DEV_PTMX,1,Use /dev/ptmx) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
808 fi |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
809 else |
431
126687f635dc
Quote some message in configure
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
810 AC_MSG_NOTICE([Not checking for /dev/ptmx, we're cross-compiling]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
811 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
812 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
813 |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
814 if test -z "$no_ptc_check" ; then |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
815 if test x"$cross_compiling" = x"no" ; then |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
816 if test -e /dev/ptc ; then |
1399
47a3a3cb7d45
Set configure #defines to 1. Escape some strings for m4
Matt Johnston <matt@ucc.asn.au>
parents:
1397
diff
changeset
|
817 AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,Use /dev/ptc & /dev/pts) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
818 fi |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
819 else |
431
126687f635dc
Quote some message in configure
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
820 AC_MSG_NOTICE([Not checking for /dev/ptc & /dev/pts since we're cross-compiling]) |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
821 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
822 fi |
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
823 |
67 | 824 AC_EXEEXT |
366
59531221b846
Fix up separate-directory building for libtomcrypt
Matt Johnston <matt@ucc.asn.au>
parents:
336
diff
changeset
|
825 |
998
3a32727986ee
Allow configure with libtomcrypt/libtommath directories missing
Elan Ruusamäe <glen@delfi.ee>
parents:
928
diff
changeset
|
826 if test $BUNDLED_LIBTOM = 1 ; then |
1473
67bcd5fa40c6
generate list of libtomcrypt directories automatically
Matt Johnston <matt@ucc.asn.au>
parents:
1469
diff
changeset
|
827 (cd $srcdir; find libtomcrypt -type d) | xargs mkdir -pv |
998
3a32727986ee
Allow configure with libtomcrypt/libtommath directories missing
Elan Ruusamäe <glen@delfi.ee>
parents:
928
diff
changeset
|
828 LIBTOM_FILES="libtomcrypt/Makefile libtommath/Makefile" |
3a32727986ee
Allow configure with libtomcrypt/libtommath directories missing
Elan Ruusamäe <glen@delfi.ee>
parents:
928
diff
changeset
|
829 fi |
1473
67bcd5fa40c6
generate list of libtomcrypt directories automatically
Matt Johnston <matt@ucc.asn.au>
parents:
1469
diff
changeset
|
830 |
4
fe6bca95afa7
Makefile.in contains updated files required
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
831 AC_CONFIG_HEADER(config.h) |
998
3a32727986ee
Allow configure with libtomcrypt/libtommath directories missing
Elan Ruusamäe <glen@delfi.ee>
parents:
928
diff
changeset
|
832 AC_CONFIG_FILES(Makefile $LIBTOM_FILES) |
856
f56c41030c15
Replace some deprecated macros with other ones, from Daniel Richard G.
Matt Johnston <matt@ucc.asn.au>
parents:
835
diff
changeset
|
833 AC_OUTPUT |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
834 |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
835 AC_MSG_NOTICE() |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
836 if test $BUNDLED_LIBTOM = 1 ; then |
1159
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
837 AC_MSG_NOTICE([Using bundled libtomcrypt and libtommath]) |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
838 else |
1159
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
839 AC_MSG_NOTICE([Using system libtomcrypt and libtommath]) |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
840 fi |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
841 |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
842 |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
843 if test "x$ac_cv_func_getpass" != xyes; then |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
844 AC_MSG_NOTICE() |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
845 AC_MSG_NOTICE([getpass() not available, dbclient will only have public-key authentication]) |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
846 fi |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
847 |
1186
a4ce76e6fb63
Another attempt at test for crypt()
Matt Johnston <matt@ucc.asn.au>
parents:
1185
diff
changeset
|
848 if test "t$found_crypt_func" != there; then |
1159
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
849 AC_MSG_NOTICE() |
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
850 AC_MSG_NOTICE([crypt() not available, dropbear server will not have password authentication]) |
585
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
851 fi |
d194db6f9453
Use system libtomcrypt/libtommath if available. Doesn't currently
Matt Johnston <matt@ucc.asn.au>
parents:
573
diff
changeset
|
852 |
321
fa9c45d09727
change AC_MSG_RESULT to AC_MSG_NOTICE in configure.in, add AC_SYS_LARGEFILE
Matt Johnston <matt@ucc.asn.au>
parents:
262
diff
changeset
|
853 AC_MSG_NOTICE() |
1159
f567a4152c14
Test for crypt() rather than crypt.h
Matt Johnston <matt@ucc.asn.au>
parents:
1158
diff
changeset
|
854 AC_MSG_NOTICE([Now edit options.h to choose features.]) |