third_party/yasm/patched-yasm/aclocal.m4 - Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

Unified Diff: third_party/yasm/patched-yasm/aclocal.m4

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/

Patch Set: Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/yasm/patched-yasm/aclocal.m4

===================================================================

--- third_party/yasm/patched-yasm/aclocal.m4 (revision 71129)

+++ third_party/yasm/patched-yasm/aclocal.m4 (working copy)

@@ -1,7 +1,7 @@

-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+# 2005, 2006, 2007, 2008, 2009 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.

@@ -13,13 +13,13 @@

m4_ifndef([AC_AUTOCONF_VERSION],

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

-m4_if(AC_AUTOCONF_VERSION, [2.61],,

-[m4_warning([this file was generated for autoconf 2.61.

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,

+[m4_warning([this file was generated for autoconf 2.65.

You have another version of autoconf. It may work, but is not guaranteed to.

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'.])])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -31,10 +31,10 @@

# generated from the m4 files accompanying Automake X.Y.

# (This private macro should not be called outside this file.)

AC_DEFUN([AM_AUTOMAKE_VERSION],

-[am__api_version='1.10'

+[am__api_version='1.11'

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

dnl require some minimum version. Point them to the right macro.

-m4_if([$1], [1.10.1], [],

+m4_if([$1], [1.11.1], [],

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

])

@@ -48,12 +48,12 @@

# AM_SET_CURRENT_AUTOMAKE_VERSION

# -------------------------------

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.10.1])dnl

+[AM_AUTOMAKE_VERSION([1.11.1])dnl

m4_ifndef([AC_AUTOCONF_VERSION],

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

@@ -110,14 +110,14 @@

# AM_CONDITIONAL -*- Autoconf -*-

# 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 8

+# serial 9

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

# -------------------------------------

@@ -130,6 +130,7 @@

AC_SUBST([$1_FALSE])dnl

_AM_SUBST_NOTMAKE([$1_TRUE])dnl

_AM_SUBST_NOTMAKE([$1_FALSE])dnl

+m4_define([_AM_COND_VALUE_$1], [$2])dnl

if $2; then

$1_TRUE=

$1_FALSE='#'

@@ -143,14 +144,14 @@

Usually this means the macro was only invoked conditionally.]])

fi])])

# 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 9

+# serial 10

# 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,

@@ -207,6 +208,16 @@

if test "$am_compiler_list" = ""; then

am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`

+ am__universal=false

+ m4_case([$1], [CC],

+ [case " $depcc " in #(

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

+ esac],

+ [CXX],

+ [case " $depcc " in #(

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

+ esac])

for depmode in $am_compiler_list; do

# Setup a source with many dependencies, because some compilers

# like to wrap large dependency lists on column 80 (with \), and

@@ -224,7 +235,17 @@

done

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

+ # mode. It turns out that the SunPro C++ compiler does not properly

+ # handle `-M -o', and we need to detect this. Also, some Intel

+ # versions had trouble with output in subdirs

+ am__obj=sub/conftest.${OBJEXT-o}

+ am__minus_obj="-o $am__obj"

case $depmode in

+ gcc)

+ # This depmode causes a compiler race in universal mode.

+ test "$am__universal" = false || continue

+ ;;

nosideeffect)

# after this tag, mechanisms are not by side-effect, so they'll

# only be used when explicitly requested

@@ -234,19 +255,23 @@

break

;;

+ 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.

+ am__obj=conftest.${OBJEXT-o}

+ am__minus_obj=

+ ;;

none) break ;;

esac

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

- # mode. It turns out that the SunPro C++ compiler does not properly

- # handle `-M -o', and we need to detect this.

if depmode=$depmode \

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

+ source=sub/conftest.c object=$am__obj \

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

>/dev/null 2>conftest.err &&

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

# icc doesn't choke on unknown options, it will just issue warnings

# or remarks (even with -Werror). So we grep stderr for any message

@@ -303,57 +328,68 @@

# Generate code to set up dependency tracking. -*- Autoconf -*-

# 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 3

+#serial 5

# _AM_OUTPUT_DEPENDENCY_COMMANDS

# ------------------------------

AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

-[for mf in $CONFIG_FILES; do

- # Strip MF so we end up with the name of the file.

- mf=`echo "$mf" | sed -e 's/:.*$//'`

- # Check whether this is an Automake generated Makefile or not.

- # We used to match only the files named `Makefile.in', but

- # some people rename them; so instead we look at the file content.

- # Grep'ing the first line is not enough: some people post-process

- # each Makefile.in and add a new line on top of each file to say so.

- # Grep'ing the whole file is not good either: AIX grep has a line

- # limit of 2048, but all sed's we know have understand at least 4000.

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

- dirpart=`AS_DIRNAME("$mf")`

- else

- continue

- fi

- # Extract the definition of DEPDIR, am__include, and am__quote

- # from the Makefile without running `make'.

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

- test -z "$DEPDIR" && continue

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

- test -z "am__include" && continue

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

- # When using ansi2knr, U may be empty or an underscore; expand it

- U=`sed -n 's/^U = //p' < "$mf"`

- # Find all dependency output files, they are included files with

- # $(DEPDIR) in their names. We invoke sed twice because it is the

- # simplest approach to changing $(DEPDIR) to its actual value in the

- # expansion.

- for file in `sed -n "

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

- # Make sure the directory exists.

- test -f "$dirpart/$file" && continue

- fdir=`AS_DIRNAME(["$file"])`

- AS_MKDIR_P([$dirpart/$fdir])

- # echo "creating $dirpart/$file"

- echo '# dummy' > "$dirpart/$file"

+[{

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

+ # are listed without --file. Let's play safe and only enable the eval

+ # if we detect the quoting.

+ case $CONFIG_FILES in

+ *\'*) eval set x "$CONFIG_FILES" ;;

+ *) set x $CONFIG_FILES ;;

+ esac

+ shift

+ for mf

+ do

+ # Strip MF so we end up with the name of the file.

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

+ # Check whether this is an Automake generated Makefile or not.

+ # We used to match only the files named `Makefile.in', but

+ # some people rename them; so instead we look at the file content.

+ # Grep'ing the first line is not enough: some people post-process

+ # each Makefile.in and add a new line on top of each file to say so.

+ # Grep'ing the whole file is not good either: AIX grep has a line

+ # limit of 2048, but all sed's we know have understand at least 4000.

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

+ dirpart=`AS_DIRNAME("$mf")`

+ else

+ continue

+ fi

+ # Extract the definition of DEPDIR, am__include, and am__quote

+ # from the Makefile without running `make'.

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

+ test -z "$DEPDIR" && continue

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

+ test -z "am__include" && continue

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

+ # When using ansi2knr, U may be empty or an underscore; expand it

+ U=`sed -n 's/^U = //p' < "$mf"`

+ # Find all dependency output files, they are included files with

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

+ # simplest approach to changing $(DEPDIR) to its actual value in the

+ # expansion.

+ for file in `sed -n "

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

+ # Make sure the directory exists.

+ test -f "$dirpart/$file" && continue

+ fdir=`AS_DIRNAME(["$file"])`

+ AS_MKDIR_P([$dirpart/$fdir])

+ # echo "creating $dirpart/$file"

+ echo '# dummy' > "$dirpart/$file"

+ done

done

-done

])# _AM_OUTPUT_DEPENDENCY_COMMANDS

@@ -398,28 +434,16 @@

AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])

-# 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 8

-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.

-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

# Do all the work for Automake. -*- Autoconf -*-

-# 2005, 2006, 2008 Free Software Foundation, Inc.

+# 2005, 2006, 2008, 2009 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 13

+# serial 16

# This macro actually does too much. Some checks are only needed if

# your package does certain things. But this isn't really a big deal.

@@ -436,7 +460,7 @@

# arguments mandatory, and then we can depend on a new Autoconf

# release and drop the old call support.

AC_DEFUN([AM_INIT_AUTOMAKE],

-[AC_PREREQ([2.60])dnl

+[AC_PREREQ([2.62])dnl

dnl Autoconf wants to disallow AM_ names. We explicitly allow

dnl the ones we care about.

m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

@@ -487,8 +511,8 @@

AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

AM_MISSING_PROG(AUTOHEADER, autoheader)

AM_MISSING_PROG(MAKEINFO, makeinfo)

-AM_PROG_INSTALL_SH

-AM_PROG_INSTALL_STRIP

+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

AC_REQUIRE([AM_PROG_MKDIR_P])dnl

# We need awk for the "check" target. The system "awk" is bad on

# some platforms.

@@ -496,25 +520,38 @@

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],

- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

- [_AM_PROG_TAR([v7])])])

+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

+ [_AM_PROG_TAR([v7])])])

_AM_IF_OPTION([no-dependencies],,

[AC_PROVIDE_IFELSE([AC_PROG_CC],

- [_AM_DEPENDENCIES(CC)],

- [define([AC_PROG_CC],

- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

+ [_AM_DEPENDENCIES(CC)],

+ [define([AC_PROG_CC],

+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

AC_PROVIDE_IFELSE([AC_PROG_CXX],

- [_AM_DEPENDENCIES(CXX)],

- [define([AC_PROG_CXX],

- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

+ [_AM_DEPENDENCIES(CXX)],

+ [define([AC_PROG_CXX],

+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

AC_PROVIDE_IFELSE([AC_PROG_OBJC],

- [_AM_DEPENDENCIES(OBJC)],

- [define([AC_PROG_OBJC],

- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

+ [_AM_DEPENDENCIES(OBJC)],

+ [define([AC_PROG_OBJC],

+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

])

+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl

+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the

+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro

+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

+AC_CONFIG_COMMANDS_PRE(dnl

+[m4_provide_if([_AM_COMPILER_EXEEXT],

+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

])

+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

+dnl mangled by Autoconf and run in a shell conditional statement.

+m4_define([_AC_COMPILER_EXEEXT],

+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

# When config.status generates a header, we must update the stamp-h file.

# This file resides in the same directory as the config header

# that is generated. The stamp files are numbered to have different names.

@@ -536,7 +573,7 @@

done

echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -547,7 +584,14 @@

# Define $install_sh.

AC_DEFUN([AM_PROG_INSTALL_SH],

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

+if test x"${install_sh}" != xset; then

+ case $am_aux_dir in

+ *\ * | *\ *)

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

+ *)

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

+ esac

+fi

AC_SUBST(install_sh)])

@@ -574,27 +618,38 @@

# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-

# From Jim Meyering

# 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_MAINTAINER_MODE([DEFAULT-MODE])

+# ----------------------------------

+# Control maintainer-specific portions of Makefiles.

+# Default is to disable them, unless `enable' is passed literally.

+# For symmetry, `disable' may be passed as well. Anyway, the user

+# can override the default with the --enable/--disable switch.

AC_DEFUN([AM_MAINTAINER_MODE],

-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

- dnl maintainer-mode is disabled by default

- AC_ARG_ENABLE(maintainer-mode,

-[ --enable-maintainer-mode enable make rules and dependencies not useful

+[m4_case(m4_default([$1], [disable]),

+ [enable], [m4_define([am_maintainer_other], [disable])],

+ [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])

+ 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

(and sometimes confusing) to the casual installer],

- USE_MAINTAINER_MODE=$enableval,

- USE_MAINTAINER_MODE=no)

+ [USE_MAINTAINER_MODE=$enableval],

+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))

AC_MSG_RESULT([$USE_MAINTAINER_MODE])

- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])

+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])

MAINT=$MAINTAINER_MODE_TRUE

- AC_SUBST(MAINT)dnl

+ AC_SUBST([MAINT])dnl

]

)

@@ -602,13 +657,13 @@

# Check to see how 'make' treats includes. -*- Autoconf -*-

# 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 3

+# serial 4

# AM_MAKE_INCLUDE()

# -----------------

@@ -617,7 +672,7 @@

[am_make=${MAKE-make}

cat > confinc << 'END'

am__doit:

- @echo done

+ @echo this is the am__doit target

.PHONY: am__doit

END

# If we don't find an include directive, just comment out the code.

@@ -627,24 +682,24 @@

_am_result=none

# First try GNU make style include.

echo "include confinc" > confmf

-# We grep out `Entering directory' and `Leaving directory'

-# messages which can occur if `w' ends up in MAKEFLAGS.

-# In particular we don't look at `^make:' because GNU make might

-# be invoked under some other name (usually "gmake"), in which

-# case it prints its new name instead of `make'.

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

- am__include=include

- am__quote=

- _am_result=GNU

-fi

+# Ignore all kinds of additional output from `make'.

+case `$am_make -s -f confmf 2> /dev/null` in #(

+*the\ am__doit\ target*)

+ am__include=include

+ am__quote=

+ _am_result=GNU

+ ;;

+esac

# Now try BSD make style include.

if test "$am__include" = "#"; then

echo '.include "confinc"' > confmf

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

- am__include=.include

- am__quote="\""

- _am_result=BSD

- fi

+ case `$am_make -s -f confmf 2> /dev/null` in #(

+ *the\ am__doit\ target*)

+ am__include=.include

+ am__quote="\""

+ _am_result=BSD

+ ;;

+ esac

AC_SUBST([am__include])

AC_SUBST([am__quote])

@@ -654,14 +709,14 @@

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

# 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 5

+# serial 6

# AM_MISSING_PROG(NAME, PROGRAM)

# ------------------------------

@@ -678,7 +733,14 @@

AC_DEFUN([AM_MISSING_HAS_RUN],

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

AC_REQUIRE_AUX_FILE([missing])dnl

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

+if test x"${MISSING+set}" != xset; then

+ case $am_aux_dir in

+ *\ * | *\ *)

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

+ *)

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

+ esac

+fi

# Use eval to expand $SHELL

if eval "$MISSING --run true"; then

am_missing_run="$MISSING --run "

@@ -716,13 +778,13 @@

# Helper functions for option handling. -*- Autoconf -*-

# 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 3

+# serial 4

# _AM_MANGLE_OPTION(NAME)

# -----------------------

@@ -739,7 +801,7 @@

# ----------------------------------

# OPTIONS is a space-separated list of Automake options.

AC_DEFUN([_AM_SET_OPTIONS],

-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])

# -------------------------------------------

@@ -747,7 +809,7 @@

AC_DEFUN([_AM_IF_OPTION],

[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

# Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation

@@ -778,13 +840,11 @@

# numbers and dots only.

AC_DEFUN([AM_PATH_PYTHON],

[

- dnl Find a Python interpreter. Python versions prior to 1.5 are not

- dnl supported because the default installation locations changed from

- dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages

- dnl in 1.5.

+ dnl Find a Python interpreter. Python versions prior to 2.0 are not

+ dnl supported. (2.0 was released on October 16, 2000).

m4_define_default([_AM_PYTHON_INTERPRETER_LIST],

- [python python2 python2.5 python2.4 python2.3 python2.2 dnl

-python2.1 python2.0 python1.6 python1.5])

+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl

+python2.1 python2.0])

m4_if([$1],[],[

dnl No version check is needed.

@@ -831,7 +891,7 @@

dnl library.

AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],

- [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])

+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])

AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])

dnl Use the values of $prefix and $exec_prefix for the corresponding

@@ -846,7 +906,7 @@

dnl to know which OS platform Python thinks this is.

AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],

- [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])

+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])

AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])

@@ -861,8 +921,29 @@

dnl doesn't work.

AC_CACHE_CHECK([for $am_display_PYTHON script directory],

[am_cv_python_pythondir],

- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||

- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])

+ [if test "x$prefix" = xNONE

+ then

+ am_py_prefix=$ac_default_prefix

+ else

+ am_py_prefix=$prefix

+ fi

+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||

+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

+ case $am_cv_python_pythondir in

+ $am_py_prefix*)

+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`

+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`

+ ;;

+ *)

+ case $am_py_prefix in

+ /usr|/System*) ;;

+ *)

+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages

+ ;;

+ esac

+ ;;

+ esac

+ ])

AC_SUBST([pythondir], [$am_cv_python_pythondir])

dnl pkgpythondir -- $PACKAGE directory under pythondir. Was

@@ -878,8 +959,29 @@

dnl doesn't work.

AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],

[am_cv_python_pyexecdir],

- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||

- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])

+ [if test "x$exec_prefix" = xNONE

+ then

+ am_py_exec_prefix=$am_py_prefix

+ else

+ am_py_exec_prefix=$exec_prefix

+ fi

+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||

+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

+ case $am_cv_python_pyexecdir in

+ $am_py_exec_prefix*)

+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`

+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`

+ ;;

+ *)

+ case $am_py_exec_prefix in

+ /usr|/System*) ;;

+ *)

+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages

+ ;;

+ esac

+ ;;

+ esac

+ ])

AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])

dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)

@@ -899,15 +1001,16 @@

# Run ACTION-IF-FALSE otherwise.

# This test uses sys.hexversion instead of the string equivalent (first

# word of sys.version), in order to cope with versions such as 2.2c1.

-# hexversion has been introduced in Python 1.5.2; it's probably not

-# worth to support older versions (1.5.1 was released on October 31, 1998).

+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).

AC_DEFUN([AM_PYTHON_CHECK_VERSION],

- [prog="import sys, string

+ [prog="import sys

# split strings by '.' and convert to numeric. Append some zeros

# because we need at least 4 digits for the hex conversion.

-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]

+# map returns an iterator in Python 3.0 and a list in 2.x

+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]

minverhex = 0

-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]

+# xrange is not present in Python 3.0 and range returns an iterator

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]

sys.exit(sys.hexversion < minverhex)"

AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])

@@ -930,14 +1033,14 @@

# Check to make sure that the build environment is sane. -*- Autoconf -*-

# 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_SANITY_CHECK

# ---------------

@@ -946,16 +1049,29 @@

# Just in case

sleep 1

echo timestamp > conftest.file

+# Reject unsafe characters in $srcdir or the absolute working directory

+# name. Accept space and tab only in the latter.

+am_lf='

+case `pwd` in

+ *[[\\\"\#\$\&\'\`$am_lf]]*)

+ AC_MSG_ERROR([unsafe absolute working directory name]);;

+esac

+case $srcdir in

+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)

+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;

+esac

# Do `set' in a subshell so we don't clobber the current shell's

# arguments. Must try -L first in case configure is actually a

# symlink; some systems play weird games with the mod time of symlinks

# (eg FreeBSD returns the mod time of the symlink's containing

# directory).

if (

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

if test "$[*]" = "X"; then

# -L didn't work.

- set X `ls -t $srcdir/configure conftest.file`

+ set X `ls -t "$srcdir/configure" conftest.file`

rm -f conftest.file

if test "$[*]" != "X $srcdir/configure conftest.file" \

@@ -1008,18 +1124,25 @@

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

AC_SUBST([INSTALL_STRIP_PROGRAM])])

# 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

# _AM_SUBST_NOTMAKE(VARIABLE)

# ---------------------------

# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

# This macro is traced by Automake.

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 -*-

@@ -1117,6 +1240,7 @@

]) # _AM_PROG_TAR

m4_include([m4/ax_create_stdint_h.m4])

+m4_include([m4/cython.m4])

m4_include([m4/gettext.m4])

m4_include([m4/iconv.m4])

m4_include([m4/lib-ld.m4])

@@ -1125,5 +1249,4 @@

m4_include([m4/nls.m4])

m4_include([m4/po.m4])

m4_include([m4/progtest.m4])

-m4_include([m4/pyrex.m4])

m4_include([m4/pythonhead.m4])

« no previous file with comments | « third_party/yasm/patched-yasm/Mkfiles/vc9/yasm.sln ('k') | third_party/yasm/patched-yasm/config.h.in » ('j') | no next file with comments »