ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/aclocal.m4
(Generate patch)

Comparing ircd-hybrid/trunk/aclocal.m4 (file contents):
Revision 1680 by michael, Tue Dec 18 18:06:32 2012 UTC vs.
Revision 1720 by michael, Fri Dec 28 21:06:21 2012 UTC

# Line 1 | Line 1
1 < # generated automatically by aclocal 1.12.6 -*- Autoconf -*-
1 > # generated automatically by aclocal 1.13 -*- Autoconf -*-
2  
3   # Copyright (C) 1996-2012 Free Software Foundation, Inc.
4  
# Line 11 | Line 11
11   # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12   # PARTICULAR PURPOSE.
13  
14 + m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15   m4_ifndef([AC_AUTOCONF_VERSION],
16    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17   m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
# Line 9516 | Line 9517 | m4_ifndef([_LT_PROG_CXX],              [AC_DEFUN([_L
9517   # generated from the m4 files accompanying Automake X.Y.
9518   # (This private macro should not be called outside this file.)
9519   AC_DEFUN([AM_AUTOMAKE_VERSION],
9520 < [am__api_version='1.12'
9520 > [am__api_version='1.13'
9521   dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
9522   dnl require some minimum version.  Point them to the right macro.
9523 < m4_if([$1], [1.12.6], [],
9523 > m4_if([$1], [1.13], [],
9524        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
9525   ])
9526  
# Line 9535 | Line 9536 | m4_define([_AM_AUTOCONF_VERSION], [])
9536   # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
9537   # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
9538   AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
9539 < [AM_AUTOMAKE_VERSION([1.12.6])dnl
9539 > [AM_AUTOMAKE_VERSION([1.13])dnl
9540   m4_ifndef([AC_AUTOCONF_VERSION],
9541    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
9542   _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# Line 9828 | Line 9829 | _AM_SUBST_NOTMAKE([am__nodep])dnl
9829   # ------------------------------
9830   AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
9831   [{
9832 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
9832 >  # Older Autoconf quotes --file arguments for eval, but not when files
9833    # are listed without --file.  Let's play safe and only enable the eval
9834    # if we detect the quoting.
9835    case $CONFIG_FILES in
# Line 9914 | Line 9915 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
9915   # arguments mandatory, and then we can depend on a new Autoconf
9916   # release and drop the old call support.
9917   AC_DEFUN([AM_INIT_AUTOMAKE],
9918 < [AC_PREREQ([2.62])dnl
9918 > [AC_PREREQ([2.65])dnl
9919   dnl Autoconf wants to disallow AM_ names.  We explicitly allow
9920   dnl the ones we care about.
9921   m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
# Line 9944 | Line 9945 | AC_SUBST([CYGPATH_W])
9945   dnl Distinguish between old-style and new-style calls.
9946   m4_ifval([$2],
9947   [AC_DIAGNOSE([obsolete],
9948 < [$0: two- and three-arguments forms are deprecated.  For more info, see:
9948 < http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
9948 >             [$0: two- and three-arguments forms are deprecated.])
9949   m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
9950   AC_SUBST([PACKAGE], [$1])dnl
9951   AC_SUBST([VERSION], [$2])],
# Line 9999 | Line 9999 | AC_PROVIDE_IFELSE([AC_PROG_OBJC],
9999                    [_AM_DEPENDENCIES([OBJC])],
10000                    [m4_define([AC_PROG_OBJC],
10001                               m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
10002 < dnl Support for Objective C++ was only introduced in Autoconf 2.65,
10003 < dnl but we still cater to Autoconf 2.62.
10004 < m4_ifdef([AC_PROG_OBJCXX],
10005 < [AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
10002 > AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
10003                    [_AM_DEPENDENCIES([OBJCXX])],
10004                    [m4_define([AC_PROG_OBJCXX],
10005 <                             m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
10005 >                             m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
10006   ])
10007 < _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
10008 < dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
10009 < dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
10010 < dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
10007 > AC_REQUIRE([AM_SILENT_RULES])dnl
10008 > dnl The testsuite driver may need to know about EXEEXT, so add the
10009 > dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
10010 > dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
10011   AC_CONFIG_COMMANDS_PRE(dnl
10012   [m4_provide_if([_AM_COMPILER_EXEEXT],
10013    [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
# Line 10138 | Line 10135 | AC_MSG_CHECKING([whether to enable maint
10135   ]
10136   )
10137  
10141 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
10142
10138   # Check to see how 'make' treats includes.                  -*- Autoconf -*-
10139  
10140   # Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Line 10207 | Line 10202 | AC_SUBST($1)])
10202  
10203   # AM_MISSING_HAS_RUN
10204   # ------------------
10205 < # Define MISSING if not defined so far and test if it supports --run.
10206 < # If it does, set am_missing_run to use it, otherwise, to nothing.
10205 > # Define MISSING if not defined so far and test if it is modern enough.
10206 > # If it is, set am_missing_run to use it, otherwise, to nothing.
10207   AC_DEFUN([AM_MISSING_HAS_RUN],
10208   [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
10209   AC_REQUIRE_AUX_FILE([missing])dnl
# Line 10221 | Line 10216 | if test x"${MISSING+set}" != xset; then
10216    esac
10217   fi
10218   # Use eval to expand $SHELL
10219 < if eval "$MISSING --run true"; then
10220 <  am_missing_run="$MISSING --run "
10219 > if eval "$MISSING --is-lightweight"; then
10220 >  am_missing_run="$MISSING "
10221   else
10222    am_missing_run=
10223    AC_MSG_WARN(['missing' script is too old or missing])
# Line 10343 | Line 10338 | AC_CONFIG_COMMANDS_PRE(
10338   rm -f conftest.file
10339   ])
10340  
10341 + # Copyright (C) 2009-2012 Free Software Foundation, Inc.
10342 + #
10343 + # This file is free software; the Free Software Foundation
10344 + # gives unlimited permission to copy and/or distribute it,
10345 + # with or without modifications, as long as this notice is preserved.
10346 +
10347 + # AM_SILENT_RULES([DEFAULT])
10348 + # --------------------------
10349 + # Enable less verbose build rules; with the default set to DEFAULT
10350 + # ("yes" being less verbose, "no" or empty being verbose).
10351 + AC_DEFUN([AM_SILENT_RULES],
10352 + [AC_ARG_ENABLE([silent-rules], [dnl
10353 + AS_HELP_STRING(
10354 +  [--enable-silent-rules],
10355 +  [less verbose build output (undo: "make V=1")])
10356 + AS_HELP_STRING(
10357 +  [--disable-silent-rules],
10358 +  [verbose build output (undo: "make V=0")])dnl
10359 + ])
10360 + case $enable_silent_rules in @%:@ (((
10361 +  yes) AM_DEFAULT_VERBOSITY=0;;
10362 +   no) AM_DEFAULT_VERBOSITY=1;;
10363 +    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
10364 + esac
10365 + dnl
10366 + dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
10367 + dnl do not support nested variable expansions.
10368 + dnl See automake bug#9928 and bug#10237.
10369 + am_make=${MAKE-make}
10370 + AC_CACHE_CHECK([whether $am_make supports nested variables],
10371 +   [am_cv_make_support_nested_variables],
10372 +   [if AS_ECHO([['TRUE=$(BAR$(V))
10373 + BAR0=false
10374 + BAR1=true
10375 + V=1
10376 + am__doit:
10377 +        @$(TRUE)
10378 + .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
10379 +  am_cv_make_support_nested_variables=yes
10380 + else
10381 +  am_cv_make_support_nested_variables=no
10382 + fi])
10383 + if test $am_cv_make_support_nested_variables = yes; then
10384 +  dnl Using '$V' instead of '$(V)' breaks IRIX make.
10385 +  AM_V='$(V)'
10386 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
10387 + else
10388 +  AM_V=$AM_DEFAULT_VERBOSITY
10389 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
10390 + fi
10391 + AC_SUBST([AM_V])dnl
10392 + AM_SUBST_NOTMAKE([AM_V])dnl
10393 + AC_SUBST([AM_DEFAULT_V])dnl
10394 + AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
10395 + AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
10396 + AM_BACKSLASH='\'
10397 + AC_SUBST([AM_BACKSLASH])dnl
10398 + _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
10399 + ])
10400 +
10401   # Copyright (C) 2001-2012 Free Software Foundation, Inc.
10402   #
10403   # This file is free software; the Free Software Foundation

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines