>From c24a91405479e7e5bd2633173cf5a24eabbd75fc Mon Sep 17 00:00:00 2001
From: Nils Goroll <nils.goroll@uplex.de>
Date: Wed, 9 Jan 2013 19:45:14 +0100
Subject: [PATCH] make autocrap(tm_phk) tools happy

Reduce warning noise from autoconf
Make automake happy
Pull in current ld-version-script.m4 which fixes the issue documented here:
https://lists.gnu.org/archive/html/bug-gnulib/2010-08/msg00198.html
---
 bin/varnishadm/Makefile.am       |    2 +-
 bin/varnishd/Makefile.am         |    2 +-
 bin/varnishhist/Makefile.am      |    2 +-
 bin/varnishlog/Makefile.am       |    2 +-
 bin/varnishncsa/Makefile.am      |    2 +-
 bin/varnishreplay/Makefile.am    |    2 +-
 bin/varnishstat/Makefile.am      |    2 +-
 bin/varnishtest/Makefile.am      |    2 +-
 bin/varnishtop/Makefile.am       |    2 +-
 configure.ac                     |    2 ++
 lib/libvarnish/Makefile.am       |    2 +-
 lib/libvarnishapi/Makefile.am    |    2 +-
 lib/libvarnishcompat/Makefile.am |    2 +-
 lib/libvcl/Makefile.am           |    2 +-
 lib/libvmod_debug/Makefile.am    |    2 +-
 lib/libvmod_std/Makefile.am      |    2 +-
 m4/ld-version-script.m4          |   19 ++++++++++++++-----
 man/Makefile.am                  |    2 +-
 18 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
index 201a361..7941eb2 100644
--- a/bin/varnishadm/Makefile.am
+++ b/bin/varnishadm/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishadm
 
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 7d2077b..37509b4 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/lib/libvgz \
 	-I$(top_builddir)/bin/varnishd \
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 8aafa2d..3d849f6 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishhist
 
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index e21ee35..23e1fe4 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishlog
 
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index 8b3f617..e9c30fa 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishncsa
 
diff --git a/bin/varnishreplay/Makefile.am b/bin/varnishreplay/Makefile.am
index 2be20f7..df7b2b8 100644
--- a/bin/varnishreplay/Makefile.am
+++ b/bin/varnishreplay/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishreplay
 
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index 83588c9..98ea717 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishstat
 
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 9287b3c..b26e3cb 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -15,7 +15,7 @@ check-local:
 
 DISTCLEANFILES = _.ok
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libvgz
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libvgz
 
 bin_PROGRAMS =	varnishtest
 
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index 88def2f..362acf5 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishtop
 
diff --git a/configure.ac b/configure.ac
index 003f682..a4cd8e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,8 @@ AC_REVISION([$Id$])
 AC_INIT([Varnish], [trunk], [varnish-dev@varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+AC_USE_SYSTEM_EXTENSIONS
 
 # save command line CFLAGS for use in VCC_CC (to pass through things like -m64)
 OCFLAGS="$CFLAGS"
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index 740ae16..60f6a25 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @PCRE_CFLAGS@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index ee86abc..181d1c1 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @PCRE_CFLAGS@
 
 lib_LTLIBRARIES = libvarnishapi.la
 
diff --git a/lib/libvarnishcompat/Makefile.am b/lib/libvarnishcompat/Makefile.am
index 33aac4a..698531f 100644
--- a/lib/libvarnishcompat/Makefile.am
+++ b/lib/libvarnishcompat/Makefile.am
@@ -1,6 +1,6 @@
 #
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
 pkglib_LTLIBRARIES = libvarnishcompat.la
diff --git a/lib/libvcl/Makefile.am b/lib/libvcl/Makefile.am
index f07facd..be3efe0 100644
--- a/lib/libvcl/Makefile.am
+++ b/lib/libvcl/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 
 pkglib_LTLIBRARIES = libvcl.la
 
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 1705cf9..f199ecf 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -1,7 +1,7 @@
 #
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index 0a4736a..b8fa7bb 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4
index a97888f..63386f1 100644
--- a/m4/ld-version-script.m4
+++ b/m4/ld-version-script.m4
@@ -1,5 +1,5 @@
-# ld-version-script.m4 serial 1
-dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# ld-version-script.m4 serial 3
+dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -26,16 +26,25 @@ AC_DEFUN([gl_LD_VERSION_SCRIPT],
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
     cat > conftest.map <<EOF
+foo
+EOF
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+                   [accepts_syntax_errors=yes], [accepts_syntax_errors=no])
+    if test "$accepts_syntax_errors" = no; then
+      cat > conftest.map <<EOF
 VERS_1 {
-	global: sym;
+        global: sym;
 };
 
 VERS_2 {
         global: sym;
 } VERS_1;
 EOF
-    AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
-                   [have_ld_version_script=yes], [have_ld_version_script=no])
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+                     [have_ld_version_script=yes], [have_ld_version_script=no])
+    else
+      have_ld_version_script=no
+    fi
     rm -f conftest.map
     LDFLAGS="$save_LDFLAGS"
     AC_MSG_RESULT($have_ld_version_script)
diff --git a/man/Makefile.am b/man/Makefile.am
index 9118c34..cc32a4b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -6,7 +6,7 @@ endif
 vsc2rst_SOURCES = vsc2rst.c \
 	$(top_srcdir)/include/tbl/vsc_fields.h
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 dist_man_MANS = vcl.7 varnish-cli.7 varnish-counters.7
 MAINTAINERCLEANFILES = $(dist_man_MANS)
-- 
1.5.6.5

