X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9cdb320102bf8f24a4b564c5ed2b35879e5ccf62..5b969d483185fb44407a99fbfbb1da2f5b3456ed:/configure.ac

diff --git a/configure.ac b/configure.ac
index 8b3066c2..61a8beb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,22 @@ if test -n "$auto_cflags"; then
        CFLAGS="$nmh_saved_cflags"])
     test "$nmh_cv_has_dash_ansi" = "yes"  &&  \
       CFLAGS="${CFLAGS:+$CFLAGS }-ansi -pedantic"
+
+    dnl For Ubuntu gcc 4.8.1, with -O2.  It would be better to fix all these,
+    dnl but until then, suppress the warning.
+    AC_CACHE_CHECK([whether compiler needs -Wno-unused-result],
+                   [nmh_cv_needs_wnur],
+                   [nmh_saved_cflags="$CFLAGS"
+                    CFLAGS="$CFLAGS -Werror -O2"
+                    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>],
+                                        [extern const char *path;
+                                         chdir (path);
+                                         return 0;])],
+                                       [nmh_cv_needs_wnur=no],
+                                       [nmh_cv_needs_wnur=yes])
+                    CFLAGS="$nmh_saved_cflags"])
+    AS_IF([test "$nmh_cv_needs_wnur" = yes],
+          [CFLAGS="${CFLAGS:+$CFLAGS }-Wno-unused-result"])
   else
     dnl Use -v and some other options with SunStudio cc.  lex produces
     dnl code that causes unreachable-statement warnings.  It might be
@@ -143,22 +159,6 @@ if test -n "$auto_cflags"; then
                                 nmh_cv_has_wextra=no)
                  CFLAGS="$nmh_saved_cflags"])
   test "$nmh_cv_has_wextra" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wextra"
-
-  dnl For Ubuntu gcc 4.8.1, with -O2.  It would be better to fix all these,
-  dnl but until then, suppress the warning.
-  AC_CACHE_CHECK([whether compiler needs -Wno-unused-result],
-                 [nmh_cv_needs_wnur],
-                 [nmh_saved_cflags="$CFLAGS"
-                  CFLAGS="$CFLAGS -Werror -O2"
-                  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>],
-                                                     [extern const char *path;
-                                                      chdir (path);
-                                                      return 0;])],
-                                                     [nmh_cv_needs_wnur=no],
-                                                     [nmh_cv_needs_wnur=yes])
-                  CFLAGS="$nmh_saved_cflags"])
-  AS_IF([test "$nmh_cv_needs_wnur" = yes],
-        [CFLAGS="${CFLAGS:+$CFLAGS }-Wno-unused-result"])
 fi
 
 dnl --------------
@@ -369,9 +369,6 @@ dnl -------------------
 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
 
@@ -387,8 +384,11 @@ for lib in $termcap_curses_order; do
 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