Skip to content

Commit 3d55cb1

Browse files
committed
ifdef out readline console code until ./configure supports it
1 parent 29d48df commit 3d55cb1

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

Makefile.am

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ riak_client_libincludedir = $(libdir)/riak_client/include
6161

6262
bin_PROGRAMS = riakc
6363
riakc_SOURCES = src/riakc/riakc.cpp
64-
riakc_CXXFLAGS = $(libriak_client_la_CXXFLAGS) -I/usr/local/Cellar/readline/6.2.1/include
65-
riakc_LDFLAGS = -lriak_client -L/usr/local/Cellar/readline/6.2.1/lib -lreadline
64+
riakc_CXXFLAGS = $(libriak_client_la_CXXFLAGS)
65+
# -I/usr/local/Cellar/readline/6.2.1/include
66+
riakc_LDFLAGS = -lriak_client
67+
# -L/usr/local/Cellar/readline/6.2.1/lib -lreadline
6668

6769
pkgconfigdir = $(libdir)/pkgconfig
6870
pkgconfig_DATA = riak_client.pc

Makefile.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,9 @@ nobase_include_HEADERS = riak_client/cxx/riak_client.hpp \
330330

331331
riak_client_libincludedir = $(libdir)/riak_client/include
332332
riakc_SOURCES = src/riakc/riakc.cpp
333-
riakc_CXXFLAGS = $(libriak_client_la_CXXFLAGS) -I/usr/local/Cellar/readline/6.2.1/include
334-
riakc_LDFLAGS = -lriak_client -L/usr/local/Cellar/readline/6.2.1/lib -lreadline
333+
riakc_CXXFLAGS = $(libriak_client_la_CXXFLAGS)
334+
# -I/usr/local/Cellar/readline/6.2.1/include
335+
riakc_LDFLAGS = -lriak_client
335336
pkgconfigdir = $(libdir)/pkgconfig
336337
pkgconfig_DATA = riak_client.pc
337338
TESTS = $(check_PROGRAMS)
@@ -1173,6 +1174,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
11731174
uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
11741175
uninstall-nobase_includeHEADERS uninstall-pkgconfigDATA
11751176

1177+
# -L/usr/local/Cellar/readline/6.2.1/lib -lreadline
11761178
# Tell versions [3.59,3.63) of GNU make to not export all variables.
11771179
# Otherwise a system limit (for SysV at least) may be exceeded.
11781180
.NOEXPORT:

src/riakc/riakc.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#ifdef HAS_READLINE
12
#include "riakc_console.hpp"
3+
#endif
24
#include <riak_client/cxx/riak_client.hpp>
35
#include <iostream>
46
#include <vector>
@@ -32,6 +34,7 @@ riak::client_ptr make_client(string url_str)
3234
return client;
3335
}
3436

37+
#ifdef HAS_READLINE
3538
void info_command(riak_console& client, const riak::string_vector& tokens);
3639
void list_command(riak_console& client, const riak::string_vector& tokens);
3740
void get_command(riak_console& client, const riak::string_vector& tokens);
@@ -137,6 +140,8 @@ void info_command(riak_console& client, const riak::string_vector& tokens)
137140
print_server_info(client.client());
138141
}
139142

143+
#endif
144+
140145
std::size_t parse_path_part(const std::string& path, std::string& part, std::size_t start)
141146
{
142147
if (path.empty()) return start;
@@ -168,6 +173,8 @@ void print_server_info(riak::client_ptr client)
168173
cout << "Server version: " << server_info.version() << endl;
169174
}
170175

176+
177+
171178
void do_get(riak::client_ptr client)
172179
{
173180
riak::riak_bkey bkey(parse_path());
@@ -207,8 +214,12 @@ int main(int argc, char *argv[])
207214
}
208215
if (command == "console")
209216
{
217+
#ifdef HAS_READLINE
210218
riak_console console(urlstr, make_client(urlstr));
211219
return console.run();
220+
#else
221+
cout << "no readline support" << endl;
222+
#endif
212223
}
213224
riak::client_ptr client(make_client(urlstr));
214225
if (command == "server-info")

0 commit comments

Comments
 (0)