This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] Add --with-gcc-major-version-only support to libhsail-rt
- From: Richard Biener <richard dot guenther at gmail dot com>
- To: Jakub Jelinek <jakub at redhat dot com>
- Cc: Pekka Jääskeläinen <pekka at parmance dot com>, Martin Jambor <mjambor at suse dot cz>, GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 25 Jan 2017 12:48:54 +0100
- Subject: Re: [PATCH] Add --with-gcc-major-version-only support to libhsail-rt
- Authentication-results: sourceware.org; auth=none
- References: <20170124225936.GK1867@tucnak>
On Tue, Jan 24, 2017 at 11:59 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> Hi!
>
> Apparently the configury of this library has been copied over before the
> PR79046 changes were done, the following patch updates it. Ok for trunk?
Ok.
Richard.
> Though, I wonder why configure.ac/Makefile.am have been based on one of the
> only 2 that aren't GPL licensed, there are over dozen other libraries that
> have very simple GPL configure.ac and Makefile.am, can't we just rewrite
> those based on those other files?
>
> 2017-01-24 Jakub Jelinek <jakub@redhat.com>
>
> PR other/79046
> * configure.ac: Add GCC_BASE_VER.
> * Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to
> get version from BASE-VER file.
> (ACLOCAL_AMFLAGS): Set to -I .. -I ../config .
> * aclocal.m4: Regenerated.
> * configure: Regenerated.
> * Makefile.in: Regenerated.
>
> --- libhsail-rt/configure.ac.jj 2017-01-24 23:29:11.000000000 +0100
> +++ libhsail-rt/configure.ac 2017-01-24 23:48:13.743605310 +0100
> @@ -147,5 +147,8 @@ AC_CONFIG_HEADER(target-config.h)
> AC_CHECK_SIZEOF([int])
> AC_CHECK_SIZEOF([void*])
>
> +# Determine what GCC version number to use in filesystem paths.
> +GCC_BASE_VER
> +
> # Must be last
> AC_OUTPUT
> --- libhsail-rt/Makefile.am.jj 2017-01-24 23:29:12.000000000 +0100
> +++ libhsail-rt/Makefile.am 2017-01-24 23:49:42.944443518 +0100
> @@ -44,13 +44,13 @@
>
> AUTOMAKE_OPTIONS = foreign subdir-objects
>
> -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
>
> MAINT_CHARSET = latin1
>
> mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
>
> -ACLOCAL_AMFLAGS = -I m4
> +ACLOCAL_AMFLAGS = -I .. -I ../config
>
> WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
>
> @@ -120,5 +120,3 @@ AM_MAKEFLAGS = \
> "DESTDIR=$(DESTDIR)"
>
> MAKEOVERRIDES=
> -
> -
> --- libhsail-rt/aclocal.m4.jj 2017-01-24 23:29:12.000000000 +0100
> +++ libhsail-rt/aclocal.m4 2017-01-24 23:49:56.352268889 +0100
> @@ -1,7 +1,8 @@
> -# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
> +# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
>
> # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
> -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
> +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
> +# Inc.
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
> @@ -19,12 +20,15 @@ You have another version of autoconf. I
> If you have problems, you may need to regenerate the build system entirely.
> To do so, use the procedure documented by the package, typically `autoreconf'.])])
>
> -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
> +# Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> +# serial 1
> +
> # AM_AUTOMAKE_VERSION(VERSION)
> # ----------------------------
> # Automake X.Y traces this macro to ensure aclocal.m4 has been
> @@ -57,12 +61,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCON
>
> # AM_AUX_DIR_EXPAND -*- Autoconf -*-
>
> -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
> +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> +# serial 1
> +
> # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
> # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
> # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
> @@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
> Usually this means the macro was only invoked conditionally.]])
> fi])])
>
> -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
> -# Free Software Foundation, Inc.
> +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
> +# 2010, 2011 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> -# serial 10
> +# serial 12
>
> # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
> # written in clear, in which case automake, when reading aclocal.m4,
> @@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $dep
> # instance it was reported that on HP-UX the gcc test will end up
> # making a dummy file named `D' -- because `-MD' means `put the output
> # in D'.
> + rm -rf conftest.dir
> mkdir conftest.dir
> # Copy depcomp to subdir because otherwise we won't find it if we're
> # using a relative directory.
> @@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $dep
> break
> fi
> ;;
> - msvisualcpp | msvcmsys)
> + msvc7 | msvc7msys | msvisualcpp | msvcmsys)
> # This compiler won't grok `-c -o', but also, the minuso test has
> # not run yet. These depmodes are late enough in the game, and
> # so weak that their functioning should not be impacted.
> @@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
> if test "x$enable_dependency_tracking" != xno; then
> am_depcomp="$ac_aux_dir/depcomp"
> AMDEPBACKSLASH='\'
> + am__nodep='_no'
> fi
> AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
> AC_SUBST([AMDEPBACKSLASH])dnl
> _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
> +AC_SUBST([am__nodep])dnl
> +_AM_SUBST_NOTMAKE([am__nodep])dnl
> ])
>
> # Generate code to set up dependency tracking. -*- Autoconf -*-
> @@ -545,12 +555,15 @@ for _am_header in $config_headers :; do
> done
> echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
>
> -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
> +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
> +# Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> +# serial 1
> +
> # AM_PROG_INSTALL_SH
> # ------------------
> # Define $install_sh.
> @@ -569,8 +582,8 @@ AC_SUBST(install_sh)])
> # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
> # From Jim Meyering
>
> -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
> -# Free Software Foundation, Inc.
> +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
> +# 2011 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> @@ -590,7 +603,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
> [disable], [m4_define([am_maintainer_other], [enable])],
> [m4_define([am_maintainer_other], [enable])
> m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
> -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
> +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
> dnl maintainer-mode's default is 'disable' unless 'enable' is passed
> AC_ARG_ENABLE([maintainer-mode],
> [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
> @@ -701,12 +714,15 @@ else
> fi
> ])
>
> -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
> +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
> +# Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> +# serial 1
> +
> # AM_PROG_MKDIR_P
> # ---------------
> # Check for `mkdir -p'.
> @@ -729,13 +745,14 @@ esac
>
> # Helper functions for option handling. -*- Autoconf -*-
>
> -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
> +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
> +# Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> -# serial 4
> +# serial 5
>
> # _AM_MANGLE_OPTION(NAME)
> # -----------------------
> @@ -743,13 +760,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
> [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
>
> # _AM_SET_OPTION(NAME)
> -# ------------------------------
> +# --------------------
> # Set option NAME. Presently that only means defining a flag for this option.
> AC_DEFUN([_AM_SET_OPTION],
> [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
>
> # _AM_SET_OPTIONS(OPTIONS)
> -# ----------------------------------
> +# ------------------------
> # OPTIONS is a space-separated list of Automake options.
> AC_DEFUN([_AM_SET_OPTIONS],
> [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
> @@ -825,12 +842,14 @@ Check your system clock])
> fi
> AC_MSG_RESULT(yes)])
>
> -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
> +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> +# serial 1
> +
> # AM_PROG_INSTALL_STRIP
> # ---------------------
> # One issue with vendor `install' (even GNU) is that you can't
> @@ -853,13 +872,13 @@ fi
> INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
> AC_SUBST([INSTALL_STRIP_PROGRAM])])
>
> -# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
> +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>
> -# serial 2
> +# serial 3
>
> # _AM_SUBST_NOTMAKE(VARIABLE)
> # ---------------------------
> @@ -868,13 +887,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
> AC_DEFUN([_AM_SUBST_NOTMAKE])
>
> # AM_SUBST_NOTMAKE(VARIABLE)
> -# ---------------------------
> +# --------------------------
> # Public sister of _AM_SUBST_NOTMAKE.
> AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
>
> # Check how to create a tarball. -*- Autoconf -*-
>
> -# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
> +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> @@ -896,10 +915,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_
> # a tarball read from stdin.
> # $(am__untar) < result.tar
> AC_DEFUN([_AM_PROG_TAR],
> -[# Always define AMTAR for backward compatibility.
> -AM_MISSING_PROG([AMTAR], [tar])
> +[# Always define AMTAR for backward compatibility. Yes, it's still used
> +# in the wild :-( We should find a proper way to deprecate it ...
> +AC_SUBST([AMTAR], ['$${TAR-tar}'])
> m4_if([$1], [v7],
> - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
> + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
> [m4_case([$1], [ustar],, [pax],,
> [m4_fatal([Unknown tar format])])
> AC_MSG_CHECKING([how to create a $1 tar archive])
> @@ -968,9 +988,10 @@ AC_SUBST([am__tar])
> AC_SUBST([am__untar])
> ]) # _AM_PROG_TAR
>
> +m4_include([../config/acx.m4])
> m4_include([../config/depstand.m4])
> m4_include([../config/lead-dot.m4])
> -m4_include([../config/multi.m4])
> +m4_include([../config/override.m4])
> m4_include([../libtool.m4])
> m4_include([../ltoptions.m4])
> m4_include([../ltsugar.m4])
> --- libhsail-rt/configure.jj 2017-01-24 23:50:23.840910864 +0100
> +++ libhsail-rt/configure 2017-01-24 23:50:03.268178813 +0100
> @@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE
> am__EXEEXT_TRUE
> LTLIBOBJS
> LIBOBJS
> +get_gcc_base_ver
> toolexeclibdir
> toolexecdir
> CXXCPP
> @@ -640,6 +641,7 @@ CXX
> am__fastdepCC_FALSE
> am__fastdepCC_TRUE
> CCDEPMODE
> +am__nodep
> AMDEPBACKSLASH
> AMDEP_FALSE
> AMDEP_TRUE
> @@ -741,6 +743,7 @@ with_pic
> enable_fast_install
> with_gnu_ld
> enable_libtool_lock
> +with_gcc_major_version_only
> '
> ac_precious_vars='build_alias
> host_alias
> @@ -1395,6 +1398,8 @@ Optional Packages:
> --with-pic try to use only PIC/non-PIC objects [default=use
> both]
> --with-gnu-ld assume the C compiler uses GNU ld [default=no]
> + --with-gcc-major-version-only
> + use only GCC major number in filesystem paths
>
> Some influential environment variables:
> CC C compiler command
> @@ -2403,6 +2408,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
>
>
> +
> +
> +
> # Needed to define ${target}. Needs to be very early to avoid annoying
> # warning about calling AC_ARG_PROGRAM before AC_CANONICAL_SYSTEM
> ac_aux_dir=
> @@ -3009,11 +3017,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
>
> # We need awk for the "check" target. The system "awk" is bad on
> # some platforms.
> -# Always define AMTAR for backward compatibility.
> +# Always define AMTAR for backward compatibility. Yes, it's still used
> +# in the wild :-( We should find a proper way to deprecate it ...
> +AMTAR='$${TAR-tar}'
>
> -AMTAR=${AMTAR-"${am_missing_run}tar"}
> -
> -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
> +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
>
>
>
> @@ -3374,12 +3382,10 @@ done
>
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> -#include <stdio.h>
> +
> int
> main ()
> {
> -FILE *f = fopen ("conftest.out", "w");
> - return ferror (f) || fclose (f) != 0;
>
> ;
> return 0;
> @@ -3862,6 +3868,7 @@ fi
> if test "x$enable_dependency_tracking" != xno; then
> am_depcomp="$ac_aux_dir/depcomp"
> AMDEPBACKSLASH='\'
> + am__nodep='_no'
> fi
> if test "x$enable_dependency_tracking" != xno; then
> AMDEP_TRUE=
> @@ -3886,6 +3893,7 @@ else
> # instance it was reported that on HP-UX the gcc test will end up
> # making a dummy file named `D' -- because `-MD' means `put the output
> # in D'.
> + rm -rf conftest.dir
> mkdir conftest.dir
> # Copy depcomp to subdir because otherwise we won't find it if we're
> # using a relative directory.
> @@ -3945,7 +3953,7 @@ else
> break
> fi
> ;;
> - msvisualcpp | msvcmsys)
> + msvc7 | msvc7msys | msvisualcpp | msvcmsys)
> # This compiler won't grok `-c -o', but also, the minuso test has
> # not run yet. These depmodes are late enough in the game, and
> # so weak that their functioning should not be impacted.
> @@ -4270,6 +4278,7 @@ else
> # instance it was reported that on HP-UX the gcc test will end up
> # making a dummy file named `D' -- because `-MD' means `put the output
> # in D'.
> + rm -rf conftest.dir
> mkdir conftest.dir
> # Copy depcomp to subdir because otherwise we won't find it if we're
> # using a relative directory.
> @@ -4329,7 +4338,7 @@ else
> break
> fi
> ;;
> - msvisualcpp | msvcmsys)
> + msvc7 | msvc7msys | msvisualcpp | msvcmsys)
> # This compiler won't grok `-c -o', but also, the minuso test has
> # not run yet. These depmodes are late enough in the game, and
> # so weak that their functioning should not be impacted.
> @@ -10966,7 +10975,7 @@ else
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 10969 "configure"
> +#line 10978 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -11072,7 +11081,7 @@ else
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 11075 "configure"
> +#line 11084 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -14400,6 +14409,21 @@ _ACEOF
>
>
>
> +# Determine what GCC version number to use in filesystem paths.
> +
> + get_gcc_base_ver="cat"
> +
> +# Check whether --with-gcc-major-version-only was given.
> +if test "${with_gcc_major_version_only+set}" = set; then :
> + withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then
> + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'"
> + fi
> +
> +fi
> +
> +
> +
> +
> # Must be last
> cat >confcache <<\_ACEOF
> # This file is a shell script that caches the results of configure
> --- libhsail-rt/Makefile.in.jj 2017-01-24 23:29:11.000000000 +0100
> +++ libhsail-rt/Makefile.in 2017-01-24 23:50:06.321139049 +0100
> @@ -97,17 +97,18 @@ build_triplet = @build@
> host_triplet = @host@
> target_triplet = @target@
> subdir = .
> -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> - $(top_srcdir)/configure $(am__configure_deps) \
> - $(srcdir)/target-config.h.in $(srcdir)/../mkinstalldirs \
> - $(srcdir)/../depcomp
> +DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \
> + $(srcdir)/Makefile.am $(top_srcdir)/configure \
> + $(am__configure_deps) $(srcdir)/target-config.h.in \
> + $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
> +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
> + $(top_srcdir)/../config/depstand.m4 \
> $(top_srcdir)/../config/lead-dot.m4 \
> - $(top_srcdir)/../config/multi.m4 $(top_srcdir)/../libtool.m4 \
> - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
> - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
> - $(top_srcdir)/configure.ac
> + $(top_srcdir)/../config/override.m4 \
> + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
> + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
> + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> $(ACLOCAL_M4)
> am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
> @@ -265,6 +266,7 @@ datarootdir = @datarootdir@
> docdir = @docdir@
> dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> +get_gcc_base_ver = @get_gcc_base_ver@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> @@ -300,10 +302,10 @@ top_build_prefix = @top_build_prefix@
> top_builddir = @top_builddir@
> top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign subdir-objects
> -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
> MAINT_CHARSET = latin1
> mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
> -ACLOCAL_AMFLAGS = -I m4
> +ACLOCAL_AMFLAGS = -I .. -I ../config
> WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
>
> # -I/-D flags to pass when compiling.
>
> Jakub