X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=b7fcd78901429d03e739dc088419e4455187f215;hb=2ff310174c08e9f3a178cbd3b47ca3e9898ecda5;hp=90985da1101c13656f71488fa3640e75f7167282;hpb=93c2c33e04e4e5b78da45ec8c251899acce5d322;p=platform%2Fupstream%2Fautomake.git diff --git a/configure.ac b/configure.ac index 90985da..b7fcd78 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995-2012 Free Software Foundation, Inc. +# Copyright (C) 1995-2013 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,9 +16,9 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.12a], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.14], [bug-automake@gnu.org]) -AC_CONFIG_SRCDIR([automake.in]) +AC_CONFIG_SRCDIR([bin/automake.in]) AC_CONFIG_AUX_DIR([lib]) AM_SILENT_RULES([yes]) @@ -39,12 +39,12 @@ AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"]) dnl We call AC_PROG_CC in an unusual way, and only for use in our dnl testsuite, so also use 'no-dependencies' and 'no-define' among dnl the automake options to avoid bloating and potential problems. -AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests +AM_INIT_AUTOMAKE([-Wall -Werror dist-xz filename-length-max=99 no-define no-dependencies]) ## Keep this on a line of its own, since it must be found and processed ## by the 'update-copyright' rule in our Makefile. -RELEASE_YEAR=2012 +RELEASE_YEAR=2013 AC_SUBST([RELEASE_YEAR]) # The API version is the base version. We must guarantee @@ -63,16 +63,14 @@ AC_SUBST([amdir], ["\${pkgvdatadir}/am"]) AC_SUBST([automake_acdir], ["\${datadir}/aclocal-$APIVERSION"]) AC_SUBST([system_acdir], ["\${datadir}/aclocal"]) -# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir", -# hence '.' is really what we want for perllibdir, libdir, and acdir. -# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included, -# not copied, in aclocal.m4. -ACLOCAL="\ - perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \ - --automake-acdir=m4 --system-acdir=m4/acdir -I m4" -AUTOMAKE="\ - perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" \ - --libdir=lib" +# Our build system is bootstrapped with the bleeding-edge versions of +# aclocal and automake, hence the remake rules must use those versions +# as well. The extra quoting is to cater to cases when the build +# directory contains whitespace or shell metacharacters. +ACLOCAL="\"`pwd`/t/wrap/aclocal-$APIVERSION\"" +AUTOMAKE="\"`pwd`/t/wrap/automake-$APIVERSION\"" + +AC_PROG_LN_S AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then @@ -88,32 +86,6 @@ installed, select the one Automake should use using ./configure PERL=/path/to/perl]) } -# We require ithreads support, and version 5.7.2 for CLONE. -AC_CACHE_CHECK([whether $PERL supports ithreads], [am_cv_prog_PERL_ithreads], -[if $PERL -e ' - require 5.007_002; - use Config; - if ($Config{useithreads}) - { - require threads; - import threads; - require Thread::Queue; - import Thread::Queue; - exit 0; - } - exit 1;' >&AS_MESSAGE_LOG_FD 2>&1 -then - am_cv_prog_PERL_ithreads=yes -else - am_cv_prog_PERL_ithreads=no -fi]) -if test $am_cv_prog_PERL_ithreads = yes; then - PERL_THREADS=1; -else - PERL_THREADS=0; -fi -AC_SUBST([PERL_THREADS]) - # The test suite will skip some tests if tex is absent. AC_CHECK_PROG([TEX], [tex], [tex]) # Save details about the selected TeX program in config.log. @@ -141,7 +113,7 @@ AC_CHECK_PROGS([LEX], [lex flex], [false]) # following tests, but some users were unable to figure out that their # installation was broken since --version appeared to work. -required_autoconf_version=2.65 +AC_SUBST([required_autoconf_version], [2.65]) AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed], [if AM_RUN_LOG([$am_AUTOCONF --version]); then @@ -279,9 +251,6 @@ exit 77" >&AS_MESSAGE_LOG_FD 2>&1; test $? -eq 77; } # would emit "P=1" into file with /usr/xpg4/bin/sh from Solaris 10 and # /bin/sh from SunOS 5.11 and OpenBSD 4.7. # -# Finally, we look for weird bugs and portability problems mentioned in -# the Autoconf manual, and reject shells that suffers from them. (TODO) -# # Use '$am_score' to indicate the degree of acceptability of the shell. # A score of "10" means that the shell is good enough for our needs; # a score of "9" means that the shell has some minor bugs or limitation, @@ -472,12 +441,14 @@ AS_IF([test x"$GCC" = x"yes"], [am_CC_is_GNU=yes], [am_CC_is_GNU=no]) # On case-insensitive file systems (seen e.g. on Cygwin and Mac OS X) # we must avoid looking for 'CC', because that would be the same as # 'cc', and could cause $CXX to point to the C compiler, instead of -# to a C++ compiler as expected. See automake bugs #11893 and #10766. +# to a C++ compiler as expected (see automake bugs #11893 and #10766). +# Similarly, we must avoid looking for 'RCC', as that can point to the +# Qt4 "Resource Compiler": if test -f /bIn/rMdIr || test -f /uSr/bIn/rMdIr; then # Case-insensitive file system, don't look for CC. - am_CC= + am_CC= am_RCC= else - am_CC=CC + am_CC=CC am_RCC=RCC fi # The list of C++ compilers here has been copied, pasted and edited @@ -485,7 +456,7 @@ fi # Keep it in sync, or better again, find out a way to avoid this code # duplication. _AM_COMPILER_CAN_FAIL([AC_PROG_CXX(dnl - [aCC $am_CC FCC KCC RCC xlC_r xlC c++ cxx cc++ gpp g++])], + [aCC $am_CC FCC KCC $am_RCC xlC_r xlC c++ cxx cc++ gpp g++])], [CXX=false; _AM_SKIP_COMP_TESTS([C++])]) AS_IF([test x"$GXX" = x"yes"], [am_CXX_is_GNU=yes], [am_CXX_is_GNU=no]) @@ -611,10 +582,10 @@ AC_CONFIG_LINKS([GNUmakefile:GNUmakefile]) AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in], [chmod +x t/wrap/aclocal-${APIVERSION}], - [APIVERSION=$APIVERSION]) + [APIVERSION=$APIVERSION]) AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in], [chmod +x t/wrap/automake-${APIVERSION}], - [APIVERSION=$APIVERSION]) + [APIVERSION=$APIVERSION]) AC_OUTPUT @@ -632,7 +603,8 @@ am_release_type=`AS_ECHO(["$PACKAGE_VERSION"]) | LC_ALL=C awk [" /^$am_beta_version_rx$/ { print \"beta version\"; exit(0); } { print \"development snapshot\"; }"]` -test "$am_release_type" = stable || cat <