Fix conditional compile for libreadline

3 files changed, 13 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 4507e85..9b004dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,11 +101,14 @@ AC_ARG_WITH([tools],
         [with_tools=yes])
 
 AS_IF([test "x$with_tools" = "xyes"], [
+        have_readline=no
         AC_DEFINE(BUILD_TOOLS, 1, [Define if we are building irecovery tools])
         AC_CHECK_HEADERS([readline/readline.h],
-                [AC_DEFINE(HAVE_READLINE, 1, [Define if readline is available])],
+                [AC_DEFINE(HAVE_READLINE, 1, [Define if readline is available])
+                have_readline=yes],
                 [AC_MSG_NOTICE([NOTE: Building without readline support. If you want readline support, install its development package.])]
         )
+        AM_CONDITIONAL(HAVE_READLINE, test "x$have_readline" = "xyes")
 ])
 AM_CONDITIONAL(BUILD_TOOLS, test "x$with_tools" = "xyes")
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ebb085c..15e2eb9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,12 +2,15 @@ if BUILD_TOOLS
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS)
-AM_LDFLAGS = $(libusb_LIBS) -lreadline
+AM_LDFLAGS = $(libusb_LIBS)
 
 bin_PROGRAMS = irecovery
 
 irecovery_SOURCES = irecovery.c
 irecovery_CFLAGS = $(AM_CFLAGS)
 irecovery_LDFLAGS = $(AM_LDFLAGS)
+if HAVE_READLINE
+irecovery_LDFLAGS += -lreadline
+endif
 irecovery_LDADD = $(top_builddir)/src/libirecovery-1.0.la
 endif
diff --git a/tools/irecovery.c b/tools/irecovery.c
index f527c44..b41573c 100644
--- a/tools/irecovery.c
+++ b/tools/irecovery.c
@@ -595,7 +595,11 @@ int main(int argc, char* argv[])
                                 return 0;
 
                         case 'V':
-                                printf("%s %s\n", TOOL_NAME, PACKAGE_VERSION);
+                                printf("%s %s", TOOL_NAME, PACKAGE_VERSION);
+#ifdef HAVE_READLINE
+                                printf(" (readline)");
+#endif
+                                printf("\n");
                                 return 0;
 
                         default: