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/branches/8.2.x/aclocal.m4 (file contents):
Revision 5393 by michael, Fri Dec 5 14:30:16 2014 UTC vs.
Revision 5394 by michael, Tue Jan 20 14:03:09 2015 UTC

# Line 1 | Line 1
1 < # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1 > # generated automatically by aclocal 1.15 -*- Autoconf -*-
2  
3 < # Copyright (C) 1996-2013 Free Software Foundation, Inc.
3 > # Copyright (C) 1996-2014 Free Software Foundation, Inc.
4  
5   # This file is free software; the Free Software Foundation
6   # gives unlimited permission to copy and/or distribute it,
# Line 20 | Line 20 | You have another version of autoconf.  I
20   If you have problems, you may need to regenerate the build system entirely.
21   To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22  
23 < # Copyright (C) 2002-2013 Free Software Foundation, Inc.
23 > # Copyright (C) 2002-2014 Free Software Foundation, Inc.
24   #
25   # This file is free software; the Free Software Foundation
26   # gives unlimited permission to copy and/or distribute it,
# Line 32 | Line 32 | To do so, use the procedure documented b
32   # generated from the m4 files accompanying Automake X.Y.
33   # (This private macro should not be called outside this file.)
34   AC_DEFUN([AM_AUTOMAKE_VERSION],
35 < [am__api_version='1.14'
35 > [am__api_version='1.15'
36   dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37   dnl require some minimum version.  Point them to the right macro.
38 < m4_if([$1], [1.14.1], [],
38 > m4_if([$1], [1.15], [],
39        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40   ])
41  
# Line 51 | Line 51 | m4_define([_AM_AUTOCONF_VERSION], [])
51   # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52   # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53   AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54 < [AM_AUTOMAKE_VERSION([1.14.1])dnl
54 > [AM_AUTOMAKE_VERSION([1.15])dnl
55   m4_ifndef([AC_AUTOCONF_VERSION],
56    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57   _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
58  
59   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
60  
61 < # Copyright (C) 2001-2013 Free Software Foundation, Inc.
61 > # Copyright (C) 2001-2014 Free Software Foundation, Inc.
62   #
63   # This file is free software; the Free Software Foundation
64   # gives unlimited permission to copy and/or distribute it,
# Line 103 | Line 103 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCON
103   # configured tree to be moved without reconfiguration.
104  
105   AC_DEFUN([AM_AUX_DIR_EXPAND],
106 < [dnl Rely on autoconf to set up CDPATH properly.
107 < AC_PREREQ([2.50])dnl
108 < # expand $ac_aux_dir to an absolute path
109 < am_aux_dir=`cd $ac_aux_dir && pwd`
106 > [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
107 > # Expand $ac_aux_dir to an absolute path.
108 > am_aux_dir=`cd "$ac_aux_dir" && pwd`
109   ])
110  
111   # AM_CONDITIONAL                                            -*- Autoconf -*-
112  
113 < # Copyright (C) 1997-2013 Free Software Foundation, Inc.
113 > # Copyright (C) 1997-2014 Free Software Foundation, Inc.
114   #
115   # This file is free software; the Free Software Foundation
116   # gives unlimited permission to copy and/or distribute it,
# Line 142 | Line 141 | AC_CONFIG_COMMANDS_PRE(
141   Usually this means the macro was only invoked conditionally.]])
142   fi])])
143  
144 < # Copyright (C) 1999-2013 Free Software Foundation, Inc.
144 > # Copyright (C) 1999-2014 Free Software Foundation, Inc.
145   #
146   # This file is free software; the Free Software Foundation
147   # gives unlimited permission to copy and/or distribute it,
# Line 333 | Line 332 | _AM_SUBST_NOTMAKE([am__nodep])dnl
332  
333   # Generate code to set up dependency tracking.              -*- Autoconf -*-
334  
335 < # Copyright (C) 1999-2013 Free Software Foundation, Inc.
335 > # Copyright (C) 1999-2014 Free Software Foundation, Inc.
336   #
337   # This file is free software; the Free Software Foundation
338   # gives unlimited permission to copy and/or distribute it,
# Line 409 | Line 408 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
408  
409   # Do all the work for Automake.                             -*- Autoconf -*-
410  
411 < # Copyright (C) 1996-2013 Free Software Foundation, Inc.
411 > # Copyright (C) 1996-2014 Free Software Foundation, Inc.
412   #
413   # This file is free software; the Free Software Foundation
414   # gives unlimited permission to copy and/or distribute it,
# Line 499 | Line 498 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl
498   # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
499   # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
500   AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
501 < # We need awk for the "check" target.  The system "awk" is bad on
502 < # some platforms.
501 > # We need awk for the "check" target (and possibly the TAP driver).  The
502 > # system "awk" is bad on some platforms.
503   AC_REQUIRE([AC_PROG_AWK])dnl
504   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
505   AC_REQUIRE([AM_SET_LEADING_DOT])dnl
# Line 573 | Line 572 | to "yes", and re-run configure.
572   END
573      AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
574    fi
575 < fi])
575 > fi
576 > dnl The trailing newline in this macro's definition is deliberate, for
577 > dnl backward compatibility and to allow trailing 'dnl'-style comments
578 > dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
579 > ])
580  
581   dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
582   dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
# Line 602 | Line 605 | for _am_header in $config_headers :; do
605   done
606   echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
607  
608 < # Copyright (C) 2001-2013 Free Software Foundation, Inc.
608 > # Copyright (C) 2001-2014 Free Software Foundation, Inc.
609   #
610   # This file is free software; the Free Software Foundation
611   # gives unlimited permission to copy and/or distribute it,
# Line 613 | Line 616 | echo "timestamp for $_am_arg" >`AS_DIRNA
616   # Define $install_sh.
617   AC_DEFUN([AM_PROG_INSTALL_SH],
618   [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
619 < if test x"${install_sh}" != xset; then
619 > if test x"${install_sh+set}" != xset; then
620    case $am_aux_dir in
621    *\ * | *\     *)
622      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
# Line 623 | Line 626 | if test x"${install_sh}" != xset; then
626   fi
627   AC_SUBST([install_sh])])
628  
629 < # Copyright (C) 2003-2013 Free Software Foundation, Inc.
629 > # Copyright (C) 2003-2014 Free Software Foundation, Inc.
630   #
631   # This file is free software; the Free Software Foundation
632   # gives unlimited permission to copy and/or distribute it,
# Line 642 | Line 645 | fi
645   rmdir .tst 2>/dev/null
646   AC_SUBST([am__leading_dot])])
647  
648 < # Copyright (C) 1998-2013 Free Software Foundation, Inc.
648 > # Copyright (C) 1998-2014 Free Software Foundation, Inc.
649   #
650   # This file is free software; the Free Software Foundation
651   # gives unlimited permission to copy and/or distribute it,
# Line 663 | Line 666 | fi])
666   # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
667   # From Jim Meyering
668  
669 < # Copyright (C) 1996-2013 Free Software Foundation, Inc.
669 > # Copyright (C) 1996-2014 Free Software Foundation, Inc.
670   #
671   # This file is free software; the Free Software Foundation
672   # gives unlimited permission to copy and/or distribute it,
# Line 698 | Line 701 | AC_MSG_CHECKING([whether to enable maint
701  
702   # Check to see how 'make' treats includes.                  -*- Autoconf -*-
703  
704 < # Copyright (C) 2001-2013 Free Software Foundation, Inc.
704 > # Copyright (C) 2001-2014 Free Software Foundation, Inc.
705   #
706   # This file is free software; the Free Software Foundation
707   # gives unlimited permission to copy and/or distribute it,
# Line 748 | Line 751 | rm -f confinc confmf
751  
752   # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
753  
754 < # Copyright (C) 1997-2013 Free Software Foundation, Inc.
754 > # Copyright (C) 1997-2014 Free Software Foundation, Inc.
755   #
756   # This file is free software; the Free Software Foundation
757   # gives unlimited permission to copy and/or distribute it,
# Line 787 | Line 790 | fi
790  
791   # Helper functions for option handling.                     -*- Autoconf -*-
792  
793 < # Copyright (C) 2001-2013 Free Software Foundation, Inc.
793 > # Copyright (C) 2001-2014 Free Software Foundation, Inc.
794   #
795   # This file is free software; the Free Software Foundation
796   # gives unlimited permission to copy and/or distribute it,
# Line 816 | Line 819 | AC_DEFUN([_AM_SET_OPTIONS],
819   AC_DEFUN([_AM_IF_OPTION],
820   [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
821  
822 < # Copyright (C) 1999-2013 Free Software Foundation, Inc.
822 > # Copyright (C) 1999-2014 Free Software Foundation, Inc.
823   #
824   # This file is free software; the Free Software Foundation
825   # gives unlimited permission to copy and/or distribute it,
# Line 863 | Line 866 | AC_LANG_POP([C])])
866   # For backward compatibility.
867   AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
868  
869 < # Copyright (C) 2001-2013 Free Software Foundation, Inc.
869 > # Copyright (C) 2001-2014 Free Software Foundation, Inc.
870   #
871   # This file is free software; the Free Software Foundation
872   # gives unlimited permission to copy and/or distribute it,
# Line 882 | Line 885 | AC_DEFUN([AM_RUN_LOG],
885  
886   # Check to make sure that the build environment is sane.    -*- Autoconf -*-
887  
888 < # Copyright (C) 1996-2013 Free Software Foundation, Inc.
888 > # Copyright (C) 1996-2014 Free Software Foundation, Inc.
889   #
890   # This file is free software; the Free Software Foundation
891   # gives unlimited permission to copy and/or distribute it,
# Line 963 | Line 966 | AC_CONFIG_COMMANDS_PRE(
966   rm -f conftest.file
967   ])
968  
969 < # Copyright (C) 2009-2013 Free Software Foundation, Inc.
969 > # Copyright (C) 2009-2014 Free Software Foundation, Inc.
970   #
971   # This file is free software; the Free Software Foundation
972   # gives unlimited permission to copy and/or distribute it,
# Line 1023 | Line 1026 | AC_SUBST([AM_BACKSLASH])dnl
1026   _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1027   ])
1028  
1029 < # Copyright (C) 2001-2013 Free Software Foundation, Inc.
1029 > # Copyright (C) 2001-2014 Free Software Foundation, Inc.
1030   #
1031   # This file is free software; the Free Software Foundation
1032   # gives unlimited permission to copy and/or distribute it,
# Line 1051 | Line 1054 | fi
1054   INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1055   AC_SUBST([INSTALL_STRIP_PROGRAM])])
1056  
1057 < # Copyright (C) 2006-2013 Free Software Foundation, Inc.
1057 > # Copyright (C) 2006-2014 Free Software Foundation, Inc.
1058   #
1059   # This file is free software; the Free Software Foundation
1060   # gives unlimited permission to copy and/or distribute it,
# Line 1070 | Line 1073 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_
1073  
1074   # Check how to create a tarball.                            -*- Autoconf -*-
1075  
1076 < # Copyright (C) 2004-2013 Free Software Foundation, Inc.
1076 > # Copyright (C) 2004-2014 Free Software Foundation, Inc.
1077   #
1078   # This file is free software; the Free Software Foundation
1079   # gives unlimited permission to copy and/or distribute it,

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)