acx_nlnetlabs.m4 to 26; improve FLTO help text. and ldns/config.h.in~ to .gitignore.

diff --git a/.gitignore b/.gitignore
index 2ae7f70f33f6bdc1d8f885ec1711aa1e3e23df3e..b2d6c5f13a756b49a783f3898c8d9bc663ba60d4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -147,6 +147,7 @@
 /ldns/common.h
 /ldns/config.h
 /ldns/config.h.in
+/ldns/config.h.in~
 /ldns/net.h
 /ldns/util.h
 /ldns_wrapper.lo

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"