Skip to content

Commit a2f10e1

Browse files
committed
added lib checks in configure. other bugs
1 parent da71a5b commit a2f10e1

5 files changed

+29
-12
lines changed

configure.ac

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
dnl Process this file with autoconf to produce a configure script.
22

33
AC_PREREQ(2.59)
4-
AC_INIT(test, 1.0)
4+
AC_INIT(qfs-mapred, 1.0)
5+
6+
AC_CHECK_LIB([boost_regex], [main], [],[
7+
echo "boost_regex library is required for this program"
8+
exit -1])
9+
10+
AC_CHECK_LIB([boost_program_options], [main], [],[
11+
echo "boost_program_options library is required for this program"
12+
exit -1])
13+
14+
AC_CHECK_LIB([boost_thread], [main], [],[
15+
echo "boost_thread library is required for this program"
16+
exit -1])
17+
18+
AC_CHECK_LIB([gearman], [main], [],[
19+
echo "gearman library is required for this program"
20+
exit -1])
21+
22+
23+
524

625

726
AC_CANONICAL_SYSTEM

src/Makefile.am

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
AM_CPPFLAGS=-Wall -I/home/alex/qfs/build/release/include
2-
AM_LDFLAGS= -L/home/alex/qfs/build/release/lib -lboost_program_options -lgearman -lqfs_client -lboost_regex -lboost_thread -lpthread
3-
1+
AM_CPPFLAGS=-Wall -I/opt/qc/qfs/client/include
2+
AM_LDFLAGS= -L/opt/qc/qfs/client/lib -lboost_program_options -lgearman -lqfs_client -lqfs_qcdio -lqfs_common -lqfs_qcrs -lqfs_io -lboost_regex -lboost_thread -lpthread
43
bin_PROGRAMS=qfs_mapred_submit mapper_worker mapper_to_qfs_partitions sorter_worker reducer_worker kvsorter
5-
64
qfs_mapred_submit_SOURCES=qfs_mapred_submit_main.cc
75
mapper_worker_SOURCES=mapper_worker_main.cc
86
mapper_to_qfs_partitions_SOURCES=mapper_to_qfs_partitions_main.cc

src/mapper_worker_main.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ int main(int args, char *argv[]) {
5050
boost::program_options::value<int>(&timeout)->default_value(-1),
5151
"Timeout in milliseconds")("path_to_qfs_bin_tools",
5252
boost::program_options::value<string>(&path_to_qfs_bin_tools)->default_value(
53-
"/home/alex/qfs/build/release/bin/tools/"),
53+
"/opt/qc/qfs/client/bin/"),
5454
"Path to qfs tools folder")("path_to_qfs_mapred_bin",
5555
boost::program_options::value<string>(&path_to_qfs_mapred_bin)->default_value(
56-
"/home/alex/workspace/qfs_mapred/src/"),
56+
"/opt/hurdad/qfs-mapred/bin//"),
5757
"Path to qfs_mapred bin folder");
5858

5959
boost::program_options::variables_map vm;

src/reducer_worker_main.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ int main(int args, char *argv[]) {
4848
boost::program_options::value<uint32_t>(&count)->default_value(0),
4949
"Number of jobs to run before exiting")("timeout,u",
5050
boost::program_options::value<int>(&timeout)->default_value(-1),
51-
"Timeout in milliseconds")("path_to_qfs_bin_tools,p",
51+
"Timeout in milliseconds")("path_to_qfs_bin_tools",
5252
boost::program_options::value<string>(&path_to_qfs_bin_tools)->default_value(
53-
"/home/alex/qfs/build/release/bin/tools/"),
53+
"/opt/qc/qfs/client/bin/"),
5454
"Path to qfs tools folder");
5555
;
5656

src/sorter_worker_main.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ int main(int args, char *argv[]) {
4545
boost::program_options::value<uint32_t>(&count)->default_value(0),
4646
"Number of jobs to run before exiting")("timeout,u",
4747
boost::program_options::value<int>(&timeout)->default_value(-1),
48-
"Timeout in milliseconds")("path_to_qfs_bin_tools,p",
48+
"Timeout in milliseconds")("path_to_qfs_bin_tools",
4949
boost::program_options::value<string>(&path_to_qfs_bin_tools)->default_value(
50-
"/home/alex/qfs/build/release/bin/tools/"),
50+
"/opt/qc/qfs/client/bin/"),
5151
"Path to qfs tools folder")("path_to_qfs_mapred_bin",
5252
boost::program_options::value<string>(&path_to_qfs_mapred_bin)->default_value(
53-
"/home/alex/workspace/qfs_mapred/src/"),
53+
"/opt/hurdad/qfs-mapred/bin/"),
5454
"Path to qfs_mapred bin folder");
5555

5656
boost::program_options::variables_map vm;

0 commit comments

Comments
 (0)