diff --git a/configure.in b/configure.in
index 9d14d3b2d05..721105d68bb 100644
--- a/configure.in
+++ b/configure.in
@@ -2336,7 +2336,8 @@ AC_ARG_WITH(libedit,
     [ with_libedit=$withval ],
     [ with_libedit=undefined ]
     )
-if test -z "$with_readline$with_libedit" -a ! -e cmd-line-utils
+
+if test "$with_readline/$with_libedit" = "undefined/undefined" -a ! -e "$srcdir/cmd-line-utils"
 then
   with_readline=no
   with_libedit=no
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index e1a519060aa..5a76066af8c 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -80,7 +80,7 @@ inline int lex_casecmp(const char *s, const char *t, uint len)
   return (int) len+1;
 }
 
-#include "lex_hash.h"
+#include <lex_hash.h>
 
 
 void lex_init(void)