Merge psp-os1:/home/hart/ntp-dev-libevent-upstream

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20110414

bk: 4da759cawRWgeX8CkW0nEUQAv2S3Lg

diff --cc sntp/libevent/Makefile.am
Simple merge

diff --cc sntp/libevent/configure.in
index cd8711e5055fa3f78ca96b2b2a03c7a9894f7f9b,7b147591e08313956d4cfb4dbf7f6ce639e58071..786ff64b49a53bd7c34555dcc0b3d6a6934af28b
--- 1/sntp/libevent/configure.in
--- 2/sntp/libevent/configure.in
+++ b/sntp/libevent/configure.in
@@@ -5,13 -5,11 +5,11 @@@ AC_INIT(event.c
  
  AC_CONFIG_MACRO_DIR([m4])
  
- AM_INIT_AUTOMAKE(libevent,2.0.10-stable-dev)
- m4_ifdef(
-     [AM_SILENT_RULES],
-     [AM_SILENT_RULES([no])]
- )
- AM_CONFIG_HEADER(config.h)
- AC_DEFINE(NUMERIC_VERSION, 0x02000a01, [Numeric representation of the version])
+ AM_INIT_AUTOMAKE(libevent,2.1.0-alpha-dev)
+ dnl AM_SILENT_RULES req. automake 1.11.  [no] defaults V=1
 -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h  evconfig-private.h:evconfig-private.h.in)
+ AC_DEFINE(NUMERIC_VERSION, 0x02010001, [Numeric representation of the version])
  
  dnl Initialize prefix.
  if test "$prefix" = "NONE"; then
@@@ -721,6 -717,9 +724,9 @@@ if test "$GCC" = yes && test "$enable_f
                    ]]
                )],
                [
 -                    dnl We have to do this invocation manually so that we can
 -                    dnl get the output of conftest.err to make sure it doesn't
 -                    dnl mention gc-sections.
++                  dnl We have to do this invocation manually so that we can
++                  dnl get the output of conftest.err to make sure it doesn't
++                  dnl mention gc-sections.
                    if test "X$cross_compiling" = "Xyes" || grep gc-sections conftest.err ; then
                        libevent_cv_gc_sections_runs=no
                    else

diff --cc sntp/libevent/event.c
Simple merge

diff --cc sntp/libevent/evthread_pthread.c
Simple merge

diff --cc sntp/libevent/http.c
index 3b00848486a767a81889c7641f93dc3d52b17463,3909aa8c518575463abe8440ad6f29f4ef857919..336f5afbb7925ecfc0ac4ba224f548a234c42d6b
--- 1/sntp/libevent/http.c
--- 2/sntp/libevent/http.c
+++ b/sntp/libevent/http.c
@@@ -55,10 -56,10 +56,13 @@@
  
  #ifdef _EVENT_HAVE_NETINET_IN_H
  #include <netinet/in.h>
 +# ifdef _XOPEN_SOURCE_EXTENDED
 +#  include <arpa/inet.h>
 +# endif
  #endif
+ #ifdef _EVENT_HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+ #endif
  #ifdef _EVENT_HAVE_NETDB_H
  #include <netdb.h>
  #endif

diff --cc sntp/libevent/include/event2/event.h
Simple merge

diff --cc sntp/libevent/sample/http-server.c
Simple merge