From 1c37197bab32b87d655052cdb4e502dbd482f682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 28 Jun 2021 15:11:27 -0400
Subject: [PATCH] autotools: cleanup nodejs
Change-Id: Ie5c67deace0664c2d8d9664ecb0f722fce13a57e
---
configure.ac | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 948bdb77d3..dd56c13d0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -400,33 +400,25 @@ AS_IF([test "x$with_dbus" = "xyes"],
dnl name service is default-enabled
AC_ARG_ENABLE([ringns], AS_HELP_STRING([--disable-ringns],
[Enable Name Service]))
-AM_CONDITIONAL([RINGNS], test "x$enable_ringns" != "xno",
- [Define if you use the Name Service])
+AM_CONDITIONAL([RINGNS], test "x$enable_ringns" != "xno")
AC_DEFINE_UNQUOTED([HAVE_RINGNS],
`if test "x$enable_ringns" != "xno"; then echo 1; else echo 0; fi`,
[Define if you use the Name Service])
+AM_COND_IF([RINGNS],
+ [PKG_CHECK_MODULES(LIBCRYPTO, libcrypto,,
+ AC_MSG_ERROR([Missing libcrypto development files]))
+ PKG_CHECK_MODULES(LIBSSL, libssl,,
+ AC_MSG_ERROR([Missing libssl development files]))],
+ []);
dnl nodejs module
AC_ARG_WITH([nodejs], AS_HELP_STRING([--with-nodejs], [Enable NodeJS module]))
-AM_CONDITIONAL([ENABLE_NODEJS], test "x$enable_nodejs" != "xno",
- [Define if you use the NodeJS module])
-AC_DEFINE_UNQUOTED([HAVE_NODEJS],
- `if test "x$enable_ringns" != "xno"; then echo 1; else echo 0; fi`,
- [Define if you use the NodeJS module])
-AS_IF([test "x$with_nodejs" = "xyes"],
+AM_CONDITIONAL(ENABLE_NODEJS, [test "x$with_nodejs" = "xyes"])
+AM_COND_IF([ENABLE_NODEJS],
[AC_PATH_PROG(SWIG, swig, "")
AS_AC_EXPAND(SBINDIR, $sbindir)
AC_SUBST(SBINDIR)
- AC_CONFIG_FILES([bin/nodejs/Makefile])
- AM_CONDITIONAL(ENABLE_NODEJS, true)],
- [AM_CONDITIONAL(ENABLE_NODEJS, false)]);
-
-AS_IF([test "x$enable_ringns" != "xno"],
- [PKG_CHECK_MODULES(LIBCRYPTO, libcrypto,,
- AC_MSG_ERROR([Missing libcrypto development files]))
- PKG_CHECK_MODULES(LIBSSL, libssl,,
- AC_MSG_ERROR([Missing libssl development files]))],
- []);
+ AC_CONFIG_FILES([bin/nodejs/Makefile])])
dnl Check for libav
PKG_CHECK_MODULES(LIBAVUTIL, libavutil >= 54.31.100,,
--
GitLab