diff options
| -rwxr-xr-x | bootstrap.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | lib/Automake/Config.in | 9 |
3 files changed, 8 insertions, 29 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 0a5a290e2..93bf3fd54 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -35,7 +35,6 @@ export AUTOM4TE # ditto VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac` PACKAGE=automake datadir=. -PERL_THREADS=0 # This should be automatically updated by the 'update-copyright' # rule of our Makefile. RELEASE_YEAR=2013 @@ -83,7 +82,6 @@ dosubst () sed -e "s%@APIVERSION@%$APIVERSION%g" \ -e "s%@PACKAGE@%$PACKAGE%g" \ -e "s%@PERL@%$PERL%g" \ - -e "s%@PERL_THREADS@%$PERL_THREADS%g" \ -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \ -e "s%@VERSION@%$VERSION%g" \ -e "s%@datadir@%$datadir%g" \ diff --git a/configure.ac b/configure.ac index 6ef2be734..006a08c2d 100644 --- a/configure.ac +++ b/configure.ac @@ -86,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. diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in index fe6ef9d29..885e74e5d 100644 --- a/lib/Automake/Config.in +++ b/lib/Automake/Config.in @@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; our $VERSION = '@VERSION@'; our $RELEASE_YEAR = '@RELEASE_YEAR@'; our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; -our $perl_threads = @PERL_THREADS@; + +our $perl_threads = 0; +# We need at least this version for CLONE support. +if (eval { require 5.007_002; }) + { + use Config; + $perl_threads = $Config{useithreads}; + } 1; |