reformat the test programs in configure.ac to be on multiple lines for

greater readability, and remove unnecessary inclusion of stdio.h in the
slang tests

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1732 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 51d2902111eb66fab7e8801c1a4b80bcfd870b4a..9d6692090d499f52dd4d94a0b2375b134bb95feb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -138,6 +138,10 @@ CVS code -
        - Add tests for isblank() and strcasestr(), and define
          _GNU_SOURCE so that the tests work properly.  Increase the
          minimum required autoconf version to 2.54. (DLR)
+       - Reformat the test programs so that they aren't packed into
+         fewer lines than usual, so as to make them easier to read, and
+         remove unnecessary inclusion of stdio.h in the slang test
+         programs. (DLR)
 - faq.html:
        - Removed question about the NumLock glitch, as it's no longer
          needed. (DLR)
@@ -343,9 +347,9 @@ GNU nano 1.3.2 - 2004.03.31
        - Fix segfault when doing a regex replace of a string that
          matches inside a line (e.g. replace the "b" in "abc" with
          anything). (David Benbennick)
-       - If the mark is on at the beginning of the functio, turn it off
-         and turn it back on just before returning.  Also overhaul to
-         rely on the return value of findnextstr() instead of a loop
+       - If the mark is on at the beginning of the function, turn it
+         off and turn it back on just before returning.  Also overhaul
+         to rely on the return value of findnextstr() instead of a loop
          invariant, to not need to take an int* parameter, and store
          the beginning x-coordinate in a size_t instead of an int.
          (David Benbennick)

diff --git a/configure.ac b/configure.ac
index ce5c2613d3213641406e269a38137ec823686f20..18e3fb626f5755b7854512b6b98edfd8dd878319 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,16 @@ AC_CHECK_HEADER(regex.h,
     AC_TRY_RUN([
 #include <sys/types.h>
 #include <regex.h>
-int main(void) { regex_t reg; size_t n = 1; regmatch_t r; regcomp(&reg, "\\<", 0); regexec(&reg, "", n, &r, 0); regfree(&reg); return 0; }],
+int main(void)
+{
+    regex_t reg;
+    size_t n = 1;
+    regmatch_t r;
+    regcomp(&reg, "\\<", 0);
+    regexec(&reg, "", n, &r, 0);
+    regfree(&reg);
+    return 0;
+}],
        AC_MSG_RESULT(no),
        AC_MSG_RESULT(yes); AC_DEFINE(BROKEN_REGEXEC, 1, [Define this if your regexec() function segfaults when passed an empty string under certain conditions.])
     )
@@ -200,9 +209,12 @@ AC_ARG_WITH(slang,
            _libs=$LIBS
            LIBS="$LIBS -lslang"
            AC_TRY_RUN([
-#include <stdio.h>
 #include <slcurses.h>
-int main(void) { SLtt_initialize(NULL); return 0; }],
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
                [AC_MSG_RESULT(yes)
                AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
                slang_support=yes
@@ -222,9 +234,12 @@ int main(void) { SLtt_initialize(NULL); return 0; }],
                AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
                LIBS="$LIBS $tcap"
                AC_TRY_RUN([
-#include <stdio.h>
 #include <slcurses.h>
-int main(void) { SLtt_initialize(NULL); return 0; }],
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
                    [AC_MSG_RESULT(yes)
                    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
                    slang_support=yes
@@ -239,9 +254,12 @@ int main(void) { SLtt_initialize(NULL); return 0; }],
                    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
                    LIBS="$LIBS -lm"
                    AC_TRY_RUN([
-#include <stdio.h>
 #include <slcurses.h>
-int main(void) { SLtt_initialize(NULL); return 0; }],
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
                        [AC_MSG_RESULT(yes)
                        AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
                        slang_support=yes
@@ -327,10 +345,6 @@ fi
 
 
 AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors command.]))
-if test x$slang_support != xyes; then
-    AC_CHECK_LIB([$CURSES_LIB_NAME], wresize, AC_DEFINE(HAVE_WRESIZE, 1, [Define this if you have the wresize function in your ncurses-type library.]))
-    AC_CHECK_LIB([$CURSES_LIB_NAME], resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define this if you have the resizeterm function in your ncurses-type library.]))
-fi
 
 dnl Parse any configure options