Two tiny reviewslgtm and lgtm. ship 'em. ----- Original Message ----- From: David Reiss To: Thrift Development Sent: Thursday, July 10, 2008 6:47 PM Subject: Two tiny reviews
Both build system-related, cleaning up issues from the fastbinary merge. erlang: http://gitweb.thrift-rpc.org/?p=thrift.git;a=commitdiff;h=382598a ruby: http://gitweb.thrift-rpc.org/?p=thrift.git;a=commitdiff;h=7ec29e5 Patches attached for the permanent record. ------------------------------------------------------------------------------ From 382598aba047ec7ff8ad8b4907d9f0846230999b Mon Sep 17 00:00:00 2001 From: David Reiss <[EMAIL PROTECTED]> Date: Thu, 10 Jul 2008 18:29:18 -0700 Subject: [PATCH] Add erl back to EXTRA_DIST because it doesn't use Automake. --- lib/Makefile.am | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 0765f03..32240ae 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,10 +21,13 @@ if ENABLE_RUBY SUBDIRS += rb endif +# All of the libs that don't use Automake need to go in here +# so they will end up in our release tarballs. EXTRA_DIST = \ cocoa \ hs \ ocaml \ perl \ php \ + erl \ st -- 1.5.4 ------------------------------------------------------------------------------ From 7ec29e5a21888060c245cef4fb9cd7d0bb449ded Mon Sep 17 00:00:00 2001 From: David Reiss <[EMAIL PROTECTED]> Date: Thu, 10 Jul 2008 18:32:43 -0700 Subject: [PATCH] s/ENABLE_RUBY/WITH_RUBY/ for consistency. This didn't happen in r666490 because the Ruby stuff was developed in a separate branch. --- configure.ac | 2 +- lib/Makefile.am | 2 +- test/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3e1d1ac..4ef8d19 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,7 @@ AX_THRIFT_LIB(ruby, [Ruby], yes) if test "$with_ruby" = "yes"; then AC_PATH_PROG([RUBY], [ruby]) fi -AM_CONDITIONAL(ENABLE_RUBY, [test -n "$RUBY"]) +AM_CONDITIONAL(WITH_RUBY, [test -n "$RUBY"]) AC_C_CONST AC_C_INLINE diff --git a/lib/Makefile.am b/lib/Makefile.am index 32240ae..3cb592c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,7 @@ if WITH_ERLANG SUBDIRS += erl endif -if ENABLE_RUBY +if WITH_RUBY SUBDIRS += rb endif diff --git a/test/Makefile.am b/test/Makefile.am index bac5b06..dab0f4e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -8,7 +8,7 @@ if WITH_PYTHON SUBDIRS += py endif -if ENABLE_RUBY +if WITH_RUBY SUBDIRS += rb endif -- 1.5.4
