From c84dc09257454075a8b7ce6e63581e0c7710ac8c Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 16 Nov 2021 10:04:22 -0300 Subject: configure*: Remove redundant AC_SUBST calls near HAVE_LTS Added on commit d1acb31c9 ("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"). --- configure | 30 ------------------------------ configure.ac | 30 ------------------------------ 2 files changed, 60 deletions(-) diff --git a/configure b/configure index ab11aa020..f3b99d7d1 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index 20b60b522..ace02dcb6 100644 --- a/configure.ac +++ b/configure.ac @@ -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) ***])) -- cgit v1.2.3-70-g09d2