ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-24 12:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix configure options using AC_ARG_ENABLE

Browse Source 
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 <stefan@shauser.net>
This commit is contained in:
Stefan Hauser 2016-07-27 19:38:56 +02:00
parent 4222251d6f
commit c60a65bc93
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure.ac
View File

@ -413,23 +413,43 @@ dnl Added from OpenSSH 3.6.1p2's configure.ac
dnl allow user to disable some login recording features dnl allow user to disable some login recording features
AC_ARG_ENABLE(lastlog, AC_ARG_ENABLE(lastlog,
[ --disable-lastlog Disable use of lastlog even if detected [no]], [ --disable-lastlog Disable use of lastlog even if detected [no]],
[ AC_DEFINE(DISABLE_LASTLOG,,Disable use of lastlog()) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_LASTLOG,,Disable use of lastlog())
fi
]
) )
AC_ARG_ENABLE(utmp, AC_ARG_ENABLE(utmp,
[ --disable-utmp Disable use of utmp even if detected [no]], [ --disable-utmp Disable use of utmp even if detected [no]],
[ AC_DEFINE(DISABLE_UTMP,,Disable use of utmp) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_UTMP,,Disable use of utmp)
fi
]
) )
AC_ARG_ENABLE(utmpx, AC_ARG_ENABLE(utmpx,
[ --disable-utmpx Disable use of utmpx even if detected [no]], [ --disable-utmpx Disable use of utmpx even if detected [no]],
[ AC_DEFINE(DISABLE_UTMPX,,Disable use of utmpx) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_UTMPX,,Disable use of utmpx)
fi
]
) )
AC_ARG_ENABLE(wtmp, AC_ARG_ENABLE(wtmp,
[ --disable-wtmp Disable use of wtmp even if detected [no]], [ --disable-wtmp Disable use of wtmp even if detected [no]],
[ AC_DEFINE(DISABLE_WTMP,,Disable use of wtmp) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_WTMP,,Disable use of wtmp)
fi
]
) )
AC_ARG_ENABLE(wtmpx, AC_ARG_ENABLE(wtmpx,
[ --disable-wtmpx Disable use of wtmpx even if detected [no]], [ --disable-wtmpx Disable use of wtmpx even if detected [no]],
[ AC_DEFINE(DISABLE_WTMPX,,Disable use of wtmpx) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_WTMPX,,Disable use of wtmpx)
fi
]
) )
AC_ARG_ENABLE(loginfunc, AC_ARG_ENABLE(loginfunc,
[ --disable-loginfunc Disable use of login() etc. [no]], [ --disable-loginfunc Disable use of login() etc. [no]],
@ -438,11 +458,19 @@ AC_ARG_ENABLE(loginfunc,
) )
AC_ARG_ENABLE(pututline, AC_ARG_ENABLE(pututline,
[ --disable-pututline Disable use of pututline() etc. ([uw]tmp) [no]], [ --disable-pututline Disable use of pututline() etc. ([uw]tmp) [no]],
[ AC_DEFINE(DISABLE_PUTUTLINE,,Disable use of pututline()) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_PUTUTLINE,,Disable use of pututline())
fi
]
) )
AC_ARG_ENABLE(pututxline, AC_ARG_ENABLE(pututxline,
[ --disable-pututxline Disable use of pututxline() etc. ([uw]tmpx) [no]], [ --disable-pututxline Disable use of pututxline() etc. ([uw]tmpx) [no]],
[ AC_DEFINE(DISABLE_PUTUTXLINE,,Disable use of pututxline()) ] [
if test "x$enableval" = "xno" ; then
AC_DEFINE(DISABLE_PUTUTXLINE,,Disable use of pututxline())
fi
]
) )
AC_ARG_WITH(lastlog, AC_ARG_WITH(lastlog,
[ --with-lastlog=FILE|DIR specify lastlog location [common locations]], [ --with-lastlog=FILE|DIR specify lastlog location [common locations]],