[or-cvs] r8826: Libevent-1.2 exports, but does not define in its headers, st (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2006-10-24 22:51:45 -0400 (Tue, 24 Oct 2006)
New Revision: 8826

Modified:
   tor/trunk/
   tor/trunk/configure.in
Log:
 r9384 at Kushana:  nickm | 2006-10-24 22:51:42 -0400
 Libevent-1.2 exports, but does not define in its headers, strlcpy.  Try to fix this in configure.in by checking for most functions before we check for libevent.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9384] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2006-10-25 02:01:27 UTC (rev 8825)
+++ tor/trunk/configure.in	2006-10-25 02:51:45 UTC (rev 8826)
@@ -157,7 +157,6 @@
 AC_DEFINE(MS_WINDOWS, 1, [Define to 1 if we are building for Windows.])
 fi
 
-
 AC_SEARCH_LIBS(socket, [socket])
 AC_SEARCH_LIBS(gethostbyname, [nsl])
 AC_SEARCH_LIBS(dlopen, [dl])
@@ -168,6 +167,17 @@
   AC_SEARCH_LIBS(pthread_detach, [pthread])
 fi
 
+dnl -------------------------------------------------------------------
+dnl Check for functions before libevent, since libevent-1.2 apparently
+dnl exports strlcpy without defining it in a header.
+
+AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull ftello getaddrinfo localtime_r gmtime_r memmem strtok_r)
+
+if test $enable_threads = "yes"; then
+  AC_CHECK_HEADERS(pthread.h)
+  AC_CHECK_FUNCS(pthread_create)
+fi
+
 dnl ------------------------------------------------------
 dnl Where do you live, libevent?  And how do we call you?
 
@@ -278,6 +288,9 @@
 fi
 fi
 
+dnl Now check for particular libevent functions.
+AC_CHECK_FUNCS(event_get_version event_get_method event_set_log_callback)
+
 dnl ------------------------------------------------------
 dnl Where do you live, openssl?  And how do we call you?
 
@@ -469,13 +482,6 @@
 #include <sys/socket.h>
 #endif])
 
-AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull ftello getaddrinfo localtime_r gmtime_r event_get_version event_get_method event_set_log_callback memmem strtok_r)
-
-if test $enable_threads = "yes"; then
-  AC_CHECK_HEADERS(pthread.h)
-  AC_CHECK_FUNCS(pthread_create)
-fi
-
 if test x$transparent = xtrue ; then
    transparent_ok=0
    if test x$net_if_found = x1 -a x$net_pfvar_found = x1 ; then