THRIFT-1614: Thrift build from svn repo sources fails with automake-1.12

Client: compiler
Patch: jfarrell

Updates automake version min req to 1.11 and switches header generated
by yacc to .h instead of .hh.

diff --git a/bootstrap.sh b/bootstrap.sh
index 26d93c8..0c2b886 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -38,9 +38,6 @@ else
   exit 1
 fi
 
-# automake <= 1.11 names yacc output .h rather than .hh -- see THRIFT-1614
-echo '#include "thrifty.h"' > compiler/cpp/thrifty.hh
-
 autoscan
 $LIBTOOLIZE --copy --automake
 aclocal -I ./aclocal

diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 13fed07..7a89c54 100644 (file)
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -109,6 +109,5 @@ EXTRA_DIST = \
 
 clean-local:
        $(RM) thriftl.cc thrifty.cc thrifty.h thrifty.hh version.h windows/version.h
-       echo '#include "thrifty.h"' > thrifty.hh
 
 src/main.cc: version.h

diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index 8accf4c..8538652 100644 (file)
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -48,7 +48,7 @@
  * Must be included AFTER parse/t_program.h, but I can't remember why anymore
  * because I wrote this a while ago.
  */
-#include "thrifty.hh"
+#include "thrifty.h"
 
 void thrift_reserved_keyword(char* keyword) {
   yyerror("Cannot use reserved language keyword: \"%s\"\n", keyword);

diff --git a/configure.ac b/configure.ac
index d1616c9..9dd0e2d 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_INIT([thrift], [1.0.0-dev])
 
 AC_CONFIG_AUX_DIR([.])
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.11 tar-ustar])
 PKG_PROG_PKG_CONFIG
 
 AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.