Commit d7b13fc9 authored by Nils Goroll's avatar Nils Goroll Committed by Tollef Fog Heen

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

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
parent b508fffe
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishadm
......
#
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libvgz \
-I$(top_builddir)/bin/varnishd \
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishhist
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishlog
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishncsa
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishreplay
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishstat
......
......@@ -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
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = varnishtop
......
......@@ -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"
......
INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @PCRE_CFLAGS@
AM_LDFLAGS = $(AM_LT_LDFLAGS)
......
......@@ -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
......
#
INCLUDES = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_LDFLAGS = $(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES = libvarnishcompat.la
......
......@@ -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
......
#
AM_LDFLAGS = $(AM_LT_LDFLAGS)
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
......
......@@ -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
......
# 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)
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment