[tor-commits] [tor/master] Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines

[nickm at torproject.org]

commit 296649fd2b0aa1d0c328ca8b494d746a75cbb28b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 13 19:51:37 2011 -0400

    Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines
    
    Apparently autoheader throws a tantrum if you say 'AC_DEFINE([a],
    [b])'.  Instead you must say 'AC_DEFINE([a], [b], [description of
    a])'.  We were running into this in our replacement definitions for
    FLEXIBLE_ARRAY_MEMBER, which were only getting built on autoconf
    versions before 2.61 -- and this made us stop working with those
    autoconf versinos.
    
    Fixes bug 2430; bugfix on 0.2.3.1-alpha.
---
 changes/bug2430 |    4 ++++
 configure.in    |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug2430 b/changes/bug2430
new file mode 100644
index 0000000..3908856
--- /dev/null
+++ b/changes/bug2430
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix a bug in configure.in that kept it from building a configure
+      script with autoconf versions earlier than 2.61. Fixes bug 2430;
+      bugfix on 0.2.3.1-alpha.
diff --git a/configure.in b/configure.in
index a449136..c6ee589 100644
--- a/configure.in
+++ b/configure.in
@@ -189,9 +189,9 @@ AC_C_FLEXIBLE_ARRAY_MEMBER
   [tor_cv_c_flexarray=yes],
   [tor_cv_c_flexarray=no])])
  if test $tor_cv_flexarray = yes ; then
-   AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [])
+   AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [], [Define to nothing if C supports flexible array members, and to 1 if it does not.])
  else
-   AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1])
+   AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1], [Define to nothing if C supports flexible array members, and to 1 if it does not.])
  fi
 ])