From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Feb 2011 22:41:27 +0000 (-0500)
Subject: Merge remote branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a11c30b5feda088ad79b5fb71370616a7c3a4f30;p=libevent

Merge remote branch 'origin/patches-2.0'

This branch is the big one that merges all the ntp folks' changes

Conflicts:
	configure.in
---

a11c30b5feda088ad79b5fb71370616a7c3a4f30
diff --cc configure.in
index 12d94034,3b7d1a58..cc4eb6cb
--- a/configure.in
+++ b/configure.in
@@@ -16,15 -14,18 +16,27 @@@ if test "$prefix" = "NONE"; the
     prefix="/usr/local"
  fi
  
 +dnl Try and get a full POSIX environment on obscure systems
 +ifdef([AC_USE_SYSTEM_EXTENSIONS], [
 +AC_USE_SYSTEM_EXTENSIONS
 +], [
 +AC_AIX
 +AC_GNU_SOURCE
 +AC_MINIX
 +])
 +
+ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+ dnl the 'build' machine is where we run configure and compile
+ dnl the 'host' machine is where the resulting stuff runs.
+ 
 -case "$host_os" in
 -
 - osf5*)
 -    CFLAGS="$CFLAGS -D_OSF_SOURCE"
 -    ;;
 -esac
++#case "$host_os" in
++#
++# osf5*)
++#    CFLAGS="$CFLAGS -D_OSF_SOURCE"
++#    ;;
++#esac
+ 
  dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_INSTALL