- acx_nlnetlabs.m4 to 26; improve FLTO help text.

git-svn-id: file:///svn/unbound/trunk@2964 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 90f1315bb6a88e75a6f536b825dd8a93b32cd789..e1cf83a70bd6d7bb3fac729bfdf69f80fe985cf8 100644 (file)
--- 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 403489ab7d543639a1e48527bb6133780df5141c..8a18c3c428f8dacdacc3bc2ad6522647596223c4 100755 (executable)
--- 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 9b3e2c6c953c1a63a2ef5d8fe4f68d4c47f6877a..e9c39a69ec1acd920789ef374b6e940b7b72565a 100644 (file)
--- 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