[or-cvs] Hey rocky, watch me pull a link pass out of a hat!
Nick Mathewson
nickm at seul.org
Tue May 17 02:39:44 UTC 2005
Update of /home/or/cvsroot/tor
In directory moria.mit.edu:/tmp/cvs-serv24148
Modified Files:
configure.in
Log Message:
Hey rocky, watch me pull a link pass out of a hat!
Index: configure.in
===================================================================
RCS file: /home/or/cvsroot/tor/configure.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- configure.in 17 May 2005 02:24:48 -0000 1.197
+++ configure.in 17 May 2005 02:39:42 -0000 1.198
@@ -65,20 +65,18 @@
if test "$event_found" = no; then
saved_LIBS="$LIBS"
saved_LDFLAGS="$LDFLAGS"
- saved_CPPFLAGS="$CPPFLAGS"
AC_CACHE_CHECK([for libevent in /usr/local/lib], ac_cv_libevent_local, [
LIBS="$LIBS -levent"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- AC_TRY_LINK([#include <event.h>], [ event_init(); return 0; ], [
- libevent_is_in_local=yes ], [ libevent_is_in_local=no ])
+ AC_TRY_LINK([], [ void *event_init(void); event_init(); ],
+ [ libevent_is_in_local=yes ], [ libevent_is_in_local=no ])
if test libevent_is_in_local = yes; then
AC_TRY_RUN([
-#include <event.h>
+void *event_init(void);
int main(void)
{
- event_init();
- return 0;
+ if (!event_init())
+ return -1;
}], , [ ac_cv_libevent_local=unlinked ])
else
ac_cv_libevent_local=no
@@ -86,11 +84,11 @@
if test "$GCC" = yes -a $ac_cv_libevent_local = unlinked ; then
LDFLAGS="$LDFLAGS -Wl,-R/usr/local/lib"
AC_TRY_RUN([
-#include <event.h>
+void *event_init(void);
int main(void)
{
- event_init();
- return 0;
+ if (!event_init())
+ return -1;
}], [ ac_cv_libevent_local=unlinked_gcc_elf ])
fi
@@ -101,13 +99,13 @@
if test $ac_cv_libevent_local != no; then
LIBS="$LIBS -levent"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
- CFLAGS="$CFLAGS -I/usr/local/include"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
fi
if test $ac_cv_libevent_local = unlinked_gcc_elf; then
LDFLAGS="$LDFLAGS -Wl,-R/usr/local/lib"
fi
- if test $ac_cv_libevent_local = unlinked; then
+ if test $ac_cv_libevent_local = unlinked ; then
echo <<EOF
=====================================================
HEY!!!!
@@ -127,7 +125,15 @@
=====================================================
EOF
+fi
+
+ if test $ac_cv_libevent_local = no ; then
+ echo <<EOF
+Tor requires libevent to build. You can download the latest
+version of libevent from http://monkey.org/~provos/libevent/
+EOF
fi
+
fi
dnl ------------------------------------------------------
More information about the tor-commits
mailing list