From 78e5c6fc5fd814361ae1b9115d9e4dc92c384259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 6 Nov 2015 13:07:46 -0500 Subject: [PATCH] autoconf: readline dependency is mendatory --- configure.ac | 4 +++- tools/Makefile.am | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 902970ec..af8d2e4d 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,9 @@ PKG_CHECK_MODULES([msgpack], [msgpack >= 1.1]) AC_ARG_ENABLE([tools], AS_HELP_STRING([--disable-tools],[Disable tools (CLI DHT node)]),,build_tools=yes) AM_CONDITIONAL(ENABLE_TOOLS, test x$build_tools == xyes) AM_COND_IF([ENABLE_TOOLS], [ - AC_CHECK_HEADERS([readline/readline.h readline/history.h]) + AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [ + AC_MSG_ERROR([unable to find readline.h]) + ]) ]) AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])]) diff --git a/tools/Makefile.am b/tools/Makefile.am index 00e762f4..8067a058 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -3,10 +3,10 @@ bin_PROGRAMS = dhtnode dhtchat dhtscanner AM_CPPFLAGS = -I../include dhtnode_SOURCES = dhtnode.cpp -dhtnode_LDFLAGS = -lopendht -L../src/.libs @GNUTLS_LIBS@ +dhtnode_LDFLAGS = -lopendht -lreadline -L../src/.libs @GNUTLS_LIBS@ dhtchat_SOURCES = dhtchat.cpp -dhtchat_LDFLAGS = -lopendht -L../src/.libs @GNUTLS_LIBS@ +dhtchat_LDFLAGS = -lopendht -lreadline -L../src/.libs @GNUTLS_LIBS@ dhtscanner_SOURCES = dhtscanner.cpp -dhtscanner_LDFLAGS = -lopendht -L../src/.libs @GNUTLS_LIBS@ +dhtscanner_LDFLAGS = -lopendht -lreadline -L../src/.libs @GNUTLS_LIBS@ -- GitLab