Merge remote branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson
2010-10-12 14:50:57 -04:00
2 changed files with 9 additions and 4 deletions
+5
View File
@@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix warnings that newer versions of autoconf produced during
./autogen.sh. From what I can tell these were harmless in our case,
but they were extremely verbose. Fixes bug 2020.
+4 -4
View File
@@ -225,9 +225,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [
#error
return x(y);
#endif
]),
])],
bmipspro=false; AC_MSG_RESULT(no),
bmipspro=true; AC_MSG_RESULT(yes)])
bmipspro=true; AC_MSG_RESULT(yes))
if test "$bmipspro" = true; then
CFLAGS="$CFLAGS -c99"
@@ -687,8 +687,8 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([
#ifdef HAVE_TIME_H
#include <time.h>
#endif
int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }]),
tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes, tor_cv_time_t_signed=cross])
int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }])],
tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes, tor_cv_time_t_signed=cross)
])
if test "$tor_cv_time_t_signed" = cross; then