[or-cvs] r12773: Backport part of 12767: make configure script work even on m (tor/branches/tor-0_1_2-patches)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-12-11 18:21:44 -0500 (Tue, 11 Dec 2007)
New Revision: 12773

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/configure.in
Log:
 r17099@catbus:  nickm | 2007-12-11 18:16:59 -0500
 Backport part of 12767: make configure script work even on my current catbus install, even with weird headers.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r17099] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-12-11 23:21:41 UTC (rev 12772)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-12-11 23:21:44 UTC (rev 12773)
@@ -23,6 +23,9 @@
     - Fix handling of hex nicknames when answering controller requests for
       networkstatus by name, or when deciding whether to warn about unknown
       routers in a config option. (Patch from mwenge.)
+    - Fix a couple of hard-to-trigger autoconf problems that could result
+      in really weird results on platforms whose sys/types.h files define
+      nonstandard integer types.
 
 
 Changes in version 0.1.2.18 - 2007-10-28

Modified: tor/branches/tor-0_1_2-patches/configure.in
===================================================================
--- tor/branches/tor-0_1_2-patches/configure.in	2007-12-11 23:21:41 UTC (rev 12772)
+++ tor/branches/tor-0_1_2-patches/configure.in	2007-12-11 23:21:44 UTC (rev 12773)
@@ -84,6 +84,7 @@
      AC_HELP_STRING(--enable-gcc-warnings, enable verbose warnings))
 
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
@@ -204,7 +205,10 @@
 dnl ------------------------------------------------------
 dnl Where do you live, libevent?  And how do we call you?
 
-dnl This is a disgusting hack so we safely include recent libevent headers.
+dnl This needs to happen before the below disgusting hack.
+AC_CHECK_HEADERS(sys/types.h)
+
+dnl This is a disgusting hack so we safely include older libevent headers.
 AC_CHECK_TYPE(u_int64_t, unsigned long long)
 AC_CHECK_TYPE(u_int32_t, unsigned long)
 AC_CHECK_TYPE(u_int16_t, unsigned short)
@@ -268,7 +272,7 @@
 else
 LIBS="$LIBS -levent"
 fi
-if test $tor_cv_libevent_dir != "(system)"; then
+if test "$tor_cv_libevent_dir" != "(system)"; then
   if test -d "$tor_cv_libevent_dir/lib" ; then
     LDFLAGS="-L$tor_cv_libevent_dir/lib $LDFLAGS"
     le_libdir="$tor_cv_libevent_dir/lib"
@@ -465,7 +469,7 @@
 
 dnl The warning message here is no longer strictly accurate.
 
-AC_CHECK_HEADERS(unistd.h string.h signal.h ctype.h sys/stat.h sys/types.h fcntl.h sys/fcntl.h sys/time.h errno.h assert.h time.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
+AC_CHECK_HEADERS(unistd.h string.h signal.h ctype.h sys/stat.h fcntl.h sys/fcntl.h sys/time.h errno.h assert.h time.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
 
 AC_CHECK_HEADERS(netdb.h sys/ioctl.h sys/socket.h arpa/inet.h netinet/in.h pwd.h grp.h)