Fixup botched merge

1 files changed, 0 insertions, 20 deletions

diff --git a/infrastructure/m4/vl_lib_readline.m4 b/infrastructure/m4/vl_lib_readline.m4
index e04a5f5f..e9cb72b8 100644
--- a/infrastructure/m4/vl_lib_readline.m4
+++ b/infrastructure/m4/vl_lib_readline.m4
@@ -79,16 +79,6 @@ AC_DEFUN([VL_LIB_READLINE], [
   fi
 ])
 
-<<<<<<< HEAD
-dnl VL_LIB_READLINE_CHECK(name, libraries, headers, history headers)
-AC_DEFUN([VL_LIB_READLINE_CHECK], [
-  AC_CACHE_CHECK([for $1 library],
-                 [vl_cv_lib_$1], [
-    ORIG_LIBS="$LIBS"
-    vl_cv_lib_$1=""
-    for readline_lib in $2; do
-      for termcap_lib in "" termcap curses ncurses; do
-=======
 dnl BOX_CHECK_VAR(name, where, headers)
 AC_DEFUN([BOX_CHECK_VAR], [
   AC_CACHE_CHECK([for $1 $2], [vl_cv_var_$1], 
@@ -107,7 +97,6 @@ AC_DEFUN([VL_LIB_READLINE_CHECK], [
     vl_cv_lib_$1=""
     for readline_lib in $2; do
       for termcap_lib in "" termcap curses ncurses pdcurses; do
->>>>>>> 0.12
         if test -z "$termcap_lib"; then
           TRY_LIB="-l$readline_lib"
         else
@@ -129,14 +118,6 @@ AC_DEFUN([VL_LIB_READLINE_CHECK], [
     fi
   ])
 
-<<<<<<< HEAD
-  vl_cv_lib_readline_compat_found=no
-  if test "x$vl_cv_lib_$1" != "xno"; then
-    AC_CHECK_HEADERS([$3], [vl_cv_lib_readline_compat_found=yes])
-  fi
-
-  if test "x$vl_cv_lib_readline_compat_found" = "xyes"; then
-=======
   vl_cv_lib_includes=""
 
   vl_cv_lib_readline_compat_found=no
@@ -166,7 +147,6 @@ $vl_cv_lib_includes"
     BOX_CHECK_VAR([completion_matches], [in readline headers],
       [$vl_cv_lib_includes])
 
->>>>>>> 0.12
     AC_DEFINE([HAVE_LIBREADLINE], 1,
               [Define if you have a readline compatible library])