Mercurial > dropbear

comparison configure.ac @ 1397:18c0b0e450ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix configure options using AC_ARG_ENABLE Configure options to disable some features, which are checked using AC_ARG_ENABLE can be invoked with --enable-<option> as well. The current configure script always generates a #define for such options even though the --enable-<option> case should not generate a #define. Fix this by properly checking if the feature should be enabled, in which case no #define is being generated. Signed-off-by: Stefan Hauser <[email protected]>
author Stefan Hauser <stefan@shauser.net>
date Wed, 27 Jul 2016 19:38:56 +0200
parents 94d4038bb34c
children 47a3a3cb7d45
comparison
equal deleted inserted replaced
1317:19358268ea45 1397:18c0b0e450ff
411 dnl Added from OpenSSH 3.6.1p2's configure.ac 411 dnl Added from OpenSSH 3.6.1p2's configure.ac
412 412
413 dnl allow user to disable some login recording features 413 dnl allow user to disable some login recording features
414 AC_ARG_ENABLE(lastlog, 414 AC_ARG_ENABLE(lastlog,
415 [ --disable-lastlog Disable use of lastlog even if detected [no]], 415 [ --disable-lastlog Disable use of lastlog even if detected [no]],
416 [ AC_DEFINE(DISABLE_LASTLOG,,Disable use of lastlog()) ] 416 [
417 if test "x$enableval" = "xno" ; then
418 AC_DEFINE(DISABLE_LASTLOG,,Disable use of lastlog())
419 fi
420 ]
417 ) 421 )
418 AC_ARG_ENABLE(utmp, 422 AC_ARG_ENABLE(utmp,
419 [ --disable-utmp Disable use of utmp even if detected [no]], 423 [ --disable-utmp Disable use of utmp even if detected [no]],
420 [ AC_DEFINE(DISABLE_UTMP,,Disable use of utmp) ] 424 [
425 if test "x$enableval" = "xno" ; then
426 AC_DEFINE(DISABLE_UTMP,,Disable use of utmp)
427 fi
428 ]
421 ) 429 )
422 AC_ARG_ENABLE(utmpx, 430 AC_ARG_ENABLE(utmpx,
423 [ --disable-utmpx Disable use of utmpx even if detected [no]], 431 [ --disable-utmpx Disable use of utmpx even if detected [no]],
424 [ AC_DEFINE(DISABLE_UTMPX,,Disable use of utmpx) ] 432 [
433 if test "x$enableval" = "xno" ; then
434 AC_DEFINE(DISABLE_UTMPX,,Disable use of utmpx)
435 fi
436 ]
425 ) 437 )
426 AC_ARG_ENABLE(wtmp, 438 AC_ARG_ENABLE(wtmp,
427 [ --disable-wtmp Disable use of wtmp even if detected [no]], 439 [ --disable-wtmp Disable use of wtmp even if detected [no]],
428 [ AC_DEFINE(DISABLE_WTMP,,Disable use of wtmp) ] 440 [
441 if test "x$enableval" = "xno" ; then
442 AC_DEFINE(DISABLE_WTMP,,Disable use of wtmp)
443 fi
444 ]
429 ) 445 )
430 AC_ARG_ENABLE(wtmpx, 446 AC_ARG_ENABLE(wtmpx,
431 [ --disable-wtmpx Disable use of wtmpx even if detected [no]], 447 [ --disable-wtmpx Disable use of wtmpx even if detected [no]],
432 [ AC_DEFINE(DISABLE_WTMPX,,Disable use of wtmpx) ] 448 [
449 if test "x$enableval" = "xno" ; then
450 AC_DEFINE(DISABLE_WTMPX,,Disable use of wtmpx)
451 fi
452 ]
433 ) 453 )
434 AC_ARG_ENABLE(loginfunc, 454 AC_ARG_ENABLE(loginfunc,
435 [ --disable-loginfunc Disable use of login() etc. [no]], 455 [ --disable-loginfunc Disable use of login() etc. [no]],
436 [ no_loginfunc_check=1 456 [ no_loginfunc_check=1
437 AC_MSG_NOTICE(Not using login() etc) ] 457 AC_MSG_NOTICE(Not using login() etc) ]
438 ) 458 )
439 AC_ARG_ENABLE(pututline, 459 AC_ARG_ENABLE(pututline,
440 [ --disable-pututline Disable use of pututline() etc. ([uw]tmp) [no]], 460 [ --disable-pututline Disable use of pututline() etc. ([uw]tmp) [no]],
441 [ AC_DEFINE(DISABLE_PUTUTLINE,,Disable use of pututline()) ] 461 [
462 if test "x$enableval" = "xno" ; then
463 AC_DEFINE(DISABLE_PUTUTLINE,,Disable use of pututline())
464 fi
465 ]
442 ) 466 )
443 AC_ARG_ENABLE(pututxline, 467 AC_ARG_ENABLE(pututxline,
444 [ --disable-pututxline Disable use of pututxline() etc. ([uw]tmpx) [no]], 468 [ --disable-pututxline Disable use of pututxline() etc. ([uw]tmpx) [no]],
445 [ AC_DEFINE(DISABLE_PUTUTXLINE,,Disable use of pututxline()) ] 469 [
470 if test "x$enableval" = "xno" ; then
471 AC_DEFINE(DISABLE_PUTUTXLINE,,Disable use of pututxline())
472 fi
473 ]
446 ) 474 )
447 AC_ARG_WITH(lastlog, 475 AC_ARG_WITH(lastlog,
448 [ --with-lastlog=FILE|DIR specify lastlog location [common locations]], 476 [ --with-lastlog=FILE|DIR specify lastlog location [common locations]],
449 [ 477 [
450 if test "x$withval" = "xno" ; then 478 if test "x$withval" = "xno" ; then