[BACK]Return to aclocal.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / smartmontools

Diff for /embedaddon/smartmontools/aclocal.m4 between versions 1.1 and 1.1.1.2

version 1.1, 2012/02/21 16:32:16 version 1.1.1.2, 2012/10/09 09:36:45
Line 1 Line 1
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
   
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
Line 19  You have another version of autoconf.  It may work, bu Line 20  You have another version of autoconf.  It may work, bu
 If you have problems, you may need to regenerate the build system entirely.  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'.])])  To do so, use the procedure documented by the package, typically `autoreconf'.])])
   
# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# # Foundation, Inc.
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 
 #  #
 # 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  
 # the Free Software Foundation; either version 2 of the License, or  
 # (at your option) any later version.  
 #  
 # This program is distributed in the hope that it will be useful, but  
 # WITHOUT ANY WARRANTY; without even the implied warranty of  
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
 # General Public License for more details.  
 #  
 # You should have received a copy of the GNU General Public License  
 # along with this program; if not, write to the Free Software  
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 #  
 # As a special exception to the GNU General Public License, if you  
 # distribute this file as part of a program that contains a  
 # configuration script generated by Autoconf, you may include it under  
 # the same distribution terms that you use for the rest of that program.  
   
 # PKG_PROG_PKG_CONFIG([MIN-VERSION])  
 # ----------------------------------  
 AC_DEFUN([PKG_PROG_PKG_CONFIG],  
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])  
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])  
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])  
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])  
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])  
   
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then  
         AC_PATH_TOOL([PKG_CONFIG], [pkg-config])  
 fi  
 if test -n "$PKG_CONFIG"; then  
         _pkg_min_version=m4_default([$1], [0.9.0])  
         AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])  
         if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then  
                 AC_MSG_RESULT([yes])  
         else  
                 AC_MSG_RESULT([no])  
                 PKG_CONFIG=""  
         fi  
                   
 fi[]dnl  
 ])# PKG_PROG_PKG_CONFIG  
   
 # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])  
 #  
 # Check to see whether a particular set of modules exists.  Similar  
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.  
 #  
 #  
 # Similar to PKG_CHECK_MODULES, make sure that the first instance of  
 # this or PKG_CHECK_MODULES is called, or make sure to call  
 # PKG_CHECK_EXISTS manually  
 # --------------------------------------------------------------  
 AC_DEFUN([PKG_CHECK_EXISTS],  
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl  
 if test -n "$PKG_CONFIG" && \  
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then  
   m4_ifval([$2], [$2], [:])  
 m4_ifvaln([$3], [else  
   $3])dnl  
 fi])  
   
   
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])  
 # ---------------------------------------------  
 m4_define([_PKG_CONFIG],  
 [if test -n "$$1"; then  
     pkg_cv_[]$1="$$1"  
  elif test -n "$PKG_CONFIG"; then  
     PKG_CHECK_EXISTS([$3],  
                      [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],  
                      [pkg_failed=yes])  
  else  
     pkg_failed=untried  
 fi[]dnl  
 ])# _PKG_CONFIG  
   
 # _PKG_SHORT_ERRORS_SUPPORTED  
 # -----------------------------  
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],  
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])  
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then  
         _pkg_short_errors_supported=yes  
 else  
         _pkg_short_errors_supported=no  
 fi[]dnl  
 ])# _PKG_SHORT_ERRORS_SUPPORTED  
   
   
 # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],  
 # [ACTION-IF-NOT-FOUND])  
 #  
 #  
 # Note that if there is a possibility the first call to  
 # PKG_CHECK_MODULES might not happen, you should be sure to include an  
 # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac  
 #  
 #  
 # --------------------------------------------------------------  
 AC_DEFUN([PKG_CHECK_MODULES],  
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl  
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl  
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl  
   
 pkg_failed=no  
 AC_MSG_CHECKING([for $1])  
   
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])  
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])  
   
 m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS  
 and $1[]_LIBS to avoid the need to call pkg-config.  
 See the pkg-config man page for more details.])  
   
 if test $pkg_failed = yes; then  
         _PKG_SHORT_ERRORS_SUPPORTED  
         if test $_pkg_short_errors_supported = yes; then  
                 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`  
         else   
                 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`  
         fi  
         # Put the nasty error message in config.log where it belongs  
         echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD  
   
         ifelse([$4], , [AC_MSG_ERROR(dnl  
 [Package requirements ($2) were not met:  
   
 $$1_PKG_ERRORS  
   
 Consider adjusting the PKG_CONFIG_PATH environment variable if you  
 installed software in a non-standard prefix.  
   
 _PKG_TEXT  
 ])],  
                 [AC_MSG_RESULT([no])  
                 $4])  
 elif test $pkg_failed = untried; then  
         ifelse([$4], , [AC_MSG_FAILURE(dnl  
 [The pkg-config script could not be found or is too old.  Make sure it  
 is in your PATH or set the PKG_CONFIG environment variable to the full  
 path to pkg-config.  
   
 _PKG_TEXT  
   
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],  
                 [$4])  
 else  
         $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS  
         $1[]_LIBS=$pkg_cv_[]$1[]_LIBS  
         AC_MSG_RESULT([yes])  
         ifelse([$3], , :, [$3])  
 fi[]dnl  
 ])# PKG_CHECK_MODULES  
   
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
   # serial 1
   
 # AM_AUTOMAKE_VERSION(VERSION)  # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------  # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been  # Automake X.Y traces this macro to ensure aclocal.m4 has been
Line 193  AC_DEFUN([AM_AUTOMAKE_VERSION], Line 38  AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'  [am__api_version='1.11'
 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.11.1], [],m4_if([$1], [1.11.3], [],
       [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 209  m4_define([_AM_AUTOCONF_VERSION], []) Line 54  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.11.1])dnl[AM_AUTOMAKE_VERSION([1.11.3])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 238  _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([C Line 83  _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([C
   
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   
# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.# Copyright (C) 2001, 2003, 2005, 2011 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
   # serial 1
   
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to  # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.  # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
Line 325  AC_CONFIG_COMMANDS_PRE( Line 172  AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])  Usually this means the macro was only invoked conditionally.]])
 fi])])  fi])])
   
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
# Free Software Foundation, Inc.# 2010, 2011 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
# serial 10# serial 12
   
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be  # 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,  # written in clear, in which case automake, when reading aclocal.m4,
Line 372  AC_CACHE_CHECK([dependency style of $depcc], Line 219  AC_CACHE_CHECK([dependency style of $depcc],
   # instance it was reported that on HP-UX the gcc test will end up    # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output    # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.    # in D'.
     rm -rf conftest.dir
   mkdir conftest.dir    mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're    # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.    # using a relative directory.
Line 436  AC_CACHE_CHECK([dependency style of $depcc], Line 284  AC_CACHE_CHECK([dependency style of $depcc],
         break          break
       fi        fi
       ;;        ;;
    msvisualcpp | msvcmsys)    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has        # 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        # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.        # so weak that their functioning should not be impacted.
Line 501  AC_DEFUN([AM_DEP_TRACK], Line 349  AC_DEFUN([AM_DEP_TRACK],
 if test "x$enable_dependency_tracking" != xno; then  if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"    am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'    AMDEPBACKSLASH='\'
     am__nodep='_no'
 fi  fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])  AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl  AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl  _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
   AC_SUBST([am__nodep])dnl
   _AM_SUBST_NOTMAKE([am__nodep])dnl
 ])  ])
   
 # Generate code to set up dependency tracking.              -*- Autoconf -*-  # Generate code to set up dependency tracking.              -*- Autoconf -*-
Line 738  for _am_header in $config_headers :; do Line 589  for _am_header in $config_headers :; do
 done  done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
   
# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.# Copyright (C) 2001, 2003, 2005, 2008, 2011 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
   # serial 1
   
 # AM_PROG_INSTALL_SH  # AM_PROG_INSTALL_SH
 # ------------------  # ------------------
 # Define $install_sh.  # Define $install_sh.
Line 783  AC_SUBST([am__leading_dot])]) Line 637  AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-  # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering  # From Jim Meyering
   
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
# Free Software Foundation, Inc.# 2011 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 804  AC_DEFUN([AM_MAINTAINER_MODE], Line 658  AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],         [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])         [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])          m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed    dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],    AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful  [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
Line 915  else Line 769  else
 fi  fi
 ])  ])
   
# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.# Copyright (C) 2003, 2004, 2005, 2006, 2011 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
   # serial 1
   
 # AM_PROG_MKDIR_P  # AM_PROG_MKDIR_P
 # ---------------  # ---------------
 # Check for `mkdir -p'.  # Check for `mkdir -p'.
Line 943  esac Line 800  esac
   
 # Helper functions for option handling.                     -*- Autoconf -*-  # Helper functions for option handling.                     -*- Autoconf -*-
   
# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
# serial 4# serial 5
   
 # _AM_MANGLE_OPTION(NAME)  # _AM_MANGLE_OPTION(NAME)
 # -----------------------  # -----------------------
Line 957  AC_DEFUN([_AM_MANGLE_OPTION], Line 815  AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])  [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
   
 # _AM_SET_OPTION(NAME)  # _AM_SET_OPTION(NAME)
# ------------------------------# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.  # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],  AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])  [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
   
 # _AM_SET_OPTIONS(OPTIONS)  # _AM_SET_OPTIONS(OPTIONS)
# ----------------------------------# ------------------------
 # OPTIONS is a space-separated list of Automake options.  # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],  AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])  [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
Line 1039  Check your system clock]) Line 897  Check your system clock])
 fi  fi
 AC_MSG_RESULT(yes)])  AC_MSG_RESULT(yes)])
   
# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.# Copyright (C) 2001, 2003, 2005, 2011 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
   # serial 1
   
 # AM_PROG_INSTALL_STRIP  # AM_PROG_INSTALL_STRIP
 # ---------------------  # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't  # One issue with vendor `install' (even GNU) is that you can't
Line 1067  fi Line 927  fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])  AC_SUBST([INSTALL_STRIP_PROGRAM])])
   
# Copyright (C) 2006, 2008  Free Software Foundation, Inc.# Copyright (C) 2006, 2008, 2010 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,
 # with or without modifications, as long as this notice is preserved.  # with or without modifications, as long as this notice is preserved.
   
# serial 2# serial 3
   
 # _AM_SUBST_NOTMAKE(VARIABLE)  # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------  # ---------------------------
Line 1082  AC_SUBST([INSTALL_STRIP_PROGRAM])]) Line 942  AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])  AC_DEFUN([_AM_SUBST_NOTMAKE])
   
 # AM_SUBST_NOTMAKE(VARIABLE)  # AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.  # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
   
 # Check how to create a tarball.                            -*- Autoconf -*-  # Check how to create a tarball.                            -*- Autoconf -*-
   
# Copyright (C) 2004, 2005  Free Software Foundation, Inc.# Copyright (C) 2004, 2005, 2012 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 1110  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) Line 970  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # 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.[# Always define AMTAR for backward compatibility.  Yes, it's still used
AM_MISSING_PROG([AMTAR], [tar])# in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],  m4_if([$1], [v7],
     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,       [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])                [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])  AC_MSG_CHECKING([how to create a $1 tar archive])
Line 1182  AC_SUBST([am__tar]) Line 1043  AC_SUBST([am__tar])
 AC_SUBST([am__untar])  AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR  ]) # _AM_PROG_TAR
   
   m4_include([m4/pkg.m4])
Removed from v.1.1  
changed lines
  Added in v.1.1.1.2

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