You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/07/14 20:23:45 UTC

git commit: THRIFT-2602 Fix missing dist files

Repository: thrift
Updated Branches:
  refs/heads/master 1a3632351 -> 3974aaba6


THRIFT-2602 Fix missing dist files

- set bison to 2.5
- include "config.h" within thriftl.ll

Patch: Roger Meier


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3974aaba
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3974aaba
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3974aaba

Branch: refs/heads/master
Commit: 3974aaba691cfc3681b71667ddd5c65a3d7e74ac
Parents: 1a36323
Author: Roger Meier <ro...@apache.org>
Authored: Mon Jul 14 20:22:12 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Jul 14 20:22:12 2014 +0200

----------------------------------------------------------------------
 compiler/cpp/src/thriftl.ll | 2 ++
 configure.ac                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/3974aaba/compiler/cpp/src/thriftl.ll
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index 5afc601..1fe6b2e 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -52,6 +52,8 @@
 
 #ifdef _MSC_VER
 #include "windows/config.h"
+#else
+#include "config.h"
 #endif
 #include "main.h"
 #include "globals.h"

http://git-wip-us.apache.org/repos/asf/thrift/blob/3974aaba/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 065ac68..5af20de 100755
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
-AC_PROG_BISON
+AC_PROG_BISON(2.5)
 AC_PROG_YACC
 AC_PROG_LEX
 AM_PROG_LEX