From: Tomek Mrugalski Date: Thu, 22 Dec 2011 16:21:45 +0000 (+0100) Subject: [1526] perfdhcp compilation fix (makefile.am/configure.ac) X-Git-Tag: trac2351_base~299^2~14^2^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d12104290629bd4f3c2e9edbc1b4139d337afeeb;p=thirdparty%2Fkea.git [1526] perfdhcp compilation fix (makefile.am/configure.ac) --- diff --git a/configure.ac b/configure.ac index ac13b80913..7ecb92cc3a 100644 --- a/configure.ac +++ b/configure.ac @@ -369,6 +369,36 @@ AC_HEADER_STDBOOL AC_TYPE_SIZE_T +# Detect OS type (it may be used to do OS-specific things, e.g. +# interface detection in DHCP) +AC_MSG_CHECKING(OS family) +system=`uname -s` +case $system in + Linux) + OS_TYPE="Linux" + CPPFLAGS="$CPPFLAGS -DOS_LINUX" + ;; + Darwin | FreeBSD | NetBSD | OpenBSD) + OS_TYPE="BSD" + CPPFLAGS="$CPPFLAGS -DOS_BSD" + ;; + Solaris) + OS_TYPE="Solaris" + CPPFLAGS="$CPPFLAGS -DOS_SOLARIS" + ;; + *) + OS_TYPE="Unknown" + AC_MSG_WARN("Unsupported OS: uname returned $system") + ;; +esac +AC_MSG_RESULT($OS_TYPE) + +AM_CONDITIONAL(OS_LINUX, test $OS_TYPE = Linux) +AM_COND_IF([OS_LINUX], [AC_DEFINE([OS_LINUX], [1], [Running on Linux?])]) +AM_CONDITIONAL(OS_BSD, test $OS_TYPE = BSD) +AM_COND_IF([OS_BSD], [AC_DEFINE([OS_BSD], [1], [Running on BSD?])]) +AM_CONDITIONAL(OS_SOLARIS, test $OS_TYPE = Solaris) +AM_COND_IF([OS_SOLARIS], [AC_DEFINE([OS_SOLARIS], [1], [Running on Solaris?])]) AC_MSG_CHECKING(for sa_len in struct sockaddr) AC_TRY_COMPILE([ @@ -1141,6 +1171,7 @@ Flags: CXXFLAGS: $CXXFLAGS LDFLAGS: $LDFLAGS B10_CXXFLAGS: $B10_CXXFLAGS + OS Family: $OS_TYPE dnl includes too Python: ${PYTHON_INCLUDES} ${PYTHON_CXXFLAGS} diff --git a/tests/tools/perfdhcp/Makefile.am b/tests/tools/perfdhcp/Makefile.am index 0707e61c60..13471f94a6 100644 --- a/tests/tools/perfdhcp/Makefile.am +++ b/tests/tools/perfdhcp/Makefile.am @@ -2,10 +2,14 @@ SUBDIRS = . AM_CXXFLAGS = $(B10_CXXFLAGS) -AM_LDFLAGS = -lrt -lm +AM_LDFLAGS = -lm if USE_STATIC_LINK AM_LDFLAGS += -static endif +if OS_LINUX +AM_LDFLAGS += -lrt +endif + pkglibexec_PROGRAMS = perfdhcp perfdhcp_SOURCES = perfdhcp.c