diff options
author | Damien Miller <djm@mindrot.org> | 2000-01-15 14:12:03 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-01-15 14:12:03 +1100 |
commit | b29ea913cdf6eb02cc4ccc4ce3371d678d1f562d (patch) | |
tree | a525ee7b8e8e173babe1936d65138ec3a6392293 /configure.in | |
parent | 34132e54cbd221d17d373fc54f4e3f7b85727f7f (diff) |
- Add --with-xauth-path configure directive and explicit test for
/usr/openwin/bin/xauth for Solaris systems. Report from Anders
Nordby <anders@fix.no>
- Fix incorrect detection of /dev/ptmx on Linux systems that lack
openpty. Report from John Seifarth <john@waw.be>
- Look for intXX_t and u_intXX_t in sys/bitypes.h if they are not in
sys/types.h. Fixes problems on SCO, report from Gary E. Miller
<gem@rellim.com>
- Use __snprintf and __vnsprintf if they are found where snprintf and
vnsprintf are lacking. Suggested by Ben Taylor <bent@shell.clark.net>
and others.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/configure.in b/configure.in index ab175d409..06a770764 100644 --- a/configure.in +++ b/configure.in | |||
@@ -11,9 +11,7 @@ AC_PROG_INSTALL | |||
11 | AC_CHECK_PROG(AR, ar, ar) | 11 | AC_CHECK_PROG(AR, ar, ar) |
12 | AC_PATH_PROG(PERL, perl) | 12 | AC_PATH_PROG(PERL, perl) |
13 | AC_SUBST(PERL) | 13 | AC_SUBST(PERL) |
14 | AC_PATH_PROG(xauth_path, xauth) | ||
15 | 14 | ||
16 | dnl Use ip address instead of hostname in $DISPLAY | ||
17 | AC_ARG_WITH(rsh, | 15 | AC_ARG_WITH(rsh, |
18 | [ --with-rsh=PATH Specify path to remote shell program ], | 16 | [ --with-rsh=PATH Specify path to remote shell program ], |
19 | [ | 17 | [ |
@@ -26,6 +24,21 @@ AC_ARG_WITH(rsh, | |||
26 | ] | 24 | ] |
27 | ) | 25 | ) |
28 | 26 | ||
27 | AC_ARG_WITH(xauth-path, | ||
28 | [ --with-xauth-path=PATH Specify path to xauth program ], | ||
29 | [ | ||
30 | if test "x$withval" != "$xno" ; then | ||
31 | AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval") | ||
32 | fi | ||
33 | ], | ||
34 | [ | ||
35 | AC_PATH_PROG(xauth_path, xauth) | ||
36 | if test ! -z "$xauth_path" -a -x "/usr/openwin/bin/xauth" ; then | ||
37 | xauth_path="/usr/openwin/bin/xauth" | ||
38 | fi | ||
39 | ] | ||
40 | ) | ||
41 | |||
29 | if test ! -z "$xauth_path" ; then | 42 | if test ! -z "$xauth_path" ; then |
30 | AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") | 43 | AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") |
31 | fi | 44 | fi |
@@ -70,6 +83,9 @@ case "$host" in | |||
70 | no_libsocket=1 | 83 | no_libsocket=1 |
71 | no_libnsl=1 | 84 | no_libnsl=1 |
72 | ;; | 85 | ;; |
86 | *-*-linux*) | ||
87 | no_dev_ptmx=1 | ||
88 | ;; | ||
73 | *-*-solaris*) | 89 | *-*-solaris*) |
74 | AC_DEFINE(USE_UTMPX) | 90 | AC_DEFINE(USE_UTMPX) |
75 | ;; | 91 | ;; |
@@ -125,10 +141,10 @@ if test -z "$no_libnsl" ; then | |||
125 | fi | 141 | fi |
126 | 142 | ||
127 | dnl Checks for header files. | 143 | dnl Checks for header files. |
128 | AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) | 144 | AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) |
129 | 145 | ||
130 | dnl Checks for library functions. | 146 | dnl Checks for library functions. |
131 | AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo _getpty innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf) | 147 | AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty __snprintf __vsnprintf) |
132 | 148 | ||
133 | AC_CHECK_FUNC(login, | 149 | AC_CHECK_FUNC(login, |
134 | [AC_DEFINE(HAVE_LOGIN)], | 150 | [AC_DEFINE(HAVE_LOGIN)], |
@@ -154,6 +170,7 @@ AC_TRY_COMPILE( | |||
154 | [ | 170 | [ |
155 | AC_DEFINE(HAVE_INTXX_T) | 171 | AC_DEFINE(HAVE_INTXX_T) |
156 | AC_MSG_RESULT(yes) | 172 | AC_MSG_RESULT(yes) |
173 | have_intxx_t=1 | ||
157 | ], | 174 | ], |
158 | [AC_MSG_RESULT(no)] | 175 | [AC_MSG_RESULT(no)] |
159 | ) | 176 | ) |
@@ -165,10 +182,32 @@ AC_TRY_COMPILE( | |||
165 | [ | 182 | [ |
166 | AC_DEFINE(HAVE_U_INTXX_T) | 183 | AC_DEFINE(HAVE_U_INTXX_T) |
167 | AC_MSG_RESULT(yes) | 184 | AC_MSG_RESULT(yes) |
185 | have_u_intxx_t=1 | ||
168 | ], | 186 | ], |
169 | [AC_MSG_RESULT(no)] | 187 | [AC_MSG_RESULT(no)] |
170 | ) | 188 | ) |
171 | 189 | ||
190 | if test -z "$have_u_intxx_t" -a -z "$have_intxx_t" -a \ | ||
191 | "x$ac_cv_header_sys_bitypes_h" = "xyes" | ||
192 | then | ||
193 | AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h]) | ||
194 | AC_TRY_COMPILE( | ||
195 | [#include <sys/bitypes.h>], | ||
196 | [ | ||
197 | u_int16_t c; u_int32_t d; | ||
198 | int16_t e; int32_t f; | ||
199 | c = 1235; d = 1235; | ||
200 | e = 1235; f = 1235; | ||
201 | ], | ||
202 | [ | ||
203 | AC_DEFINE(HAVE_U_INTXX_T) | ||
204 | AC_DEFINE(HAVE_INTXX_T) | ||
205 | AC_MSG_RESULT(yes) | ||
206 | ], | ||
207 | [AC_MSG_RESULT(no)] | ||
208 | ) | ||
209 | fi | ||
210 | |||
172 | AC_MSG_CHECKING([for uintXX_t types]) | 211 | AC_MSG_CHECKING([for uintXX_t types]) |
173 | AC_TRY_COMPILE( | 212 | AC_TRY_COMPILE( |
174 | [#include <sys/types.h>], | 213 | [#include <sys/types.h>], |
@@ -468,7 +507,9 @@ AC_ARG_WITH(dante, | |||
468 | ] | 507 | ] |
469 | ) | 508 | ) |
470 | 509 | ||
471 | AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)) | 510 | if test ! -z "$no_dev_ptmx" ; then |
511 | AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)) | ||
512 | fi | ||
472 | AC_CHECK_FILE("/dev/ptc", AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)) | 513 | AC_CHECK_FILE("/dev/ptc", AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)) |
473 | 514 | ||
474 | AC_MSG_CHECKING([whether libc defines __progname]) | 515 | AC_MSG_CHECKING([whether libc defines __progname]) |