Just to be safe.

diff --git a/Console.cpp b/Console.cpp
index b6bcedf6616f8cf89d82aab56683e5de66026ba6..8e1c0dae2ce32515504c747453fc9eabbf583809 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -48,8 +48,17 @@
 
 #include <setjmp.h>
 
+#ifdef HAVE_READLINE_H
+#include <readline.h>
+#else
 #include <readline/readline.h>
+#endif
+
+#ifdef HAVE_HISTORY_H
+#include <history.h>
+#else
 #include <readline/history.h>
+#endif
 
 #include <sys/mman.h>
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a2d4cf7d80ddc5c89fc1655f90a20b7fa8c8816f..7c114f6da15859a41fd044d4b649a6046b4675d2 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -15,7 +15,7 @@ flex := @FLEX@
 libtool := @LIBTOOL@
 cxx := @CXX@
 objcxx := @OBJCXX@
-cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI%,@DEFS@)
+cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI% -DHAVE_READLINE% -DHAVE_HISTORY_H,@DEFS@)
 objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@
 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@