diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-12 14:50:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-12 14:50:57 -0400 |
| commit | c1c74c51d42e46d32f4fe765e653287e400dc6b6 (patch) | |
| tree | fd62d937e19acaced25842b6df1b023a1666782c | |
| parent | 06eafb3fccc9c2c924d796c8cab542ac2dd761c0 (diff) | |
| parent | f3d000f49662f7b3d94340f30fd745c58712ea2b (diff) | |
| download | tor-c1c74c51d42e46d32f4fe765e653287e400dc6b6.tar.gz tor-c1c74c51d42e46d32f4fe765e653287e400dc6b6.zip | |
Merge remote branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug2020 | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/changes/bug2020 b/changes/bug2020 new file mode 100644 index 0000000000..51c4d06112 --- /dev/null +++ b/changes/bug2020 @@ -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. + diff --git a/configure.in b/configure.in index dddc4b8c6b..35f1e24b29 100644 --- a/configure.in +++ b/configure.in @@ -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 |