Rename m4/my_termlib.m4 to m4/my_terminfo.m4

diff --git a/Make.mk b/Make.mk
index 69e096855b518606fcac9197d99631d1b91d2507..8f2eff703315267c1db4660d35642f01ea7b90d9 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -394,5 +394,5 @@ $(srcdir)/src/client/config.h.in: src/client/configure.ac src/client/aclocal.m4
        cd $(dir $@) && autoheader
        touch $@
 
-$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 m4/my_termlib.m4 m4/my_windows_api.m4
+$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
        cat $^ >$@

diff --git a/m4/my_terminfo.m4 b/m4/my_terminfo.m4
new file mode 100644 (file)
index 0000000..7fb6513
--- /dev/null
+++ b/m4/my_terminfo.m4
@@ -0,0 +1,25 @@
+AC_DEFUN([MY_CURSES_TERMINFO],
+[
+       AC_SEARCH_LIBS([setupterm], [termlib termcap curses ncurses],
+               [have_terminfo=yes], [have_terminfo=no])
+       AC_CHECK_HEADER([curses.h], , [have_terminfo=no])
+       AC_CHECK_HEADER([term.h], , [have_terminfo=no])
+       if test "$have_terminfo" = yes
+       then AC_DEFINE([HAVE_CURSES_TERMINFO], 1,
+               [Define if you have the curses interface to terminfo])
+       fi
+])
+
+AC_DEFUN([MY_WITH_TERMINFO],
+[
+       AC_ARG_WITH([terminfo],
+               AS_HELP_STRING([--with-terminfo],
+                       [use terminfo for highlighting (default check)]))
+       if test "x$with_terminfo" != xno; then
+               MY_CURSES_TERMINFO
+               if test "$have_terminfo$with_terminfo" = noyes
+               then AC_MSG_FAILURE([Can't satisfy --with-terminfo])
+               fi
+               with_terminfo="$have_terminfo"
+       fi
+])

diff --git a/m4/my_termlib.m4 b/m4/my_termlib.m4
deleted file mode 100644 (file)
index 7fb6513..0000000
--- a/m4/my_termlib.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_DEFUN([MY_CURSES_TERMINFO],
-[
-       AC_SEARCH_LIBS([setupterm], [termlib termcap curses ncurses],
-               [have_terminfo=yes], [have_terminfo=no])
-       AC_CHECK_HEADER([curses.h], , [have_terminfo=no])
-       AC_CHECK_HEADER([term.h], , [have_terminfo=no])
-       if test "$have_terminfo" = yes
-       then AC_DEFINE([HAVE_CURSES_TERMINFO], 1,
-               [Define if you have the curses interface to terminfo])
-       fi
-])
-
-AC_DEFUN([MY_WITH_TERMINFO],
-[
-       AC_ARG_WITH([terminfo],
-               AS_HELP_STRING([--with-terminfo],
-                       [use terminfo for highlighting (default check)]))
-       if test "x$with_terminfo" != xno; then
-               MY_CURSES_TERMINFO
-               if test "$have_terminfo$with_terminfo" = noyes
-               then AC_MSG_FAILURE([Can't satisfy --with-terminfo])
-               fi
-               with_terminfo="$have_terminfo"
-       fi
-])