Fix building with --disable-libipvs-dynamic

Issue acassen#1516 reported by the OpenWRT project identified that keepalived_modprobe() was not defined if --disable-libipvs-dynamic was specified. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
pqarmitage · Mar 4, 2020 · 42c020a · 42c020a
1 parent 13d1b2d
commit 42c020a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/utils.c b/lib/utils.c
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <sys/prctl.h>
-#if defined _WITH_LVS_ || defined _LIBIPSET_DYNAMIC_
+#if defined _WITH_LVS_ || defined _HAVE_LIBIPSET_
 #include <sys/wait.h>
 #endif
 #ifdef _WITH_PERF_
@@ -1097,7 +1097,7 @@ memcmp_constant_time(const void *s1, const void *s2, size_t n)
  * Utility functions coming from Wensong code
  */
 
-#if defined _WITH_LVS_ || defined _LIBIPSET_DYNAMIC_
+#if defined _WITH_LVS_ || defined _HAVE_LIBIPSET_
 static char*
 get_modprobe(void)
 {

diff --git a/lib/utils.h b/lib/utils.h
@@ -263,7 +263,7 @@ extern int open_pipe(int [2]);
 #endif
 extern int memcmp_constant_time(const void *, const void *, size_t);
 
-#if defined _WITH_LVS_ || defined _LIBIPSET_DYNAMIC_
+#if defined _WITH_LVS_ || defined _HAVE_LIBIPSET_
 extern bool keepalived_modprobe(const char *);
 #endif