Makefile: conditionalize ifaddrs.h inclusion

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index b2b2f71c9b31c6c1165272a56cd01f5caafb8e53..0139a746b1a734fd04716447d94dfdce07bc2c7d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -611,7 +611,12 @@ AC_CHECK_DECLS([PR_SET_NO_NEW_PRIVS], [], [], [#include <sys/prctl.h>])
 AC_CHECK_DECLS([PR_GET_NO_NEW_PRIVS], [], [], [#include <sys/prctl.h>])
 
 # 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 68311a90d02d0858e26afc88023f3e5a111bacc9..0322a0d651c6fb135a4ea30e7563939f0e52190f 100644 (file)
--- 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