Moved readline check to after termcap/curses check in configure.ac.

This way, $TERMLIB can be included in the readline check.  That's
neeed on CentOS 5.9.

diff --git a/Makefile.am b/Makefile.am
index 6dc801794f8b144becb6cd76e46b36e37b5ab6e8..903a45e2b3c05e8ecb404e6f8aa1b5cf1c120cd3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -289,11 +289,11 @@ uip_burst_LDADD = $(LDADD) $(POSTLINK)
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/attach.c uip/annosbr.c uip/distsbr.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/attach.c uip/annosbr.c uip/distsbr.c

-uip_comp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
+uip_comp_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c

-uip_dist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
+uip_dist_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_flist_SOURCES = uip/flist.c
 uip_flist_LDADD = $(LDADD) $(POSTLINK)
 
 uip_flist_SOURCES = uip/flist.c
 uip_flist_LDADD = $(LDADD) $(POSTLINK)


@@ -303,7 +303,7 @@ uip_folder_LDADD = $(LDADD) $(POSTLINK)
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c

-uip_forw_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
+uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(POSTLINK)
 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(POSTLINK)


@@ -322,7 +322,7 @@ uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
                       uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
                       uip/mhshowsbr.c uip/mhlistsbr.c uip/md5.c
 uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
                       uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
                       uip/mhshowsbr.c uip/mhlistsbr.c uip/md5.c

-uip_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB) $(POSTLINK)
+uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
                     uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/md5.c
 
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
                     uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/md5.c


@@ -373,7 +373,7 @@ uip_refile_LDADD = $(LDADD) $(POSTLINK)
 
 uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c uip/whatnowsbr.c \
                   uip/sendsbr.c uip/attach.c uip/annosbr.c uip/distsbr.c
 
 uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c uip/whatnowsbr.c \
                   uip/sendsbr.c uip/attach.c uip/annosbr.c uip/distsbr.c

-uip_repl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
+uip_repl_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_rmf_SOURCES = uip/rmf.c
 uip_rmf_LDADD = $(LDADD) $(POSTLINK)
 
 uip_rmf_SOURCES = uip/rmf.c
 uip_rmf_LDADD = $(LDADD) $(POSTLINK)


@@ -396,7 +396,7 @@ uip_sortm_LDADD = $(LDADD) $(POSTLINK)
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
                      uip/attach.c uip/annosbr.c uip/distsbr.c
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
                      uip/attach.c uip/annosbr.c uip/distsbr.c

-uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(POSTLINK)
+uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(POSTLINK)

 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
 uip_whom_LDADD = $(LDADD) $(POSTLINK)
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
 uip_whom_LDADD = $(LDADD) $(POSTLINK)

diff --git a/configure.ac b/configure.ac
index 11096083d5c0e69487b516d03c78965c5ea8cac9..61a8beb27d3c02dec56e05215f9cac97f38ddcd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -369,9 +369,6 @@ dnl -------------------
 dnl Checks for network libraries (nsl, socket)
 NMH_CHECK_NETLIBS
 
 dnl Checks for network libraries (nsl, socket)
 NMH_CHECK_NETLIBS
 

-dnl Check for readline support
-NMH_READLINE
-

 dnl Check the locking functions supported and what we should use by default
 NMH_LOCKING
 
 dnl Check the locking functions supported and what we should use by default
 NMH_LOCKING
 


@@ -387,8 +384,11 @@ for lib in $termcap_curses_order; do
 done
 AC_SUBST([TERMLIB])dnl
 AS_IF([test "x$TERMLIB" = "x"],
 done
 AC_SUBST([TERMLIB])dnl
 AS_IF([test "x$TERMLIB" = "x"],

-      [AC_MSG_FAILURE([Could not find setupterm in any library.  Is there a curses
-or ncurses library or package that you can install?])])
+      [AC_MSG_FAILURE([Could not find setupterm in any library.  Is there a
+curses or ncurses library or package that you can install?])])
+
+dnl Check for readline support
+NMH_READLINE

 
 dnl --------------
 dnl CHECK FOR NDBM
 
 dnl --------------
 dnl CHECK FOR NDBM

diff --git a/m4/readline.m4 b/m4/readline.m4
index 7a2710dca9b93fccf2325ed48e7b649bc168ab13..c68086e94516d23581c1b64c996c2f697e0872b9 100644 (file)
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -14,11 +14,12 @@ AS_IF([test x"$with_readline" = xyes -o x"$with_readline" = xmaybe],
     [save_LIBS="$LIBS"
     LIBS=
     AC_SEARCH_LIBS([readline], [readline editline],
     [save_LIBS="$LIBS"
     LIBS=
     AC_SEARCH_LIBS([readline], [readline editline],

-                  [READLINELIB="$LIBS"
+                  [READLINELIB="$LIBS"

                   AC_DEFINE([READLINE_SUPPORT], [1],
                             [Support for using readline() in whatnow])],
                   AC_DEFINE([READLINE_SUPPORT], [1],
                             [Support for using readline() in whatnow])],

-                  [AS_IF([test x"$with_readline" = xyes],
-                         [AC_MSG_ERROR([Unable to find a readline library])])])
+                  [AS_IF([test x"$with_readline" = xyes],
+                         [AC_MSG_ERROR([Unable to find a readline library])])],
+                  [$TERMLIB])

     LIBS="$save_LIBS"])
 ])
 
     LIBS="$save_LIBS"])
 ])