Skip to content

Commit

Permalink
configure*: Remove redundant AC_SUBST calls near HAVE_LTS
Browse files Browse the repository at this point in the history
Added on commit d1acb31 ("compile time: enable LTS", 2021-02-28).

It only needs to be called once for each variable.  See the configure
script diff and the previous commit ("configure*: Move AC_SUBST calls to
more obvious places").
  • Loading branch information
kmk3 committed Nov 25, 2021
1 parent 36058bc commit c84dc09
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 60 deletions.
30 changes: 0 additions & 30 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3842,52 +3842,22 @@ fi
if test "x$enable_lts" = "xyes"; then :
HAVE_LTS="-DHAVE_LTS"
HAVE_DBUSPROXY=""
HAVE_OVERLAYFS=""
HAVE_OUTPUT=""
HAVE_USERTMPFS=""
HAVE_MAN="-DHAVE_MAN"
HAVE_FIRETUNNEL=""
HAVE_PRIVATEHOME=""
HAVE_CHROOT=""
HAVE_GLOBALCFG=""
HAVE_USERNS=""
HAVE_X11=""
HAVE_FILE_TRANSFER=""
HAVE_SUID="yes"
BUSYBOX_WORKAROUND="no"
HAVE_CONTRIB_INSTALL="no",
fi
ac_ext=c
Expand Down
30 changes: 0 additions & 30 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -245,51 +245,21 @@ AC_ARG_ENABLE([lts],
[AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)])])
AS_IF([test "x$enable_lts" = "xyes"], [
HAVE_LTS="-DHAVE_LTS"
HAVE_DBUSPROXY=""
AC_SUBST([HAVE_DBUSPROXY])
HAVE_OVERLAYFS=""
AC_SUBST([HAVE_OVERLAYFS])
HAVE_OUTPUT=""
AC_SUBST([HAVE_OUTPUT])
HAVE_USERTMPFS=""
AC_SUBST([HAVE_USERTMPFS])
HAVE_MAN="-DHAVE_MAN"
AC_SUBST([HAVE_MAN])
HAVE_FIRETUNNEL=""
AC_SUBST([HAVE_FIRETUNNEL])
HAVE_PRIVATEHOME=""
AC_SUBST([HAVE_PRIVATE_HOME])
HAVE_CHROOT=""
AC_SUBST([HAVE_CHROOT])
HAVE_GLOBALCFG=""
AC_SUBST([HAVE_GLOBALCFG])
HAVE_USERNS=""
AC_SUBST([HAVE_USERNS])
HAVE_X11=""
AC_SUBST([HAVE_X11])
HAVE_FILE_TRANSFER=""
AC_SUBST([HAVE_FILE_TRANSFER])
HAVE_SUID="yes"
AC_SUBST([HAVE_SUID])
BUSYBOX_WORKAROUND="no"
AC_SUBST([BUSYBOX_WORKAROUND])
HAVE_CONTRIB_INSTALL="no",
AC_SUBST([HAVE_CONTRIB_INSTALL])
])

AC_CHECK_HEADER([linux/seccomp.h], [], AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***]))
Expand Down

0 comments on commit c84dc09

Please sign in to comment.