Skip to content

Commit

Permalink
Allow overrides of popt/glog
Browse files Browse the repository at this point in the history
  • Loading branch information
@rescrv
rescrv committed May 27, 2015
1 parent 7087620 commit e08dfc0
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 27 deletions.
54 changes: 27 additions & 27 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ hyperdex_daemon_LDADD += $(REPLICANT_LIBS)
hyperdex_daemon_LDADD += $(HYPERLEVELDB_LIBS)
hyperdex_daemon_LDADD += $(BUSYBEE_LIBS)
hyperdex_daemon_LDADD += $(E_LIBS)
hyperdex_daemon_LDADD += -lpopt -lglog $(LRT_LDFLAGS) -lpthread
hyperdex_daemon_LDADD += $(POPT_LIBS) ${GLOG_LIBS} $(LRT_LDFLAGS) -lpthread
man/hyperdex-daemon.1: man/hyperdex-daemon.1.h2m daemon/main.cc | hyperdex-daemon$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-daemon$(EXEEXT)

Expand Down Expand Up @@ -366,7 +366,7 @@ hyperdex_coordinator_CPPFLAGS = -DHYPERDEX_EXEC_DIR=\""$(hyperdexexecdir)\"" $(A
hyperdex_coordinator_LDADD =
hyperdex_coordinator_LDADD += $(BUSYBEE_LIBS)
hyperdex_coordinator_LDADD += $(E_LIBS)
hyperdex_coordinator_LDADD += -lpopt
hyperdex_coordinator_LDADD += $(POPT_LIBS)
man/hyperdex-coordinator.1: man/hyperdex-coordinator.1.h2m | hyperdex-coordinator${EXEEXT}
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-coordinator$(EXEEXT)

Expand Down Expand Up @@ -1129,13 +1129,13 @@ EXTRA_DIST += test/go/RangeSearchString.go
EXTRA_DIST += test/go/RegexSearch.go

test_replication_stress_test_SOURCES = test/replication-stress-test.cc
test_replication_stress_test_LDADD = libhyperdex-client.la $(E_LIBS) -lpopt -lpthread
test_replication_stress_test_LDADD = libhyperdex-client.la $(E_LIBS) $(POPT_LIBS) -lpthread

test_search_stress_test_SOURCES = test/search-stress-test.cc
test_search_stress_test_LDADD = libhyperdex-client.la $(E_LIBS) -lpopt -lpthread
test_search_stress_test_LDADD = libhyperdex-client.la $(E_LIBS) $(POPT_LIBS) -lpthread

test_simple_consistency_stress_test_SOURCES = test/simple-consistency-stress-test.cc
test_simple_consistency_stress_test_LDADD = libhyperdex-client.la $(E_LIBS) -lpopt -lpthread
test_simple_consistency_stress_test_LDADD = libhyperdex-client.la $(E_LIBS) $(POPT_LIBS) -lpthread

################################################################################
##################################### Tools ####################################
Expand Down Expand Up @@ -1196,175 +1196,175 @@ EXTRA_DIST += man/hyperdex.1.md
EXTRA_DIST += man/hyperdex.1.h2m
hyperdex_SOURCES = hyperdex.cc
hyperdex_CPPFLAGS = -DHYPERDEX_EXEC_DIR=\""$(hyperdexexecdir)\"" $(AM_CPPFLAGS) $(CPPFLAGS)
hyperdex_LDADD = -lpopt
hyperdex_LDADD = $(POPT_LIBS)
man/hyperdex.1: man/hyperdex.1.h2m hyperdex.cc | hyperdex$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex$(EXEEXT)

# hyperdex-add-space
EXTRA_DIST += man/hyperdex-add-space.1.md
EXTRA_DIST += man/hyperdex-add-space.1.h2m
hyperdex_add_space_SOURCES = tools/add-space.cc
hyperdex_add_space_LDADD = libhyperdex-admin.la -lpopt
hyperdex_add_space_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-add-space.1: man/hyperdex-add-space.1.h2m tools/add-space.cc | hyperdex-add-space$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-add-space$(EXEEXT)

# hyperdex-rm-space
EXTRA_DIST += man/hyperdex-rm-space.1.md
EXTRA_DIST += man/hyperdex-rm-space.1.h2m
hyperdex_rm_space_SOURCES = tools/rm-space.cc
hyperdex_rm_space_LDADD = libhyperdex-admin.la -lpopt
hyperdex_rm_space_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-rm-space.1: man/hyperdex-rm-space.1.h2m tools/rm-space.cc | hyperdex-rm-space$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-rm-space$(EXEEXT)

# hyperdex-mv-space
EXTRA_DIST += man/hyperdex-mv-space.1.md
EXTRA_DIST += man/hyperdex-mv-space.1.h2m
hyperdex_mv_space_SOURCES = tools/mv-space.cc
hyperdex_mv_space_LDADD = libhyperdex-admin.la -lpopt
hyperdex_mv_space_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-mv-space.1: man/hyperdex-mv-space.1.h2m tools/mv-space.cc | hyperdex-mv-space$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-mv-space$(EXEEXT)

# hyperdex-list-spaces
EXTRA_DIST += man/hyperdex-list-spaces.1.md
EXTRA_DIST += man/hyperdex-list-spaces.1.h2m
hyperdex_list_spaces_SOURCES = tools/list-spaces.cc
hyperdex_list_spaces_LDADD = libhyperdex-admin.la -lpopt
hyperdex_list_spaces_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-list-spaces.1: man/hyperdex-list-spaces.1.h2m tools/list-spaces.cc | hyperdex-list-spaces$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-list-spaces$(EXEEXT)

# hyperdex-validate-space
EXTRA_DIST += man/hyperdex-validate-space.1.md
EXTRA_DIST += man/hyperdex-validate-space.1.h2m
hyperdex_validate_space_SOURCES = tools/validate-space.cc
hyperdex_validate_space_LDADD = libhyperdex-admin.la -lpopt
hyperdex_validate_space_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-validate-space.1: man/hyperdex-validate-space.1.h2m tools/validate-space.cc | hyperdex-validate-space$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-validate-space$(EXEEXT)

# hyperdex-add-index
EXTRA_DIST += man/hyperdex-add-index.1.md
EXTRA_DIST += man/hyperdex-add-index.1.h2m
hyperdex_add_index_SOURCES = tools/add-index.cc
hyperdex_add_index_LDADD = libhyperdex-admin.la -lpopt
hyperdex_add_index_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-add-index.1: man/hyperdex-add-index.1.h2m tools/add-index.cc | hyperdex-add-index$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-add-index$(EXEEXT)

# hyperdex-rm-index
EXTRA_DIST += man/hyperdex-rm-index.1.md
EXTRA_DIST += man/hyperdex-rm-index.1.h2m
hyperdex_rm_index_SOURCES = tools/rm-index.cc
hyperdex_rm_index_LDADD = libhyperdex-admin.la -lpopt
hyperdex_rm_index_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-rm-index.1: man/hyperdex-rm-index.1.h2m tools/rm-index.cc | hyperdex-rm-index$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-rm-index$(EXEEXT)

# hyperdex-show-config
EXTRA_DIST += man/hyperdex-show-config.1.md
EXTRA_DIST += man/hyperdex-show-config.1.h2m
hyperdex_show_config_SOURCES = tools/show-config.cc
hyperdex_show_config_LDADD = libhyperdex-admin.la -lpopt
hyperdex_show_config_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-show-config.1: man/hyperdex-show-config.1.h2m tools/show-config.cc | hyperdex-show-config$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-show-config$(EXEEXT)

# hyperdex-server-register
EXTRA_DIST += man/hyperdex-server-register.1.md
EXTRA_DIST += man/hyperdex-server-register.1.h2m
hyperdex_server_register_SOURCES = tools/server-register.cc
hyperdex_server_register_LDADD = libhyperdex-admin.la -lpopt
hyperdex_server_register_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-server-register.1: man/hyperdex-server-register.1.h2m tools/server-register.cc | hyperdex-server-register$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-server-register$(EXEEXT)

# hyperdex-server-online
EXTRA_DIST += man/hyperdex-server-online.1.md
EXTRA_DIST += man/hyperdex-server-online.1.h2m
hyperdex_server_online_SOURCES = tools/server-online.cc
hyperdex_server_online_LDADD = libhyperdex-admin.la -lpopt
hyperdex_server_online_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-server-online.1: man/hyperdex-server-online.1.h2m tools/server-online.cc | hyperdex-server-online$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-server-online$(EXEEXT)

# hyperdex-server-offline
EXTRA_DIST += man/hyperdex-server-offline.1.md
EXTRA_DIST += man/hyperdex-server-offline.1.h2m
hyperdex_server_offline_SOURCES = tools/server-offline.cc
hyperdex_server_offline_LDADD = libhyperdex-admin.la -lpopt
hyperdex_server_offline_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-server-offline.1: man/hyperdex-server-offline.1.h2m tools/server-offline.cc | hyperdex-server-offline$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-server-offline$(EXEEXT)

# hyperdex-server-forget
EXTRA_DIST += man/hyperdex-server-forget.1.md
EXTRA_DIST += man/hyperdex-server-forget.1.h2m
hyperdex_server_forget_SOURCES = tools/server-forget.cc
hyperdex_server_forget_LDADD = libhyperdex-admin.la -lpopt
hyperdex_server_forget_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-server-forget.1: man/hyperdex-server-forget.1.h2m tools/server-forget.cc | hyperdex-server-forget$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-server-forget$(EXEEXT)

# hyperdex-server-kill
EXTRA_DIST += man/hyperdex-server-kill.1.md
EXTRA_DIST += man/hyperdex-server-kill.1.h2m
hyperdex_server_kill_SOURCES = tools/server-kill.cc
hyperdex_server_kill_LDADD = libhyperdex-admin.la -lpopt
hyperdex_server_kill_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-server-kill.1: man/hyperdex-server-kill.1.h2m tools/server-kill.cc | hyperdex-server-kill$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-server-kill$(EXEEXT)

# hyperdex-perf-counters
EXTRA_DIST += man/hyperdex-perf-counters.1.md
EXTRA_DIST += man/hyperdex-perf-counters.1.h2m
hyperdex_perf_counters_SOURCES = tools/perf-counters.cc
hyperdex_perf_counters_LDADD = libhyperdex-admin.la -lpopt
hyperdex_perf_counters_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-perf-counters.1: man/hyperdex-perf-counters.1.h2m tools/perf-counters.cc | hyperdex-perf-counters$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-perf-counters$(EXEEXT)

# hyperdex-set-read-only
EXTRA_DIST += man/hyperdex-set-read-only.1.md
EXTRA_DIST += man/hyperdex-set-read-only.1.h2m
hyperdex_set_read_only_SOURCES = tools/set-read-only.cc
hyperdex_set_read_only_LDADD = libhyperdex-admin.la -lpopt
hyperdex_set_read_only_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-set-read-only.1: man/hyperdex-set-read-only.1.h2m tools/set-read-only.cc | hyperdex-set-read-only$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-set-read-only$(EXEEXT)

# hyperdex-set-read-write
EXTRA_DIST += man/hyperdex-set-read-write.1.md
EXTRA_DIST += man/hyperdex-set-read-write.1.h2m
hyperdex_set_read_write_SOURCES = tools/set-read-write.cc
hyperdex_set_read_write_LDADD = libhyperdex-admin.la -lpopt
hyperdex_set_read_write_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-set-read-write.1: man/hyperdex-set-read-write.1.h2m tools/set-read-write.cc | hyperdex-set-read-write$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-set-read-write$(EXEEXT)

# hyperdex-set-fault-tolerance
EXTRA_DIST += man/hyperdex-set-fault-tolerance.1.md
EXTRA_DIST += man/hyperdex-set-fault-tolerance.1.h2m
hyperdex_set_fault_tolerance_SOURCES = tools/set-fault-tolerance.cc
hyperdex_set_fault_tolerance_LDADD = libhyperdex-admin.la -lpopt
hyperdex_set_fault_tolerance_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-set-fault-tolerance.1: man/hyperdex-set-fault-tolerance.1.h2m tools/set-fault-tolerance.cc | hyperdex-set-fault-tolerance$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-set-fault-tolerance$(EXEEXT)

# hyperdex-wait-until-stable
EXTRA_DIST += man/hyperdex-wait-until-stable.1.md
EXTRA_DIST += man/hyperdex-wait-until-stable.1.h2m
hyperdex_wait_until_stable_SOURCES = tools/wait-until-stable.cc
hyperdex_wait_until_stable_LDADD = libhyperdex-admin.la -lpopt
hyperdex_wait_until_stable_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-wait-until-stable.1: man/hyperdex-wait-until-stable.1.h2m tools/wait-until-stable.cc | hyperdex-wait-until-stable$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-wait-until-stable$(EXEEXT)

# hyperdex-backup
EXTRA_DIST += man/hyperdex-backup.1.md
EXTRA_DIST += man/hyperdex-backup.1.h2m
hyperdex_backup_SOURCES = tools/backup.cc
hyperdex_backup_LDADD = libhyperdex-admin.la -lpopt
hyperdex_backup_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-backup.1: man/hyperdex-backup.1.h2m tools/backup.cc | hyperdex-backup$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-backup$(EXEEXT)

# hyperdex-backup-manager
EXTRA_DIST += man/hyperdex-backup-manager.1.md
EXTRA_DIST += man/hyperdex-backup-manager.1.h2m
hyperdex_backup_manager_SOURCES = tools/backup-manager.cc
hyperdex_backup_manager_LDADD = libhyperdex-admin.la -lpopt
hyperdex_backup_manager_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-backup-manager.1: man/hyperdex-backup-manager.1.h2m tools/backup-manager.cc | hyperdex-backup-manager$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-backup-manager$(EXEEXT)

# hyperdex-raw-backup
EXTRA_DIST += man/hyperdex-raw-backup.1.md
EXTRA_DIST += man/hyperdex-raw-backup.1.h2m
hyperdex_raw_backup_SOURCES = tools/raw-backup.cc
hyperdex_raw_backup_LDADD = libhyperdex-admin.la -lpopt
hyperdex_raw_backup_LDADD = libhyperdex-admin.la $(POPT_LIBS)
man/hyperdex-raw-backup.1: man/hyperdex-raw-backup.1.h2m tools/raw-backup.cc | hyperdex-raw-backup$(EXEEXT)
$(help2man_verbose)help2man $(HELP2MAN_FLAGS) --section 1 --output $@ --include $< ${abs_top_builddir}/hyperdex-raw-backup$(EXEEXT)

Expand Down
5 changes: 5 additions & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ HyperDex relies upon the glog library.
Please install glog to continue.
-------------------------------------------------])])
fi
AC_ARG_VAR(POPT_LIBS, [linker flags for popt])
AS_IF([test "x$POPT_LIBS" = x], [POPT_LIBS="-lpopt"])

if test x"${enable_all_components}" = xyes -o \
x"${enable_tools}" = xyes -o \
x"${enable_coordinator}" = xyes -o \
Expand All @@ -148,6 +151,8 @@ HyperDex relies upon the popt library.
Please install popt to continue.
-------------------------------------------------])])
fi
AC_ARG_VAR(GLOG_LIBS, [linker flags for glog])
AS_IF([test "x$GLOG_LIBS" = x], [GLOG_LIBS="-lglog"])

# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
Expand Down

0 comments on commit e08dfc0

Please sign in to comment.