[trac1526] check for clock_gettime in -lrt

Remove the OS detection from this branch. It will be part of different
branch (1237).

(I will test on MacOS X shortly.)

diff --git a/configure.ac b/configure.ac
index 7ecb92cc3a804c8b14ff1ee021dcee2465b05186..838738bdb78c9e77787dad393622751fa550b72a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -369,36 +369,6 @@ 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([
@@ -861,6 +831,10 @@ EV_SET(NULL, 0, 0, 0, 0, 0, udata);],
        ])
 fi
 
+CLOCK_GETTIME_LDFLAGS=
+AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_GETTIME_LDFLAGS=-lrt], [])
+AC_SUBST([CLOCK_GETTIME_LDFLAGS])
+
 # /dev/poll issue: ASIO uses /dev/poll by default if it's available (generally
 # the case with Solaris).  Unfortunately its /dev/poll specific code would
 # trigger the gcc's "missing-field-initializers" warning, which would
@@ -1171,7 +1145,6 @@ 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 13471f94a6db2641dfe669dc68f20ca38b8de9c5..bbad595f31be83183c3f17aea3b78545e78e5e39 100644 (file)
--- a/tests/tools/perfdhcp/Makefile.am
+++ b/tests/tools/perfdhcp/Makefile.am
@@ -2,14 +2,11 @@ SUBDIRS = .
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
-AM_LDFLAGS = -lm
+AM_LDFLAGS = $(CLOCK_GETTIME_LDFLAGS)
+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