[build] macro refactor

configure

@@ -7747,8 +7747,7 @@ for ac_lib in '' readline; do
     ac_res="none required"
   else
     ac_res=-l$ac_lib
-    LIBS="-l$ac_lib $CURSES_LIB
-     $ac_func_search_save_LIBS"
+    LIBS="-l$ac_lib $CURSES_LIB     $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_readline=$ac_res
@@ -7830,8 +7829,7 @@ for ac_lib in '' readline; do
     ac_res="none required"
   else
     ac_res=-l$ac_lib
-    LIBS="-l$ac_lib $CURSES_LIB
-     $ac_func_search_save_LIBS"
+    LIBS="-l$ac_lib $CURSES_LIB     $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_history_set_history_state=$ac_res
@@ -7939,8 +7937,7 @@ for ac_lib in '' sqlite3; do
     ac_res="none required"
   else
     ac_res=-l$ac_lib
-    LIBS="-l$ac_lib -pthread
-     $ac_func_search_save_LIBS"
+    LIBS="-l$ac_lib -pthread     $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_sqlite3_open=$ac_res

m4/lnav_with_readline.m4

@@ -58,7 +58,7 @@ AC_DEFUN([AX_PATH_LIB_READLINE],
     AC_SEARCH_LIBS([readline], [readline],
         [AS_VAR_SET([READLINE_LIBS], ["-lreadline"])],
         [AC_MSG_ERROR([libreadline library not found])],
-        [$CURSES_LIB]
+        [$CURSES_LIB]dnl
     )dnl
 
     AC_CHECK_HEADERS([readline.h readline/readline.h],
@@ -78,7 +78,7 @@ AC_DEFUN([AX_PATH_LIB_READLINE],
     AC_SEARCH_LIBS([history_set_history_state], [readline],
         [],
         AC_MSG_ERROR([libreadline does not have the required symbols. editline possibly masquerading as readline.]),
-        [$CURSES_LIB]
+        [$CURSES_LIB]dnl
     )
 
     AC_SUBST([READLINE_LIBS])

m4/lnav_with_sqlite3.m4

@@ -35,7 +35,7 @@ AC_DEFUN([LNAV_WITH_SQLITE3],
     AC_SEARCH_LIBS([sqlite3_open], [sqlite3],
         AS_VAR_SET([SQLITE3_LIBS], ["-lsqlite3"]),
         AC_MSG_ERROR([sqlite3 library not found]),
-        [-pthread]
+        [-pthread]dnl
     )
 
     AC_CHECK_HEADERS([sqlite3.h], [],