[tor-commits] [tor/master] Fix configure script build with autoconf < 2.63

[nickm at torproject.org]

commit 883dc335e9ea3e0d944ce5cb3c6f140a6cad6ff1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 13 12:01:58 2014 -0400

    Fix configure script build with autoconf < 2.63
    
    We added some AS_VAR_IF-based checks to detect whether we have
    managed to compile (but not link) with stack-protector.  On autoconf
    before 2.63, we don't have AS_VAR_IF, so we just have to let the
    user get a compile error rather than a helpful "find libssp" error.
    
    Fixes bug 12693; bugfix on 0.2.5.2-alpha (commit 21ac292820da578)
---
 changes/bug12693 |    3 +++
 configure.ac     |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug12693 b/changes/bug12693
new file mode 100644
index 0000000..11dfe78
--- /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 c37f154..55777e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,11 +626,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)