configure.ac 29.9 KB
Newer Older
Niels Möller's avatar
Niels Möller committed
1
dnl Process this file with autoconf to produce a configure script.
Niels Möller's avatar
Niels Möller committed
2 3 4

dnl Note that version string is included in the handshake message, and
dnl must therefore not contain any space.
5
AC_INIT([lsh], [2.9.2-exp], [bug-lsh@gnu.org])
Niels Möller's avatar
Niels Möller committed
6
AC_PREREQ(2.52)
7
AC_CONFIG_SRCDIR([src/lsh.c])
8 9 10
# Needed to stop autoconf from looking for files in parent directories.
AC_CONFIG_AUX_DIR([.])
	
11
AC_CONFIG_HEADER(src/config.h)
12

13 14 15 16
# GNU libc defaults to supplying the ISO C library functions only. 
# initgroups() and strsignal() are extensions; the _GNU_SOURCE define
# enables these extensions.
# Enable it on all systems; no problems have been reported with it so far.
Niels Möller's avatar
Niels Möller committed
17

18
AC_GNU_SOURCE
Niels Möller's avatar
Niels Möller committed
19

20
# Check options
21
AC_ARG_ENABLE(debug_alloc,
22
  AC_HELP_STRING([--enable-debug-alloc], [Enable memory allocation sanity checks]),,
23
  [enable_debug_alloc=no])
24 25 26

AH_TEMPLATE([DEBUG_ALLOC],
	    [Define to enable sanity checking on memory allocation and casting])
27
if test x$enable_debug_alloc = xyes ; then
28 29 30
  AC_DEFINE(DEBUG_ALLOC)
fi

31
AC_ARG_ENABLE(debug_trace,
32
  AC_HELP_STRING([--enable-debug-trace], [Enable tracing support]),,
33
  [enable_debug_trace=no])
34

35
AH_TEMPLATE([DEBUG_TRACE], [Define to enable tracing])
36
if test x$enable_debug_trace = xyes ; then
37 38 39
  AC_DEFINE(DEBUG_TRACE)
fi

Niels Möller's avatar
Niels Möller committed
40
AC_ARG_ENABLE(gcov,
41
  AC_HELP_STRING([--enable-gcov], [Instrument for gcov (requires a modern gcc)]),,
Niels Möller's avatar
Niels Möller committed
42 43
  [enable_gcov=no])

Niels Möller's avatar
Niels Möller committed
44 45 46 47
AC_ARG_ENABLE(profiling,
  AC_HELP_STRING([--enable-profiling], [Instrument for gprof profiling]),,
  [enable_profiling=no])

48
# FIXME: Not supported at the moment.
49 50 51 52
with_zlib=no
# AC_ARG_WITH(zlib,
#   AC_HELP_STRING([--without-zlib], [Don't use zlib compression]),,
#   [with_zlib=yes])
53

54 55 56 57 58 59 60 61 62 63
AC_ARG_WITH(tcpwrappers,
  AC_HELP_STRING([--with-tcpwrappers], 
                [Use tcp-wrappers for filtering connections]),
  [if test -z "$withval"; then 
    with_tcpwrappers=yes; 
  else 
    with_tcpwrappers="$withval";
  fi],
  [with_tcpwrappers=no])

64 65
# Checking this variable is delayed until we have checked if zlib is
# actually available.
66

67
AC_ARG_ENABLE(pty,
68
  AC_HELP_STRING([--without-pty], [Disable pty support]),,
69
  [enable_pty=yes])
70

71
AH_TEMPLATE([WITH_PTY_SUPPORT], [Define to enable pty support])
72
if test x$enable_pty = xyes ; then
73 74 75
  AC_DEFINE(WITH_PTY_SUPPORT)
fi

76
AC_ARG_ENABLE(srp,
77
  AC_HELP_STRING([--disable-srp], [Disable the (experimental) support for SRP]),,
78 79
  [enable_srp=yes])

80 81 82 83
AC_ARG_ENABLE(gss,
  AC_HELP_STRING([--disable-gss], [Disable the (experimental) support for GSS]),,
  [enable_gss=yes])

84
AC_ARG_ENABLE(kerberos,
85
  AC_HELP_STRING([--disable-kerberos], [Don't support kerberos]),,
86
  [enable_kerberos=yes])
87

88 89 90 91
AC_ARG_ENABLE(pam,
  AC_HELP_STRING([--disable-pam], [Don't support PAM]),,
  [enable_pam=yes])

92
AH_TEMPLATE([WITH_SRP], [Define if SRP should be supported])
93 94
if test x$enable_srp = xyes ; then
  AC_DEFINE(WITH_SRP)
95
  SRP_PROGRAM=srp-gen
96 97
fi

98 99
AC_SUBST(SRP_PROGRAM)

100 101 102 103 104 105 106 107 108 109 110 111
AC_ARG_ENABLE(initgroups_workaround,
  AC_HELP_STRING([--enable-initgroups-workaround],
		 [Use a special initgroups for supporting more groups]),,
  [enable_initgroups_workaround=no])

AH_TEMPLATE([INITGROUPS_WORKAROUND],
	    [Define to enable the initgroups workaround])
if test x$enable_initgroups_workaround = xyes ; then
  AC_DEFINE(INITGROUPS_WORKAROUND)
fi


112
AC_ARG_ENABLE(tcp_forward,
113
  AC_HELP_STRING([--disable-tcp-forward], [Disable tcp forwarding]),,
114
  [enable_tcp_forward=yes])
115

116
AH_TEMPLATE([WITH_TCP_FORWARD], [Define to enable tcp forwarding])
117
if test x$enable_tcp_forward = xyes ; then
118 119
  AC_DEFINE(WITH_TCP_FORWARD)
fi
120

121
AC_ARG_ENABLE(x11_forward,
122
  AC_HELP_STRING([--disable-x11-forward], [Disable x11 forwarding (proxy only)]),,
123
  [enable_x11_forward=yes])
124

125
AH_TEMPLATE([WITH_X11_FORWARD], [Define to enable x11 forwarding])
126
if test x$enable_x11_forward = xyes ; then
127 128 129
  AC_DEFINE(WITH_X11_FORWARD)
fi

130
AC_ARG_ENABLE(agent_forward,
131
  AC_HELP_STRING([--disable-agent-forward], [Disable auth-agent forwarding (proxy only)]),,
132 133
  [with_agent_forward=yes])

134 135
AH_TEMPLATE([WITH_AGENT_FORWARD],
	    [Define to enable authentication agent forwarding])
136
if test x$disable_agent_forward = xyes ; then
137 138 139
  AC_DEFINE(WITH_AGENT_FORWARD)
fi

140
AC_ARG_WITH(scheme,
141
  AC_HELP_STRING([[--with-scheme[=PROGRAM]]], [Use a particular scheme implementation]),,
142
  [with_scheme=])
143 144

AC_ARG_WITH(system-argp,
145 146
  AC_HELP_STRING([--with-system-argp], [Use the argp parser in libc]),,
  [with_system_argp=no])
147

148 149 150 151
AC_ARG_WITH(system-libspki,
  AC_HELP_STRING([--with-system-libspki], [Use the installed spki library]),,
  [with_system_libspki=no])

152
# IPv6 support
153
AC_ARG_ENABLE(ipv6,
154
  AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support]),,
155 156
  [enable_ipv6=yes])

157
# utmp/wtmp logging 
158
AC_ARG_ENABLE(utmp,
159
  AC_HELP_STRING([--disable-utmp], [Disable utmp and wtmp support]),,
160 161
  [enable_utmp=yes])

162
AC_ARG_WITH(include-path,
163
  AC_HELP_STRING([--with-include-path], [A colon-separated list of directories to search for include files]),,
164 165 166
  [with_include_path=''])

if test x$with_include_path != x ; then
167
  CPPFLAGS="$CPPFLAGS -I`echo $with_include_path | sed 's/:/ -I/g'`"
168 169
fi

170
AC_ARG_WITH(lib-path,
171
  AC_HELP_STRING([--with-lib-path], [A colon-separated list of directories to search for libraries]),,
172 173 174
  [with_lib_path=''])

if test x$with_lib_path != x ; then
175
  LDFLAGS="$LDFLAGS -L`echo $with_lib_path | sed 's/:/ -L/g'`"
176 177 178 179 180 181 182 183 184
fi

LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
    `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \
    /usr/local/lib /sw/local/lib /sw/lib \
    /usr/gnu/lib /opt/gnu/lib /sw/gnu/lib /usr/freeware/lib /usr/pkg/lib])

dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS

185
# Checks for programs.
Niels Möller's avatar
Niels Möller committed
186 187
AC_PROG_CC
AC_PROG_MAKE_SET
Niels Möller's avatar
Niels Möller committed
188
AC_PROG_RANLIB
Niels Möller's avatar
Niels Möller committed
189

190
if test "x$am_cv_prog_cc_stdc" = xno ; then
191
  AC_MSG_ERROR([the C compiler doesn't handle ANSI-C])
192 193
fi

Niels Möller's avatar
Niels Möller committed
194 195
LSH_CCPIC

196 197 198 199 200 201
AC_PROG_INSTALL

# According to the autoconf manual, needs install-sh from
# autoconf-2.60 or automake-1.10 to avoid races.
AC_PROG_MKDIR_P

202 203 204 205 206 207 208
LSH_DEPENDENCY_TRACKING

if test x$enable_dependency_tracking = xyes ; then
  # Since the makefiles use include to get the dependency files, we must
  # make sure that the files exist.

  AC_CONFIG_COMMANDS([dummy-dep-files],
209 210
  [(cd "$srcdir/src" && echo *.c testsuite/*.c) \
 | tr ' ' '\n' |sed 's/\.c$//' \
211 212 213 214 215
 | (cd src && while read f; do echo > "$f.o.d"; done \
           && for f in format lsh_string parse werror; do echo > "$f.mo.d"; done)
])
fi

216 217
# Use a particular scheme implementation?
if test x$with_scheme != x ; then
218 219 220 221 222 223 224 225 226
  # If an absolute path is given, don't AC_PATH_PROG but just use it
  if grep "^/" > /dev/null <<EOF
$with_scheme 
EOF  
  then
    SCHEME_PROGRAM="$with_scheme" 
  else
    AC_PATH_PROG(SCHEME_PROGRAM, $with_scheme,, $PATH)
  fi
227
else  
228
  AC_PATH_PROGS(SCHEME_PROGRAM, guile scsh,, $PATH)
229
fi
230

231
if test "x$SCHEME_PROGRAM" = x ; then
232 233
  AC_MSG_WARN([No scheme implementation found.
This is fine as long as you don't modify the source files.])
234 235 236
  SCHEME_PROGRAM=false
fi

237 238 239
SCHEME_NAME=`basename $SCHEME_PROGRAM`
AC_SUBST(SCHEME_NAME)

240 241 242 243 244 245 246 247 248 249
if test "x$GROFF" = x; then
  AC_PATH_PROG(GROFF, groff,, $PATH)
fi
AC_ARG_VAR(GROFF, groff)

if test "x$M4" = x; then
  AC_PATH_PROG(M4, m4, m4)
fi
AC_ARG_VAR(M4, M4 macro processor)

Niels Möller's avatar
Niels Möller committed
250 251 252 253 254 255 256 257
# Check if we're using dynamic linking. For the getpwnam-wrapper.so
# hack used by the testsuite, we need LD_PRELOAD and $(CC) -shared.
# Might need a more sophisticated test.

IF_LD_PRELOAD='#'

if test "x$GCC" = xyes ; then
  for d in /lib /lib64 /lib/64 ; do
258
    for f in $d/libc.so $d/libc.so.* ; do
Niels Möller's avatar
Niels Möller committed
259 260 261 262 263 264 265 266 267
      if test -x $f ; then
        IF_LD_PRELOAD=''
        break
      fi
    done
  done
fi

AC_SUBST(IF_LD_PRELOAD)
268

269
# Checks for header files.
Niels Möller's avatar
Niels Möller committed
270
AC_HEADER_STDC
271

272 273 274
# We don't look in gmp2 anymore, as we need gmp-3.1 or better.
AC_CHECK_HEADERS(gmp.h,,
  AC_MSG_ERROR([gmp.h not found]))
275
  
276
AC_CHECK_HEADERS(fcntl.h strings.h sys/time.h unistd.h)
277
AC_CHECK_HEADERS(shadow.h)
278

279 280 281
if test x$with_zlib = xyes; then
  AC_CHECK_HEADERS(zlib.h,, [with_zlib=no])
fi
282
AC_CHECK_HEADERS(libutil.h)
283
AC_CHECK_HEADERS(crypt.h)
284 285
AC_CHECK_HEADERS(pty.h)
AC_CHECK_HEADERS(stropts.h)
286
AC_CHECK_HEADERS(syslog.h)
287
AC_CHECK_HEADERS(argp.h)
288
AC_CHECK_HEADERS(sys/resource.h)
Niels Möller's avatar
Niels Möller committed
289
AC_CHECK_HEADERS(sys/filio.h)
Niels Möller's avatar
Niels Möller committed
290
AC_CHECK_HEADERS(ucred.h)
291

292
AC_CHECK_HEADERS(utmp.h, [have_utmp_h=yes], [have_utmp_h=no])
293
AC_CHECK_HEADERS(utmpx.h, [have_utmpx_h=yes], [have_utmpx_h=no])
294

295 296 297 298
dnl With current autoconfs we can't check for struct ut_tv with
dnl AC_CHECK_MEMBERS, but we can check for sub members. Leave the
dnl ut_tv check for clarity.

299
if test x$have_utmp_h = xyes; then
300 301 302 303 304
  # Currently, no support for pure bsd systems where login(3) and
  # friends are the only library functions for updating the utmp and
  # wtmp data. FIXME: Don't do this if we're going to use the the utmpx
  # functions instead.
  AC_CHECK_FUNC([pututline],,[enable_utmp=no])
305 306 307
  AC_CHECK_MEMBERS([struct utmp.ut_host,
		    struct utmp.ut_name,
		    struct utmp.ut_user,
308 309
		    struct utmp.ut_time,
		    struct utmp.ut_tv,
310
		    struct utmp.ut_tv.tv_sec,
311 312 313
		    struct utmp.ut_id,
		    struct utmp.ut_syslen,
		    struct utmp.ut_session,
314 315
		    struct utmp.ut_pid,
		    struct utmp.ut_exit,
316
		    struct utmp.ut_exit.e_termination,
317 318
		    struct utmp.ut_exit.__e_termination,
		    struct utmp.ut_exit.ut_termination,
319 320
		    struct utmp.ut_addr,
		    struct utmp.ut_addr_v6],,,
321 322
[# if HAVE_SYS_TYPES_H
#  include <sys/types.h>
323
# endif
324
# if HAVE_UTMP_H
325 326
#  include <utmp.h>
# endif
327 328
])
fi
329

330 331 332 333 334 335 336
if test x$have_utmpx_h = xyes; then
  AC_CHECK_MEMBERS([struct utmpx.ut_host,
		    struct utmpx.ut_name,
		    struct utmpx.ut_user,
		    struct utmpx.ut_time,
		    struct utmpx.ut_id,
		    struct utmpx.ut_tv,
337
		    struct utmpx.ut_tv.tv_sec,
338 339 340 341
		    struct utmpx.ut_syslen,
		    struct utmpx.ut_session,
		    struct utmpx.ut_pid,
		    struct utmpx.ut_exit,
342
		    struct utmpx.ut_exit.e_termination,
343 344
		    struct utmpx.ut_exit.__e_termination,
		    struct utmpx.ut_exit.ut_termination,
345 346 347
		    struct utmpx.ut_addr,
		    struct utmpx.ut_addr_v6],,,
[# if HAVE_UTMPX_H
348 349 350
#  include <utmpx.h>
# endif
])
351
fi
352

353 354 355 356 357
AH_TEMPLATE([WITH_UTMP], [For utmp support])
if test x$enable_utmp = xyes ; then
  AC_DEFINE(WITH_UTMP)
fi

358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386
AH_TEMPLATE([WITH_GSS_K5], [Whether to use gss K5 authorization (Heimdal/MIT)])
if test x$enable_gss != xno; then
  if test x$enable_gss = xk5; then
    AC_CHECK_PROG(KRB5CONFIG, krb5-config, krb5-config, no)
    if test x$KRB5CONFIG != xno; then
      CPPFLAGS="$CPPFLAGS `$KRB5CONFIG --cflags gssapi`"
      LIBS="$LIBS `$KRB5CONFIG --libs gssapi`"
      AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h])
      AC_DEFINE(WITH_GSS_K5)
      AC_CHECK_DECL(GSS_C_NT_HOSTBASED_SERVICE,, [
	AC_DEFINE(GSS_C_NT_HOSTBASED_SERVICE,
		gss_nt_service_name,
		[Work around buggy MIT library])], [
#ifdef HAVE_GSSAPI_H
#include <gssapi.h>
#endif
#ifdef HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
#endif
#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
])
    fi
  else
    AC_CHECK_HEADERS(gss.h,, [enable_gss=no])
    AC_CHECK_LIB(gss, gss_check_version,, [enable_gss=no])
  fi
fi
387

388 389 390 391
if test x$enable_kerberos = xyes; then
  AC_CHECK_HEADERS(krb5.h,, [enable_kerberos=no])
fi

392 393 394 395
if test x$enable_pam = xyes; then
  AC_CHECK_HEADERS(security/pam_appl.h,, [enable_pam=no])
fi

396 397
# Some systems (in particular, Unixware) doesn't have socklen_t, but
# uses size_t. Falling back to int will cause some warnings.
398

399 400
# AC_CHECK_TYPE doesn't work, probably because the type in
# question is not defined in sys/types.h.
401

402
LSH_TYPE_SOCKLEN_T
403

404 405
# Checks for libraries

406 407 408 409 410 411 412 413 414
# System libraries first. E.g., X11 libraries depend on gethostbyname,
# which on Solaris is in nsl.

# glibc has a nis-library "libnsl", which we don't need. So use
# AC_SEARCH_LIBS rather than AC_CHECK_LIB.
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(inet_ntop, nsl)
AC_CHECK_LIB(socket, setsockopt)

415 416 417 418
# FIXME: Don't add any of gmp, nettle or hogweed to LIBS, since not
# all programs need them. But maybe need them in LIBS temporarily, for
# LSH_RPATH_FIX to work.

419 420
AC_CHECK_LIB(gmp, __gmpz_getlimbn,,
    [AC_MSG_ERROR(
421
    [GNU MP not found, or not 3.1 or up, see http://gmplib.org/.])])
422

423 424
LSH_RPATH_FIX

425
AC_CHECK_LIB(hogweed, nettle_dsa_params_init, [true],
426
    [AC_MSG_ERROR(
427
    [Nettle library not found; needs version 3.0 or later. See http://www.lysator.liu.se/~nisse/nettle/.])], [-lnettle -lgmp])
428 429 430

LSH_RPATH_FIX

Niels Möller's avatar
Niels Möller committed
431
AC_CHECK_LIB([oop], [oop_sys_new],,
Niels Möller's avatar
Niels Möller committed
432
  [AC_MSG_ERROR([liboop is missing. Get liboop from http://www.lysator.liu.se/liboop/.])])
Niels Möller's avatar
Niels Möller committed
433 434 435

LSH_RPATH_FIX

436 437 438 439
if test x$with_zlib = xyes; then
  AC_CHECK_LIB(z, inflate,, [with_zlib=no])
fi

440 441 442 443
if test x$with_zlib = xyes; then
  LSH_RPATH_FIX
fi

444 445 446 447 448
# FIXME: Should we let people use --with-tcpwrappers=/here/they/are?

if test x$with_tcpwrappers = xyes; then
  AC_CHECK_LIB(wrap, request_init,, 
  [
449
      AC_MSG_WARN([Failed to link libwrap, you might try adding -lsocket to LDFLAGS])
450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467
      with_tcpwrappers=no
  ])

  AC_CHECK_HEADER(tcpd.h,, [with_tcpwrappers=no])

  if test x$with_tcpwrappers = xno; then
    AC_MSG_WARN([Failed to find a working tcpwrappers setup, disabling wrappers])
  fi
fi

if test x$with_tcpwrappers = xyes; then
  LSH_RPATH_FIX
  AC_DEFINE(WITH_TCPWRAPPERS,1,[Whatever to use tcpwrappers])
else
  AC_DEFINE(WITH_TCPWRAPPERS,0,[Whatever to use tcpwrappers])
fi


468
# X11 stuff. We only need Xauth, usually located in libXau.
469 470
# FIXME: Use AC_PATH_XTRA instead?

471 472 473
AC_PATH_X

if test -z "$no_x" ; then
474
  if test -n "$x_includes" ; then
475
    CPPFLAGS="$CPPFLAGS -I$x_includes"
476
  fi
477
  if test -n "$x_libraries" ; then    
478 479
    LDFLAGS="$LDFLAGS -L$x_libraries"
    LSH_RPATH_ADD($x_libraries)
480
  fi
481 482 483
fi

AC_CHECK_HEADERS(X11/Xauth.h)
484
AC_CHECK_LIB([Xau], [XauGetAuthByAddr])
485

486 487
LSH_RPATH_FIX

488 489 490 491
AC_CHECK_LIB(crypt, crypt)
AC_CHECK_LIB(xnet, inet_addr)
# logwtmp is also in libutil
AC_CHECK_LIB(util, openpty)
492

493
# This macro is new in autoconf-2.13
494
AC_SEARCH_LIBS(syslog, bsd socket inet, [AC_DEFINE(HAVE_SYSLOG)])
495

496
AH_TEMPLATE([WITH_ZLIB], [Define if zlib should be used])
497
# Should we use zlib?
498 499 500 501
if test x$with_zlib = xyes ; then
  AC_DEFINE(WITH_ZLIB)
fi

502 503 504 505 506 507
AH_TEMPLATE([WITH_GSS], [Define if gss should be used])
# Should we use gss?
if test x$enable_gss != xno ; then
  AC_DEFINE(WITH_GSS)
fi

508 509 510 511 512
# The kerberos libraries are needed only to support the
# krb-check-passwd program, so we put them $KRB_LIBS, not in the
# ordinary $LIBS.

if test x$enable_kerberos = xyes; then
513 514 515 516
  LSH_CHECK_KRB_LIB(roken, strlcpy)
  LSH_CHECK_KRB_LIB(resolv, dn_expand)
  LSH_CHECK_KRB_LIB(des, des_cbc_encrypt)
  LSH_CHECK_KRB_LIB(asn1, der_get_octet_string)
517 518 519
  # Check for krb5_cc_gen_new too?
  # krb5_verify_user_lrealm seems to be unique to heimdal
  LSH_CHECK_KRB_LIB(krb5, krb5_verify_user_lrealm,, [enable_kerberos=no])
520 521
fi

522
AH_TEMPLATE([WITH_KERBEROS], [For kerberos])
523 524 525 526 527 528
if test x$enable_kerberos = xyes; then
  AC_DEFINE(WITH_KERBEROS)
fi

AC_SUBST(KRB_LIBS)

529 530
AH_TEMPLATE([WITH_PAM], [For PAM])
if test x$enable_pam = xyes; then
531 532 533 534 535 536 537
  AC_CHECK_LIB(pam,pam_start,, enable_pam=no )

  if test x$enable_pam = xyes; then
    AC_DEFINE(WITH_PAM)
  else
    AC_MSG_WARN([pam_start not found in libpam, disabling PAM])
  fi
538 539
fi

540
AH_TEMPLATE([WITH_GCOV], [Use gcov])
Niels Möller's avatar
Niels Möller committed
541 542
if test "x$enable_gcov" = "xyes"; then
  CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
543
  AC_DEFINE(WITH_GCOV)
Niels Möller's avatar
Niels Möller committed
544 545
fi

Niels Möller's avatar
Niels Möller committed
546 547 548 549
if test "x$enable_profiling" = "xyes"; then
  CFLAGS="$CFLAGS -pg"
fi

550
# Checks for typedefs, structures, and compiler characteristics.
551
AC_C_CONST
552
AC_C_INLINE
553
AC_TYPE_UID_T
Niels Möller's avatar
Niels Möller committed
554
AC_TYPE_SIZE_T
555 556
AC_HEADER_TIME

557
# Needed by the supplied memcmp.c
Niels Möller's avatar
Niels Möller committed
558 559
AC_C_BIGENDIAN

560
# FIXME: We should check that a pid_t fits in an int
Niels Möller's avatar
Niels Möller committed
561
	
562
# Checks for library functions.
563

564 565 566
LSH_FUNC_ALLOCA
LSH_FUNC_STRERROR
LSH_FUNC_STRSIGNAL
567 568
AC_FUNC_MEMCMP
AC_FUNC_VPRINTF
569
AC_CHECK_FUNCS(select socket strtol alarm)
570
AC_CHECK_FUNCS(getrusage gettimeofday)
571
AC_CHECK_FUNCS(getspnam)
Niels Möller's avatar
Niels Möller committed
572
AC_CHECK_FUNCS(vsnprintf inet_aton inet_ntop)
573
AC_CHECK_FUNCS(openpty)
574
AC_CHECK_FUNCS(logwtmp login logout pututline pututxline updwtmp updwtmpx)
575
AC_CHECK_FUNCS(getaddrinfo getnameinfo gai_strerror)
576
AC_CHECK_FUNCS(setrlimit getdtablesize)
577 578
AC_FUNC_GETPGRP
AC_CHECK_FUNCS(syslog)
579

580 581 582 583 584 585 586 587 588 589
# HP-UX doesn't have seteuid
AC_CHECK_FUNCS(seteuid setresuid)

AH_BOTTOM(
[#if !HAVE_SETEUID
# if HAVE_SETRESUID
#  define seteuid(uid) setresuid(-1, (uid), -1)
# endif
#endif])

590
# FIXME: Is there a better way in autoconf 2.50?
591 592 593 594 595 596 597 598 599
AC_CACHE_CHECK([if netdb.h defines AI_NUMERICHOST],
  lsh_cv_sys_ai_numerichost,
  [AC_EGREP_CPP(yes,
    [#include <netdb.h>
     #ifdef AI_NUMERICHOST
     yes
     #endif
    ], lsh_cv_sys_ai_numerichost=yes,
       lsh_cv_sys_ai_numerichost=no)])
600 601

AH_TEMPLATE([HAVE_AI_NUMERICHOST], [Define if AI_NUMERICHOST exists])
602 603 604 605
if test x$lsh_cv_sys_ai_numerichost = xyes ; then
  AC_DEFINE(HAVE_AI_NUMERICHOST)
fi

606
# Test if the libc includes a good enough argp.
607
# FIXME: Doesn't check for the argp-help bug.
608
if test x$with_system_argp != xno ; then
609
  LSH_LIB_ARGP(,with_system_argp=no)
610 611
fi

612 613 614 615 616
AH_TEMPLATE([HAVE_ARGP_PARSE], [Define to use the argp parser in libc])
if test x$with_system_argp != xno ; then
  AC_DEFINE(HAVE_ARGP_PARSE)
fi

617
BUILD_SUBDIRS=''
618
LIB_ARGP=''
619
if test x$with_system_argp = xno ; then
620 621 622 623 624
  AC_CONFIG_COMMANDS([argp-symlinks],
  [argp_srcdir="`cd "$srcdir/argp" && pwd`"
  (cd src && rm -f argp argp_builddir && ln -s ../argp argp_builddir && ln -s $argp_srcdir argp)
  ])
  BUILD_SUBDIRS="$BUILD_SUBDIRS argp"
625
  LIB_ARGP="-largp"
626
fi
627

628 629 630 631 632 633 634 635 636
if test x$with_system_libspki = xno ; then
  AC_CONFIG_COMMANDS([libspki-symlinks],
  [spki_srcdir="`cd "$srcdir/spki" && pwd`"
  (cd src && rm -f spki spki_builddir && ln -s ../spki spki_builddir && ln -s $spki_srcdir spki)
  ])
  BUILD_SUBDIRS="$BUILD_SUBDIRS spki"
fi

AC_SUBST(BUILD_SUBDIRS)
637
AC_SUBST(LIB_ARGP)
638

639
# Check for broken shutdown
640 641
AC_CACHE_CHECK(for working shutdown on AF_UNIX sockets,
	       lsh_cv_func_shutdown_works_on_unix_sockets,
642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668
[
AC_TRY_RUN([
#include <stdio.h>

#include <errno.h>

#include <sys/types.h>
#include <sys/socket.h>

#include <signal.h>

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

/* Creates a one-way socket connection. Returns 1 on success, 0 on
 * failure. fds[0] is for reading, fds[1] for writing (like for the
 * pipe() system call). */
static int make_pipe(int *fds)
{

#ifndef SHUT_RD
#define SHUT_RD 0
#define SHUT_WR 1
#define SHUT_RDWR 2
#endif

669
  if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0)
670 671 672 673 674 675 676 677
    {
      fprintf(stderr, "socketpair() failed: %s\n", strerror(errno));
      return 0;
    }
  fprintf(stderr, "Created socket pair. Using fd:s %d <-- %d\n", fds[0], fds[1]);

  if(shutdown(fds[0], SHUT_WR) < 0)
    {
678 679
      fprintf(stderr, "shutdown(%d, SHUT_WR) failed: %s\n",
	      fds[0], strerror(errno));
680 681 682 683
      return 0;
    }
  if (shutdown(fds[1], SHUT_RD) < 0)
    {
684 685
      fprintf(stderr, "shutdown(%d, SHUT_RD) failed: %s\n",
	      fds[1], strerror(errno));
686 687 688 689 690 691 692 693 694 695 696 697 698 699 700
      return 0;
    }

  return 1;
}

int main(int argc, char **argv)
{
  int fds[2];
  
  if (!make_pipe(fds))
    exit(1);

  if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
    {
701
      fprintf(stderr, "signal failed.\n");
702 703 704 705 706 707 708 709 710
      exit(1);
    }

  if ( (write(fds[1], "foo", 3) < 0)
       && (errno == EPIPE))
    exit(1);

  exit(0);
}
711 712 713
], lsh_cv_func_shutdown_works_on_unix_sockets=yes,
   lsh_cv_func_shutdown_works_on_unix_sockets=no,
   lsh_cv_func_shutdown_works_on_unix_sockets=yes)])
714

715 716
AH_TEMPLATE([SHUTDOWN_WORKS_WITH_UNIX_SOCKETS],
	    [Define to indicate that shutdown seems to work properly])
717
if test x$lsh_cv_func_shutdown_works_on_unix_sockets = xyes ; then
718 719 720
    AC_DEFINE(SHUTDOWN_WORKS_WITH_UNIX_SOCKETS)
fi

721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778
AC_CACHE_CHECK(
  [for working UNIX98 ptys],
  lsh_cv_sys_unix98_ptys,
  AC_TRY_RUN([
  /* Try to obtain a working UNIX98-style pty master and slave */
  /* Based on example code from the GNU C library documentation */
  #include <stdlib.h>	/* EXIT_FAILURE, EXIT_SUCCESS, ptsname */
  #include <unistd.h>	/* close(2) */
  
  #include <sys/types.h>	/* open(2) */
  #include <sys/stat.h>	/* - " -   */
  #ifdef HAVE_FCNTL_H
  #  include <fcntl.h>	/* - " -   */
  #endif
  #ifdef HAVE_STROPTS_H
  #  include <stropts.h>	/* isastream() */
  #endif
  
  int main(int argc, char* argv[]) {
    int master, slave;
    char *name;
  
    master = open("/dev/ptmx", O_RDWR); /* PTY master multiplex */
    if (master < 0) {
  	  exit(EXIT_FAILURE);
    }
  
    if (grantpt(master) < 0 || unlockpt(master) < 0)
      goto close_master;
    name = ptsname(master);
    if (name == NULL)
      goto close_master;
  
    slave = open(name, O_RDWR);
    if (slave == -1)
      goto close_master;
  
  #ifdef HAVE_STROPTS_H
    if (isastream(slave))
      {
  	if (ioctl(slave, I_PUSH, "ptem") < 0
  	    || ioctl(slave, I_PUSH, "ldterm") < 0)
  	  goto close_slave;
      }
  #endif
  
    exit(0);
  
  close_slave:
    close (slave);
  
  close_master:
    close (master);
    exit(1);
  }
  ],
  [lsh_cv_sys_unix98_ptys=yes],
  [lsh_cv_sys_unix98_ptys=no],
779
  # Pessimistic default for cross compilation.
780 781
  [lsh_cv_sys_unix98_ptys=no]))

782 783
AH_TEMPLATE([HAVE_UNIX98_PTYS],
	    [Define if a we have working UNIX98 pty handling])
784 785
if test x$lsh_cv_sys_unix98_ptys = xyes; then
  AC_DEFINE(HAVE_UNIX98_PTYS)
786 787
else
  AC_MSG_WARN([No support for UNIX98 PTYs. PTY support disabled.])
788
fi
789

Niels Möller's avatar
Niels Möller committed
790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812
# Check that FIONREAD exists, works, and uses an argument of type int, not long.  
AC_CACHE_CHECK(
  [for FIONREAD with int argument],
  lsh_cv_sys_ioctl_fionread_int,
[AC_TRY_RUN([
#include <errno.h>
#include <fcntl.h>

#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#if HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
int main(int argc, char **argv)
{
#ifdef FIONREAD
  union {
    int i[2];
    long l;
  } val;

  int fds[2];
813
  int res;
Niels Möller's avatar
Niels Möller committed
814 815 816 817 818 819 820 821 822 823

  if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0)
    {
      printf("socketpair failed: errno = %d.\n", errno);
      return 1;
    }
    
  val.i[0] = 0xdeadbeaf;
  val.i[1] = 0xdeadbeaf;

824 825 826 827 828 829 830 831 832 833
  do 
    res = write(fds[1], "xxx", 3);
  while (res < 0 && errno == EINTR);

  if (res != 3)
    {
      printf("write failed: errno = %d.\n", errno);
      return 1;
    }
  
Niels Möller's avatar
Niels Möller committed
834 835 836 837 838
  if (ioctl(fds[0], FIONREAD, val.i) < 0)
    {
      printf("ioctl FIONREAD failed: errno = %d.\n", errno);
      return 1;
    }
839
  if (val.i[0] == 3 && val.i[1] == 0xdeadbeaf)
Niels Möller's avatar
Niels Möller committed
840 841 842 843 844 845 846 847 848 849 850 851 852 853
    return 0;
#endif
  return 1;
}
], lsh_cv_sys_ioctl_fionread_int=yes,
   lsh_cv_sys_ioctl_fionread_int=no,
   lsh_cv_sys_ioctl_fionread_int=no)])

AH_TEMPLATE([HAVE_IOCTL_FIONREAD],
	    [Define if the FIONREAD ioctl works, and uses an argument of type int])
if test x$lsh_cv_sys_ioctl_fionread_int = xyes; then
  AC_DEFINE([HAVE_IOCTL_FIONREAD])
fi

854 855 856 857 858 859 860 861 862 863
# Check that credentials passing work
AC_CACHE_CHECK(
  [for credentials passing],
  lsh_cv_sys_ucred_passing,
[AC_TRY_RUN([
/* For CMSG_SPACE and friends on Solaris */
#define _XPG4_2

#include <errno.h>
#include <stdio.h>
864
#include <stdlib.h>
865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904
#include <string.h>

/* Linux: For struct ucred */
#include <sys/types.h>
#include <sys/socket.h>

/* Solaris ucred support */
#if HAVE_UCRED_H
#include <ucred.h>
#endif

int main (int argc, char **argv)
{
  int pipe[2];
  int type;
  struct msghdr hdr;
  struct cmsghdr *cmsg;
  struct iovec io;
  void *creds_buf;
  size_t creds_size;
  size_t creds_space;
  char buf[3];
  int res;
  int yes = 1;

#ifdef SO_RECVUCRED
  /* Solaris' ucred passing works with SOCK_DGRAM sockets only */
  type = SOCK_DGRAM;
#else
  type = SOCK_STREAM;
#endif
  if (socketpair(AF_UNIX, type, 0, pipe) < 0)
    {
      printf("socketpair failed: errno = %d.\n", errno);
      return 1;
    }

#if defined (SO_PASSCRED)
  /* For Linux */
  if (setsockopt(pipe[1], SOL_SOCKET, SO_PASSCRED,
905
		 &yes, sizeof(yes)) < 0)
906 907 908 909 910 911 912 913 914 915 916 917 918 919
    {
      printf("setsockopt SO_PASSCRED failed: %d.\n", errno);
      return 1;
    }
#elif defined (SO_RECVUCRED)
  /* Solaris */
  if (setsockopt(pipe[1], SOL_SOCKET, SO_RECVUCRED,
  		   &yes, sizeof(yes)) < 0)
    {
      printf("setsockopt SO_RECVUCRED failed: %d.\n", errno);
      return 1;
    }
#endif

920
#if defined (SCM_CREDENTIALS)
921
  creds_size = sizeof(struct ucred);
922 923
#elif defined (SCM_CREDS)
  creds_size = sizeof(struct cmsgcred);
924 925 926 927
#else
  creds_size = 0;
#endif

928 929 930 931
  /* Appearantly, on FreeBSD-6.3, sendmsg requires that if
     msg_controllen == 0, then one *must* also have msg_control == NULL. */
  
  if (creds_size)
932
    {
933 934 935 936 937 938 939 940 941 942 943 944
      creds_space = CMSG_SPACE(creds_size);
      creds_buf = malloc(creds_space);
      if (!creds_buf)
	{
	  printf("malloc failed\n");
	  return 1;
	}
    }
  else
    {
      creds_space = 0;
      creds_buf = NULL;
945 946 947 948 949 950 951 952 953 954 955 956
    }

  io.iov_base = (void *) "foo";
  io.iov_len = 3;
  
  hdr.msg_name = NULL;
  hdr.msg_namelen = 0;
  hdr.msg_iov = &io;
  hdr.msg_iovlen = 1;
  hdr.msg_controllen = creds_space;
  hdr.msg_control = creds_buf;

957
#if defined (SCM_CREDENTIALS)
958 959 960 961 962
  /* Linux style credentials */
  
  {
    struct ucred *creds;

963
    cmsg = CMSG_FIRSTHDR(&hdr);
964 965 966 967 968 969 970 971 972 973 974
    cmsg->cmsg_level = SOL_SOCKET;
    cmsg->cmsg_type = SCM_CREDENTIALS;
    cmsg->cmsg_len = CMSG_LEN(sizeof(*creds));

    creds = (struct ucred *) CMSG_DATA(cmsg);
    creds->pid = getpid();
    creds->uid = getuid();
    creds->gid = getgid();

    hdr.msg_controllen = CMSG_SPACE(sizeof(*creds));
  }
975 976 977 978 979 980 981 982 983 984 985
#elif defined (SCM_CREDS)
  {
    cmsg = CMSG_FIRSTHDR(&hdr);

    cmsg->cmsg_level = SOL_SOCKET;
    cmsg->cmsg_type = SCM_CREDS;
    cmsg->cmsg_len = CMSG_LEN(sizeof(struct cmsgcred));

    /* Data filled in by the kernel */
    hdr.msg_controllen = CMSG_SPACE(sizeof(struct cmsgcred));      
  }
986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
#else
  hdr.msg_controllen = 0;
#endif 

  do
    res = sendmsg(pipe[0], &hdr, 0);
  while (res < 0 && errno == EINTR);

  if (res < 0)
    {
      printf("sendmsg failed: errno = %d.\n", errno);
      return 1;
    }
  
  memset(buf, 0, sizeof(buf));
  if (creds_space)
    memset(creds_buf, 0, creds_space);

  io.iov_base = (void *) buf;
  io.iov_len = sizeof(buf);

  hdr.msg_name = NULL;
  hdr.msg_namelen = 0;
  hdr.msg_iov = &io;
  hdr.msg_iovlen = 1;
  hdr.msg_controllen = creds_space;
  hdr.msg_control = creds_buf;
  
  do
    res = recvmsg(pipe[1], &hdr, 0);
  while (res < 0 && errno == EINTR);

  if (res < 0)
    {
      printf("recvmsg failed: errno = %d.\n", errno);
      return 1;
    }

  if (res != 3)
    {
      printf("recvmsg returned unexpected count\n");
      return 1;
    }

  if (memcmp (buf, "foo", 3) != 0)
    {
      printf("recvmsg returned unexpected data\n");
      return 1;
    }

  /* Process ancillary data */
  for (cmsg = CMSG_FIRSTHDR(&hdr); cmsg; cmsg = CMSG_NXTHDR(&hdr, cmsg))
    {
      pid_t pid;
      uid_t uid;
      gid_t gid;

      if (cmsg->cmsg_level != SOL_SOCKET)
	continue;
      switch (cmsg->cmsg_type)
	{
	  got_creds:
	    if (pid != getpid())
	      {
	        printf("Received unexpected pid %d\n", (int) pid);
		return 1;
	      }
	    if (uid != getuid())
	      {
	        printf("Received unexpected uid %d\n", (int) uid);
		return 1;
	      }
	    if (gid != getgid())
	      {
	        printf("Received unexpected gid %d\n", (int) gid);
		return 1;
	      }
	    /* Success! */
	    return 0;
1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078

#if defined (SCM_CREDENTIALS)
	case SCM_CREDENTIALS:
	  {
	    struct ucred *creds;
	    if (cmsg->cmsg_len != CMSG_LEN(sizeof(*creds)))
	      continue;

	    creds = (struct ucred *) CMSG_DATA(cmsg);
	    pid = creds->pid;
	    uid = creds->uid;
	    gid = creds->gid;

	    goto got_creds;
1079
	  }
1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093
#elif defined (SCM_CREDS)
	case SCM_CREDS:
	  {
	    struct cmsgcred *creds;
	    if (cmsg->cmsg_len != CMSG_LEN(sizeof(*creds)))
	      continue;

	    creds = (struct cmsgcred *) CMSG_DATA(cmsg);
	    pid = creds->cmcred_pid;
	    uid = creds->cmcred_uid;
	    gid = creds->cmcred_gid;

	    goto got_creds;
	  }	  
1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121
#elif defined (SCM_UCRED)
	case SCM_UCRED:
	  {
	    ucred_t *creds;

	    creds = (ucred_t *) CMSG_DATA(cmsg);
	    pid = ucred_getpid(creds);
	    uid = ucred_geteuid(creds);
	    gid = ucred_getegid(creds);

	    goto got_creds;
	  }	    
#endif
	}
    }
  printf("No creds received.\n");
  return 1;
} 
], lsh_cv_sys_ucred_passing=yes,
   lsh_cv_sys_ucred_passing=no,
   lsh_cv_sys_ucred_passing=no)])

AH_TEMPLATE([HAVE_SOCKET_CREDENTIALS_PASSING],
	    [Define if credentials passing over unix sockets work])
if test x$lsh_cv_sys_ucred_passing = xyes; then
  AC_DEFINE([HAVE_SOCKET_CREDENTIALS_PASSING])
fi

1122
LSH_GCC_ATTRIBUTES
1123

1124
AC_MSG_CHECKING(for BSD pty names)
Niels Möller's avatar
Niels Möller committed
1125

1126 1127 1128 1129 1130
AH_TEMPLATE([PTY_BSD_SCHEME_FIRST_CHARS],
	    [Possible first characters in a /dev/ptyXX name])
AH_TEMPLATE([PTY_BSD_SCHEME_SECOND_CHARS],
	    [Possible second characters in a /dev/ptyXX name])

1131
# FIXME: What is most portable, tr -d '\n' or tr -d '\012' ?
1132 1133
AC_DEFINE_UNQUOTED(PTY_BSD_SCHEME_FIRST_CHARS, "`ls /dev/pty* | cut -c 9-9 | uniq | tr -d '\n'`")
AC_DEFINE_UNQUOTED(PTY_BSD_SCHEME_SECOND_CHARS, "`ls /dev/pty* | cut -c 10-10 | sort | uniq | tr -d '\n'`")
1134

1135
# FIXME: How can we test if the bsd scheme is likely to work?
1136
AH_TEMPLATE([PTY_BSD_SCHEME], [Traditional BSD pty handling])
1137 1138 1139
AC_DEFINE(PTY_BSD_SCHEME)
AC_MSG_RESULT([done])

1140
# IPv6 support
1141 1142

if test x$enable_ipv6 = xyes ; then
1143
  if test x$ac_cv_func_getaddrinfo != xyes ; then
1144 1145
    AC_MSG_WARN([getaddrinfo not found. Disabling IPv6 support])
    enable_ipv6=no
1146
  elif test x$ac_cv_func_gai_strerror != xyes ; then
1147 1148
    AC_MSG_WARN([gai_strerror not found. Disabling IPv6 support])
    enable_ipv6=no
1149
  elif test x$lsh_cv_sys_ai_numerichost != xyes ; then
1150 1151
    AC_MSG_WARN([AI_NUMERICHOST not defined. Disabling IPv6 support])
    enable_ipv6=no
1152 1153 1154
  fi
fi

1155
AH_TEMPLATE([WITH_IPV6], [For Ipv6 support])
1156
if test x$enable_ipv6 = xyes ; then
1157 1158 1159
  AC_DEFINE(WITH_IPV6)
fi

1160
AC_CONFIG_SUBDIRS(argp spki sftp)
1161

1162 1163
# Set these flags *last*, or else the test programs won't compile
if test x$GCC = xyes ; then
1164 1165 1166 1167 1168 1169
  # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
  if "$CC" --version | grep '^2\.96$' 1>/dev/null 2>&1; then
    true
  else
    CFLAGS="$CFLAGS -ggdb3"
  fi
1170
  # FIXME: It would be better to actually test if this option works and/or is needed.
Niels Möller's avatar
Niels Möller committed
1171
  # Or perhaps use -funsigned-char.
1172 1173 1174
  if "$CC" --version | grep 'gcc.* 4\.' 1>/dev/null 2>&1; then
    CFLAGS="$CFLAGS -Wno-pointer-sign"
  fi
1175 1176 1177
  CFLAGS="$CFLAGS -Wall -W \
  -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \
  -Wpointer-arith -Wbad-function-cast -Wnested-externs"
1178

1179 1180
# Don't enable -Wcast-align as it results in tons of warnings in the
# DES code. And when using stdio.
1181 1182
# Don't enable -Waggregate-return, as that causes warnings for glibc
# inttypes.h.
1183

1184
fi
Niels Möller's avatar
Niels Möller committed
1185

Niels Möller's avatar
Niels Möller committed
1186
# Used by contrib/solpkg.sh.in.
1187 1188 1189 1190
AC_SUBST(BUILD_ARCH, `uname -p`)
AC_SUBST(BUILD_OSSYS,`uname -s`)
AC_SUBST(BUILD_OSREV,`uname -r`)

1191 1192 1193
AC_CONFIG_FILES([Makefile src/config.make src/Makefile src/testsuite/Makefile
		 doc/Makefile misc/Makefile
		 contrib/Makefile contrib/lsh.spec contrib/solpkg.sh])
1194

1195
AC_OUTPUT