diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4 index 90f1315bb..e1cf83a70 100644 --- a/acx_nlnetlabs.m4 +++ b/acx_nlnetlabs.m4 @@ -2,7 +2,8 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 25 +# Version 26 +# 2013-09-19 FLTO help text improved. # 2013-07-18 Enable ACX_CHECK_COMPILER_FLAG to test for -Wstrict-prototypes # 2013-06-25 FLTO has --disable-flto option. # 2013-05-03 Update W32_SLEEP for newer mingw that links but not defines it. @@ -410,7 +411,7 @@ dnl Check if CC supports -flto. dnl in a way that supports clang and suncc (that flag does something else, dnl but fails to link). It sets it in CFLAGS if it works. AC_DEFUN([ACX_CHECK_FLTO], [ - AC_ARG_ENABLE([flto], AS_HELP_STRING([--disable-flto], [Disable link-time optimization])) + AC_ARG_ENABLE([flto], AS_HELP_STRING([--disable-flto], [Disable link-time optimization (gcc specific option)])) AS_IF([test "x$enable_flto" != "xno"], [ AC_MSG_CHECKING([if $CC supports -flto]) BAKCFLAGS="$CFLAGS" diff --git a/configure b/configure index 403489ab7..8a18c3c42 100755 --- a/configure +++ b/configure @@ -1455,7 +1455,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-checking Enable warnings, asserts, makefile-dependencies --enable-debug same as enable-checking - --disable-flto Disable link-time optimization + --disable-flto Disable link-time optimization (gcc specific option) --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] diff --git a/doc/Changelog b/doc/Changelog index 9b3e2c6c9..e9c39a69e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ - 1.4.21 tag created. - trunk has 1.4.22 number inside it. - iana portlist updated. + - acx_nlnetlabs.m4 to 26; improve FLTO help text. 16 Sep 2013: Wouter - Fix#524: max-udp-size not effective to non-EDNS0 queries, from