ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: remove two stray comments and two lines that were commented out 

And adjust the indentation after the latter change.
master
Benno Schulenberg 2020-09-16 10:44:48 +02:00
parent 11ae201d71
commit 22fc10911a
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -528,7 +528,6 @@ dnl Checks for functions.
if test "x$enable_utf8" != xno; then if test "x$enable_utf8" != xno; then
AC_CHECK_FUNCS(iswalnum iswpunct mblen mbstowcs mbtowc wctomb) AC_CHECK_FUNCS(iswalnum iswpunct mblen mbstowcs mbtowc wctomb)
fi fi
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for available flags. dnl Checks for available flags.
@ -610,8 +609,6 @@ AC_CHECK_LIB([$CURSES_LIB_NAME], [key_defined],
[AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() function.])], [AC_DEFINE(HAVE_KEY_DEFINED, 1, [Define this if your curses library has the key_defined() function.])],
[], [$CURSES_LIB]) [], [$CURSES_LIB])
dnl Parse any configure options.
LIBS="$LIBS $CURSES_LIB" LIBS="$LIBS $CURSES_LIB"
AC_SUBST(CURSES_LIB) AC_SUBST(CURSES_LIB)
@ -664,16 +661,15 @@ AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_reg_extended,
[Flag(s) to use to get the full range of extended regular expressions]) [Flag(s) to use to get the full range of extended regular expressions])
if test x$color_support = xyes; then if test x$color_support = xyes; then
# if test x$CURSES_LIB_NAME = xcurses; then AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed]) AC_TRY_RUN([
AC_TRY_RUN([
#include <curses.h> #include <curses.h>
int main(void) int main(void)
{ {
int testcolor = COLOR_WHITE; int testcolor = COLOR_WHITE;
return 0; return 0;
}], AC_MSG_RESULT(no), }], AC_MSG_RESULT(no),
AC_TRY_RUN([ AC_TRY_RUN([
#ifndef _XOPEN_SOURCE_EXTENDED #ifndef _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE_EXTENDED 1 #define _XOPEN_SOURCE_EXTENDED 1
#endif #endif
@ -683,13 +679,12 @@ int main(void)
int testcolor = COLOR_WHITE; int testcolor = COLOR_WHITE;
return 0; return 0;
}], }],
AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support.]) AC_DEFINE(NEED_XOPEN_SOURCE_EXTENDED, 1, [Define this if you need the _XOPEN_SOURCE_EXTENDED macro for color support.])
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
AC_MSG_RESULT(not sure) AC_MSG_RESULT(not sure)
AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED]) AC_MSG_WARN([*** Couldn't successfully compile basic color test with or without _XOPEN_SOURCE_EXTENDED])
AC_MSG_WARN([*** This build may not compile. Consider configuring with --disable-color or installing ncurses])), AC_MSG_WARN([*** This build may not compile. Consider configuring with --disable-color or installing ncurses])),
AC_MSG_WARN([*** Can't check need for _XOPEN_SOURCE_EXTENDED when cross-compiling])) AC_MSG_WARN([*** Can't check need for _XOPEN_SOURCE_EXTENDED when cross-compiling]))
# fi
fi fi
AC_MSG_CHECKING([whether LINES and COLS can be redefined]) AC_MSG_CHECKING([whether LINES and COLS can be redefined])