From d029e1defd5b790978cb0a7b053010cfbe4cb394 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 22 Aug 2018 20:28:52 +0200 Subject: [PATCH] Makefile: conditionalize ifaddrs.h inclusion Signed-off-by: Christian Brauner --- configure.ac | 7 ++++++- src/lxc/Makefile.am | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b2b2f71c9..0139a746b 100644 --- a/configure.ac +++ b/configure.ac @@ -611,7 +611,12 @@ AC_CHECK_DECLS([PR_SET_NO_NEW_PRIVS], [], [], [#include ]) AC_CHECK_DECLS([PR_GET_NO_NEW_PRIVS], [], [], [#include ]) # Check for some headers -AC_CHECK_HEADERS([sys/signalfd.h pty.h ifaddrs.h sys/memfd.h sys/personality.h utmpx.h sys/timerfd.h sys/resource.h]) +AC_CHECK_HEADERS([sys/signalfd.h pty.h sys/memfd.h sys/personality.h utmpx.h sys/timerfd.h sys/resource.h]) + +AC_CHECK_HEADER([ifaddrs.h], + AM_CONDITIONAL(HAVE_IFADDRS_H, true) + AC_DEFINE(HAVE_IFADDRS_H, 1, [Have ifaddrs.h]), + AM_CONDITIONAL(HAVE_IFADDRS_H, false)) # lookup major()/minor()/makedev() AC_HEADER_MAJOR diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 68311a90d..0322a0d65 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -132,9 +132,12 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \ version.h \ $(LSM_SOURCES) +if !HAVE_IFADDRS_H +liblxc_la_SOURCES += ../include/ifaddrs.c ../include/ifaddrs.h +endif + if IS_BIONIC -liblxc_la_SOURCES += ../include/ifaddrs.c ../include/ifaddrs.h \ - ../include/lxcmntent.c ../include/lxcmntent.h \ +liblxc_la_SOURCES += ../include/lxcmntent.c ../include/lxcmntent.h \ ../include/openpty.c ../include/openpty.h endif -- 2.47.2