X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b7a676587f92187d2270be73a1ede5be0af9f104..d79618303ff42aa5e0bc2dba51fdd7b385bc97d4:/configure.ac diff --git a/configure.ac b/configure.ac index f41c7140..eb94a5ff 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ -dnl dnl configure.ac -- autoconf template for nmh dnl @@ -154,20 +153,6 @@ dnl Check for any platform-specific additional AM_CPPFLAGS. This depends on dnl MULTIBYTE_ENABLED having already been set. NMH_ADDL_CPPFLAGS -if test "$GCC" = yes; then - dnl Do this regardless of auto_cflags value. - dnl Enable _FORTIFY_SOURCE checking, which is supported by - dnl gcc 4.1 and later, but only when optimization is enabled. - dnl It shouldn't hurt with earlier versions because it's a cpp macro. - dnl If the user configures with a CFLAGS that contains a -O flag - dnl but then removes it a make time, they'll also have to remove - dnl -D_FORTIFY_SOURCE from AM_CPPFLAGS because it requires optimization. - dnl Use "\ " instead of ' ' or " " for compatiblity with posh. - AS_CASE([$CFLAGS], - [-O|*\ -O|-O[[!0]]*|*\ -O[[!0]]*], - [AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_FORTIFY_SOURCE=2"]) -fi - dnl FreeBSD needs a bit of magic to bring getline() into scope. dnl We do this here rather than in (say) h/mh.h because this macro must dnl be defined before is pulled in. @@ -355,7 +340,7 @@ NMH_CHECK_ICONV dnl Check for tputs() callback argument NMH_TPUTS_PUTC_ARG -termcap_curses_order="termcap curses ncurses" +termcap_curses_order="termcap tinfo curses ncurses" for lib in $termcap_curses_order; do AC_CHECK_LIB([${lib}], [setupterm], [TERMLIB="-l$lib"; break]) done @@ -604,7 +589,7 @@ dnl exist. dnl AC_CONFIG_COMMANDS([build-directories], -[test -d man || AS_MKDIR_P([man])]) +[AS_MKDIR_P([etc]); AS_MKDIR_P([man])]) AC_CONFIG_COMMANDS_POST([