Diff for /embedaddon/ipsec-tools/aclocal.m4 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2014/06/15 16:37:11 version 1.1.1.3, 2016/11/02 10:45:56
Line 1 Line 1
# generated automatically by aclocal 1.13.1 -*- Autoconf -*-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
   
# Copyright (C) 1996-2012 Free Software Foundation, Inc.# Copyright (C) 1996-2013 Free Software Foundation, Inc.
   
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 8619  m4_ifndef([_LT_PROG_CXX],  [AC_DEFUN([_LT_PROG_CXX])]) Line 8619  m4_ifndef([_LT_PROG_CXX],  [AC_DEFUN([_LT_PROG_CXX])])
 # generated from the m4 files accompanying Automake X.Y.  # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)  # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],  AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.13'[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to  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.  dnl require some minimum version.  Point them to the right macro.
m4_if([$1], [1.13.1], [],m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])  ])
   
Line 8638  m4_define([_AM_AUTOCONF_VERSION], []) Line 8638  m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.13.1])dnl[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],  m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Line 8960  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], Line 8960  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue      test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`      am__include=`sed -n 's/^am__include = //p' < "$mf"`
    test -z "am__include" && continue    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with      # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the      # $(DEPDIR) in their names.  We invoke sed twice because it is the
Line 9005  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], Line 9005  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if  # 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.  # your package does certain things.  But this isn't really a big deal.
   
   dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
   m4_define([AC_PROG_CC],
   m4_defn([AC_PROG_CC])
   [_AM_PROG_CC_C_O
   ])
   
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])  # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------  # -----------------------------------------------
Line 9113  dnl macro is hooked onto _AC_COMPILER_EXEEXT early, se Line 9119  dnl macro is hooked onto _AC_COMPILER_EXEEXT early, se
 AC_CONFIG_COMMANDS_PRE(dnl  AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],  [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl    [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])  
   
   # POSIX will say in a future version that running "rm -f" with no argument
   # is OK; and we want to be able to make that assumption in our Makefile
   # recipes.  So use an aggressive probe to check that the usage we want is
   # actually supported "in the wild" to an acceptable degree.
   # See automake bug#10828.
   # To make any issue more visible, cause the running configure to be aborted
   # by default if the 'rm' program in use doesn't match our expectations; the
   # user can still override this though.
   if rm -f && rm -fr && rm -rf; then : OK; else
     cat >&2 <<'END'
   Oops!
   
   Your 'rm' program seems unable to run without file operands specified
   on the command line, even when the '-f' option is present.  This is contrary
   to the behaviour of most rm programs out there, and not conforming with
   the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
   
   Please tell bug-automake@gnu.org about your system, including the value
   of your $PATH and any error possibly output before this message.  This
   can help us improve future automake versions.
   
   END
     if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
       echo 'Configuration will proceed anyway, since you have set the' >&2
       echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
       echo >&2
     else
       cat >&2 <<'END'
   Aborting the configuration process, to ensure you take notice of the issue.
   
   You can download and install GNU coreutils to get an 'rm' implementation
   that behaves properly: <http://www.gnu.org/software/coreutils/>.
   
   If you want to complete the configuration process using your problematic
   'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
   to "yes", and re-run configure.
   
   END
       AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
     fi
   fi])
   
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not  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 add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.  dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],  m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_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.  # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header  # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.  # that is generated.  The stamp files are numbered to have different names.
Line 9321  AC_DEFUN([_AM_SET_OPTIONS], Line 9367  AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],  AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
   
   # Copyright (C) 1999-2013 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.
   
   # _AM_PROG_CC_C_O
   # ---------------
   # Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
   # to automatically call this.
   AC_DEFUN([_AM_PROG_CC_C_O],
   [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   AC_REQUIRE_AUX_FILE([compile])dnl
   AC_LANG_PUSH([C])dnl
   AC_CACHE_CHECK(
     [whether $CC understands -c and -o together],
     [am_cv_prog_cc_c_o],
     [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
     # Make sure it works both with $CC and with simple cc.
     # Following AC_PROG_CC_C_O, we do the test twice because some
     # compilers refuse to overwrite an existing .o file with -o,
     # though they will create one.
     am_cv_prog_cc_c_o=yes
     for am_i in 1 2; do
       if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
            && test -f conftest2.$ac_objext; then
         : OK
       else
         am_cv_prog_cc_c_o=no
         break
       fi
     done
     rm -f core conftest*
     unset am_i])
   if test "$am_cv_prog_cc_c_o" != yes; then
      # Losing compiler, so override with the script.
      # FIXME: It is wrong to rewrite CC.
      # But if we don't then we get into trouble of one sort or another.
      # A longer-term fix would be to have automake use am__CC in this case,
      # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
      CC="$am_aux_dir/compile $CC"
   fi
   AC_LANG_POP([C])])
   
   # For backward compatibility.
   AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
   
   # Copyright (C) 2001-2013 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.
   
   # AM_RUN_LOG(COMMAND)
   # -------------------
   # Run COMMAND, save the exit status in ac_status, and log it.
   # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
   AC_DEFUN([AM_RUN_LOG],
   [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
      ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
      ac_status=$?
      echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
      (exit $ac_status); }])
   
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
   
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.  # Copyright (C) 1996-2013 Free Software Foundation, Inc.
Line 9530  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) Line 9640  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such  # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.  # a tarball read from stdin.
 #     $(am__untar) < result.tar  #     $(am__untar) < result.tar
   #
 AC_DEFUN([_AM_PROG_TAR],  AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used  [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...  # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])  AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],# We'll loop over all known methods to create a tar archive until one works.
     [m4_case([$1], [ustar],, [pax],, 
              [m4_fatal([Unknown tar format])]) 
AC_MSG_CHECKING([how to create a $1 tar archive]) 
# Loop over all known methods to create a tar archive until one works. 
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'  _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
 _am_tools=${am_cv_prog_tar_$1-$_am_tools}  
 # Do not fold the above two line into one, because Tru64 sh and  
 # Solaris sh will not grok spaces in the rhs of '-'.  
 for _am_tool in $_am_tools  
 do  
   case $_am_tool in  
   gnutar)  
     for _am_tar in tar gnutar gtar;  
     do  
       AM_RUN_LOG([$_am_tar --version]) && break  
     done  
     am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'  
     am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'  
     am__untar="$_am_tar -xf -"  
     ;;  
   plaintar)  
     # Must skip GNU tar: if it does not support --format= it doesn't create  
     # ustar tarball either.  
     (tar --version) >/dev/null 2>&1 && continue  
     am__tar='tar chf - "$$tardir"'  
     am__tar_='tar chf - "$tardir"'  
     am__untar='tar xf -'  
     ;;  
   pax)  
     am__tar='pax -L -x $1 -w "$$tardir"'  
     am__tar_='pax -L -x $1 -w "$tardir"'  
     am__untar='pax -r'  
     ;;  
   cpio)  
     am__tar='find "$$tardir" -print | cpio -o -H $1 -L'  
     am__tar_='find "$tardir" -print | cpio -o -H $1 -L'  
     am__untar='cpio -i -H $1 -d'  
     ;;  
   none)  
     am__tar=false  
     am__tar_=false  
     am__untar=false  
     ;;  
   esac  
   
  # If the value was cached, stop now.  We just wanted to have am__tarm4_if([$1], [v7],
  # and am__untar set.  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
  test -n "${am_cv_prog_tar_$1}" && break 
   
  # tar/untar a dummy directory, and stop if the command works  [m4_case([$1],
     [ustar],
      [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
       # There is notably a 21 bits limit for the UID and the GID.  In fact,
       # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
       # and bug#13588).
       am_max_uid=2097151 # 2^21 - 1
       am_max_gid=$am_max_uid
       # The $UID and $GID variables are not portable, so we need to resort
       # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
       # below are definitely unexpected, so allow the users to see them
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
       AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
       if test $am_uid -le $am_max_uid; then
          AC_MSG_RESULT([yes])
       else
          AC_MSG_RESULT([no])
          _am_tools=none
       fi
       AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
       if test $am_gid -le $am_max_gid; then
          AC_MSG_RESULT([yes])
       else
         AC_MSG_RESULT([no])
         _am_tools=none
       fi],
 
   [pax],
     [],
 
   [m4_fatal([Unknown tar format])])
 
   AC_MSG_CHECKING([how to create a $1 tar archive])
 
   # Go ahead even if we have the value already cached.  We do so because we
   # need to set the values for the 'am__tar' and 'am__untar' variables.
   _am_tools=${am_cv_prog_tar_$1-$_am_tools}
 
   for _am_tool in $_am_tools; do
     case $_am_tool in
     gnutar)
       for _am_tar in tar gnutar gtar; do
         AM_RUN_LOG([$_am_tar --version]) && break
       done
       am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
       am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
       am__untar="$_am_tar -xf -"
       ;;
     plaintar)
       # Must skip GNU tar: if it does not support --format= it doesn't create
       # ustar tarball either.
       (tar --version) >/dev/null 2>&1 && continue
       am__tar='tar chf - "$$tardir"'
       am__tar_='tar chf - "$tardir"'
       am__untar='tar xf -'
       ;;
     pax)
       am__tar='pax -L -x $1 -w "$$tardir"'
       am__tar_='pax -L -x $1 -w "$tardir"'
       am__untar='pax -r'
       ;;
     cpio)
       am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
       am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
       am__untar='cpio -i -H $1 -d'
       ;;
     none)
       am__tar=false
       am__tar_=false
       am__untar=false
       ;;
     esac
 
     # If the value was cached, stop now.  We just wanted to have am__tar
     # and am__untar set.
     test -n "${am_cv_prog_tar_$1}" && break
 
     # tar/untar a dummy directory, and stop if the command works.
     rm -rf conftest.dir
     mkdir conftest.dir
     echo GrepMe > conftest.dir/file
     AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
     rm -rf conftest.dir
     if test -s conftest.tar; then
       AM_RUN_LOG([$am__untar <conftest.tar])
       AM_RUN_LOG([cat conftest.dir/file])
       grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
     fi
   done
   rm -rf conftest.dir    rm -rf conftest.dir
   mkdir conftest.dir  
   echo GrepMe > conftest.dir/file  
   AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])  
   rm -rf conftest.dir  
   if test -s conftest.tar; then  
     AM_RUN_LOG([$am__untar <conftest.tar])  
     grep GrepMe conftest.dir/file >/dev/null 2>&1 && break  
   fi  
 done  
 rm -rf conftest.dir  
   
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
AC_MSG_RESULT([$am_cv_prog_tar_$1])])  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 
 AC_SUBST([am__tar])  AC_SUBST([am__tar])
 AC_SUBST([am__untar])  AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR  ]) # _AM_PROG_TAR

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>