pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/41870?usp=email )
Change subject: select.c: Check for ENABLE_PLUGIN instead of EMBEDDED
......................................................................
select.c: Check for ENABLE_PLUGIN instead of EMBEDDED
Change-Id: I6cae7781a94e4eb6daaf97c16638fd933a3c9123
---
M configure.ac
M src/gsm/auth_core.c
M src/gsm/gprs_cipher_core.c
3 files changed, 8 insertions(+), 9 deletions(-)
Approvals:
jolly: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/configure.ac b/configure.ac
index b0914f7..64690f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,13 +360,12 @@
AM_CONDITIONAL(ENABLE_URING_TESTS, test x"$ENABLE_URING_TESTS" = x"yes")
AC_SUBST(ENABLE_URING_TESTS)
-AC_ARG_ENABLE(plugin,
- [AS_HELP_STRING(
- [--disable-plugin],
- [Disable support for dlopen plugins],
- )],
+AC_ARG_ENABLE(plugin, [AS_HELP_STRING([--disable-plugin], [Disable support for
dlopen plugins],)],
[enable_plugin=$enableval], [enable_plugin=$ENABLE_PLUGIN_DEFAULT])
AM_CONDITIONAL(ENABLE_PLUGIN, test x"$enable_plugin" = x"yes")
+AS_IF([test "x$enable_plugin" = "xyes"], [
+ AC_DEFINE([ENABLE_PLUGIN], [1], [Enable support for dlopen plugins])
+])
AC_ARG_ENABLE(vty,
[AS_HELP_STRING(
diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c
index 6972cb7..80bf7c8 100644
--- a/src/gsm/auth_core.c
+++ b/src/gsm/auth_core.c
@@ -98,11 +98,11 @@
int osmo_auth_load(const char *path)
{
/* load all plugins available from path */
-#if !defined(EMBEDDED)
+#ifdef ENABLE_PLUGIN
return osmo_plugin_load_all(path);
#else
return -1;
-#endif
+#endif /* ifdef ENABLE_PLUGIN */
}
/*! Determine if a given authentication algorithm is supported
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 97e581d..5f28084 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -66,11 +66,11 @@
/* load all available GPRS cipher plugins */
int gprs_cipher_load(const char *path)
{
-#if !defined(EMBEDDED)
+#ifdef ENABLE_PLUGIN
/* load all plugins available from path */
if (path)
return osmo_plugin_load_all(path);
-#endif
+#endif /* ifdef ENABLE_PLUGIN */
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41870?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6cae7781a94e4eb6daaf97c16638fd933a3c9123
Gerrit-Change-Number: 41870
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
