Difference for ./aclocal.m4 from version 1.10 to 1.11

version 1.10

version 1.11

Line 1

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

# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-

# Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation

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

Line 99

# CC etc. in the Makefile, will ask for an AC_PROG_CC use...

AC_PREREQ([2.54])

AC_PREREQ([2.52])

# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow

# the ones we care about.

Line 125

AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

# test whether we have cygpath

if test -z "$CYGPATH_W"; then

if (cygpath --version) >/dev/null 2>/dev/null; then

CYGPATH_W='cygpath -w'

else

CYGPATH_W=echo

AC_SUBST([CYGPATH_W])

# Define the identity of the package.

dnl Distinguish between old-style and new-style calls.

m4_ifval([$2],

Line 166

Line 156

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

_AM_IF_OPTION([no-dependencies],,

[AC_PROVIDE_IFELSE([AC_PROG_CC],

[AC_PROVIDE_IFELSE([AC_PROG_][CC],

[_AM_DEPENDENCIES(CC)],

[define([AC_PROG_CC],

[define([AC_PROG_][CC],

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

defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl

AC_PROVIDE_IFELSE([AC_PROG_CXX],

AC_PROVIDE_IFELSE([AC_PROG_][CXX],

[_AM_DEPENDENCIES(CXX)],

[define([AC_PROG_CXX],

[define([AC_PROG_][CXX],

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

defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl

])

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

# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the

# loop where config.status creates the headers, so we can generate

# our stamp files there.

AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],

[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`

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

# This program is free software; you can redistribute it and/or modify

Line 209

Line 187

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

# Automake X.Y traces this macro to ensure aclocal.m4 has been

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

AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])

AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])

# AM_SET_CURRENT_AUTOMAKE_VERSION

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

# Call AM_AUTOMAKE_VERSION so it can be traced.

# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

[AM_AUTOMAKE_VERSION([1.7.1])])

[AM_AUTOMAKE_VERSION([1.6.3])])

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

Line 596

Line 574

if depmode=$depmode \

source=conftest.c object=conftest.o \

depfile=conftest.Po tmpdepfile=conftest.TPo \

$SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&

$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&

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

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

am_cv_$1_dependencies_compiler_type=$depmode

Line 611

Line 589

])

AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])

AM_CONDITIONAL([am__fastdep$1], [

test "x$enable_dependency_tracking" != xno \

&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])

])

Line 733

Line 708

[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])

])

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

# 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

Line 775

Line 748

# 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

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

am__include=include

am__quote=

_am_result=GNU

Line 835

Line 808

AC_CONFIG_COMMANDS_PRE(

[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then

AC_MSG_ERROR([conditional "$1" was never defined.

AC_MSG_ERROR([conditional \"$1\" was never defined.

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

fi])])

Line 862

Line 835

# serial 6

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

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

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

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

# that is generated. We must strip everything past the first ":",

# and everything past the last "/".

# _AM_DIRNAME(PATH)

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

# Like AS_DIRNAME, only do it during macro expansion

AC_DEFUN([_AM_DIRNAME],

[m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,

m4_if(regexp([$1], [^//$[^/]\|$$]), -1,

m4_if(regexp([$1], [^/.*]), -1,

[.],

patsubst([$1], [^$/$.*], [\1])),

patsubst([$1], [^$//$$[^/].*\|$$], [\1])),

patsubst([$1], [^$.*[^/]$//*[^/][^/]*/*$], [\1]))[]dnl

])# _AM_DIRNAME

# The stamp files are numbered to have different names.

# We could number them on a directory basis, but that's additional

# complications, let's have a unique counter.

m4_define([_AM_STAMP_Count], [0])

# _AM_STAMP(HEADER)

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

# The name of the stamp file for HEADER.

AC_DEFUN([_AM_STAMP],

[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl

AS_ESCAPE(_AM_DIRNAME(patsubst([$1],

[:.*])))/stamp-h[]_AM_STAMP_Count])

# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)

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

# We used to try to get a real timestamp in stamp-h. But the fear is that

# that will cause unnecessary cvs conflicts.

AC_DEFUN([_AM_CONFIG_HEADER],

[# Add the stamp file to the list of files AC keeps track of,

# along with our hook.

AC_CONFIG_HEADERS([$1],

[# update the timestamp

echo 'timestamp for $1' >"_AM_STAMP([$1])"

$2],

[$3])

])# _AM_CONFIG_HEADER

# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)

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

AC_DEFUN([AM_CONFIG_HEADER],

[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])

])# AM_CONFIG_HEADER

# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-

Line 2997

Line 3022

# people can always --disable-shared, the test was removed, and we

# assume the GNU/Linux dynamic linker is in use.

dynamic_linker='GNU/Linux ld.so'

# Find out which ABI we are using (multilib Linux x86_64 hack).

libsuff=

case "$host_cpu" in

x86_64*|s390x*)

echo '[#]line __oline__ "configure"' > conftest.$ac_ext

if AC_TRY_EVAL(ac_compile); then

case `/usr/bin/file conftest.$ac_objext` in

*64-bit*)

libsuff=64

;;

esac

rm -rf conftest*

;;

esac

sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

;;

netbsd*)

Line 4190

Line 4235

# This must be Linux ELF.

linux-gnu*)

case $host_cpu in

lt_cv_deplibs_check_method=pass_all ;;

# glibc up to 2.1.1 does not perform some relocations on ARM

Legend:

line(s) removed in v.1.10
line(s) changed
	line(s) added in v.1.11

File made using version 1.98 of cvs2html by leaf at 2011-07-21 16:53