Merge pull request #8508 from opensourcerouting/systemd-no-lib

[mirror_frr.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0ea209bbfad614c5ae28d6c945a291ec173169b8..a23011b7558d86dd6d94c215f4b6ec2ab2fb8537 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,8 @@ if test "$enable_clang_coverage" = "yes"; then
    ])
 fi
 
+AM_CONDITIONAL([SCRIPTING], [test "$enable_scripting" = "yes"])
+
 if test "$enable_scripting" = "yes"; then
    AX_PROG_LUA([5.3], [5.4], [], [
      AC_MSG_ERROR([Lua 5.3 is required to build with Lua support. No other version is supported.])
@@ -290,7 +292,9 @@ if test "$enable_scripting" = "yes"; then
    AX_LUA_LIBS([
      AC_DEFINE([HAVE_SCRIPTING], [1], [Have support for scripting])
      LIBS="$LIBS $LUA_LIB"
+     SCRIPTING=true
    ], [
+     SCRIPTING=false
      AC_MSG_ERROR([Lua 5.3 libraries are required to build with Lua support. No other version is supported.])
    ])
 fi
@@ -668,8 +672,6 @@ AC_ARG_ENABLE([fpm],
   AS_HELP_STRING([--enable-fpm], [enable Forwarding Plane Manager support]))
 AC_ARG_ENABLE([pcep],
   AS_HELP_STRING([--enable-pcep], [enable PCEP support for pathd]))
-AC_ARG_ENABLE([systemd],
-  AS_HELP_STRING([--enable-systemd], [enable Systemd support]))
 AC_ARG_ENABLE([werror],
   AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)]))
 AC_ARG_ENABLE([cumulus],
@@ -764,19 +766,6 @@ case "${enable_cpu_time}" in
   ;;
 esac
 
-case "${enable_systemd}" in
-  "no") ;;
-  "yes")
-  AC_CHECK_LIB([systemd], [sd_notify], [LIBS="$LIBS -lsystemd"])
-  if test "$ac_cv_lib_systemd_sd_notify" = "no"; then
-    AC_MSG_ERROR([enable systemd has been specified but systemd development env not found on your system])
-  else
-    AC_DEFINE([HAVE_SYSTEMD], [1], [Compile systemd support in])
-  fi
-  ;;
-  "*") ;;
-esac
-
 if test "$enable_rr_semantics" != "no" ; then
   AC_DEFINE([HAVE_V6_RR_SEMANTICS], [1], [Compile in v6 Route Replacement Semantics])
 fi
@@ -2628,7 +2617,6 @@ AC_CONFIG_FILES([Makefile],[
 
 AC_CONFIG_FILES([
          config.version
-         changelog-auto
          redhat/frr.spec
          alpine/APKBUILD
          snapcraft/snapcraft.yaml