diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-22 14:45:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-22 14:45:38 -0400 |
| commit | e6150c7fc079d7841bedd0df838b29aef0f497d7 (patch) | |
| tree | 2f5f3a108a7522ab94c22c43db3a61650e685984 | |
| parent | 2b3822d2daf884b39f2405d3bb1d1eb073557a28 (diff) | |
| parent | 883dc335e9ea3e0d944ce5cb3c6f140a6cad6ff1 (diff) | |
| download | tor-e6150c7fc079d7841bedd0df838b29aef0f497d7.tar.gz tor-e6150c7fc079d7841bedd0df838b29aef0f497d7.zip | |
Merge remote-tracking branch 'public/bug12693_025'
| -rw-r--r-- | changes/bug12693 | 3 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug12693 b/changes/bug12693 new file mode 100644 index 0000000000..11dfe78a2f --- /dev/null +++ b/changes/bug12693 @@ -0,0 +1,3 @@ + o Build fixes: + - Allow our configure script to build correctly with autoconf 2.62 + again. Fixes bug 12693; bugfix on 0.2.5.2-alpha. diff --git a/configure.ac b/configure.ac index 067527a779..5aeeeb4025 100644 --- a/configure.ac +++ b/configure.ac @@ -604,11 +604,12 @@ if test x$enable_gcc_hardening != xno; then TOR_CHECK_CFLAGS(-fstack-protector-all, also_link) AS_VAR_PUSHDEF([can_compile], [tor_cv_cflags_-fstack-protector-all]) AS_VAR_PUSHDEF([can_link], [tor_can_link_-fstack-protector-all]) +m4_ifdef([AS_VAR_IF],[ AS_VAR_IF(can_compile, [yes], AS_VAR_IF(can_link, [yes], [], AC_MSG_ERROR([We tried to build with stack protection; it looks like your compiler supports it but your libc does not provide it. Are you missing libssp? (You can --disable-gcc-hardening to ignore this error.)])) - ) + )]) AS_VAR_POPDEF([can_link]) AS_VAR_POPDEF([can_compile]) TOR_CHECK_CFLAGS(-Wstack-protector) |