/[LeafOK_CVS]/lbbs/aclocal.m4

Diff of /lbbs/aclocal.m4

Parent Directory | Revision Log | View Patch Patch

- Revision 1.2 by sysadm,
 Sun Oct 17 06:19:01 2004 UTC
+ Revision 1.3 by sysadm,
 Sun Mar 13 08:21:02 2005 UTC
  Line 1
- # generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+ # generated automatically by aclocal 1.9.2 -*- Autoconf -*-
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
  # Free Software Foundation, Inc.
  Line 33
  # ----------------------------
  # 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.8"])
+ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
  # 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.8.3])])
+          [AM_AUTOMAKE_VERSION([1.9.2])])
  # AM_AUX_DIR_EXPAND
  Line 108 
  am_aux_dir=`cd $ac_aux_dir && pwd`
  # AM_CONDITIONAL                                              -*- Autoconf -*-
- # Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+ # Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
  # 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 145 
  else
  fi
  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.])
+ Usually this means the macro was only invoked conditionally.]])
  fi])])
  # serial 7                                              -*- Autoconf -*-
  Line 266 
  AC_CACHE_CHECK([dependency style of $dep
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
-       # (even with -Werror).  So we grep stderr for any message
+       # or remarks (even with -Werror).  So we grep stderr for any message
-       # that says an option was ignored.
+       # that says an option was ignored or not supported.
-       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+       # When given -MP, icc 7.0 and 7.1 complain thusly:
+       #   icc: Command line warning: ignoring option '-M'; no argument required
+       # The diagnosis changed in icc 8.0:
+       #   icc: Command line remark: option '-MP' not supported
+       if (grep 'ignoring option' conftest.err ||
+           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
          am_cv_$1_dependencies_compiler_type=$depmode
          break
        fi
- Line 314 
  AC_SUBST([AMDEPBACKSLASH])
+ Line 319 
  AC_SUBST([AMDEPBACKSLASH])
  # Generate code to set up dependency tracking.   -*- Autoconf -*-
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+ #   Free Software Foundation, Inc.
  # 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 350 
  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
+ Line 356 
  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
    else
      continue
    fi
-   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+   # Extract the definition of DEPDIR, am__include, and am__quote
-   # Extract the definition of DEP_FILES from the Makefile without
+   # from the Makefile without running `make'.
-   # running `make'.
    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    test -z "$DEPDIR" && continue
+   am__include=`sed -n 's/^am__include = //p' < "$mf"`
+   test -z "am__include" && continue
+   am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
    # When using ansi2knr, U may be empty or an underscore; expand it
    U=`sed -n 's/^U = //p' < "$mf"`
-   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+   # Find all dependency output files, they are included files with
-   # We invoke sed twice because it is the simplest approach to
+   # $(DEPDIR) in their names.  We invoke sed twice because it is the
-   # changing $(DEPDIR) to its actual value in the expansion.
+   # simplest approach to changing $(DEPDIR) to its actual value in the
-   for file in `sed -n '
+   # expansion.
-     /^DEP_FILES = .*\\\\$/ {
+   for file in `sed -n "
-       s/^DEP_FILES = //
+     s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       :loop
-         s/\\\\$//
-         p
-         n
-         /\\\\$/ b loop
-       p
-     }
-     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
  Line 401 
  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
  # 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.
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
  # Free Software Foundation, Inc.
  # This program is free software; you can redistribute it and/or modify
  Line 477 
  AM_MISSING_PROG(AUTOCONF, autoconf)
  AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
  AM_MISSING_PROG(AUTOHEADER, autoheader)
  AM_MISSING_PROG(MAKEINFO, makeinfo)
- AM_MISSING_PROG(AMTAR, tar)
  AM_PROG_INSTALL_SH
  AM_PROG_INSTALL_STRIP
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
- Line 486 
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ Line 485 
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
  AC_REQUIRE([AC_PROG_AWK])dnl
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+               [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+                              [_AM_PROG_TAR([v7])])])
  _AM_IF_OPTION([no-dependencies],,
  [AC_PROVIDE_IFELSE([AC_PROG_CC],
                    [_AM_DEPENDENCIES(CC)],
- Line 729 
  fi
+ Line 730 
  fi
  # this.)
  AC_DEFUN([AM_PROG_MKDIR_P],
  [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-   # Keeping the `.' argument allows $(mkdir_p) to be used without
+   # We used to keeping the `.' as first argument, in order to
-   # argument.  Indeed, we sometimes output rules like
+   # allow $(mkdir_p) to be used without argument.  As in
    #   $(mkdir_p) $(somedir)
-   # where $(somedir) is conditionally defined.
+   # where $(somedir) is conditionally defined.  However this is wrong
-   # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+   # for two reasons:
-   # expensive solution, as it forces Make to start a sub-shell.)
+   #  1. if the package is installed by a user who cannot write `.'
-   mkdir_p='mkdir -p -- .'
+   #     make install will fail,
+   #  2. the above comment should most certainly read
+   #     $(mkdir_p) $(DESTDIR)$(somedir)
+   #     so it does not work when $(somedir) is undefined and
+   #     $(DESTDIR) is not.
+   #  To support the latter case, we have to write
+   #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+   #  so the `.' trick is pointless.
+   mkdir_p='mkdir -p --'
  else
    # On NextStep and OpenStep, the `mkdir' command does not
    # recognize any option.  It will interpret all options as
- Line 901 
  fi
+ Line 910 
  fi
  INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ # Copyright (C) 2004  Free Software Foundation, Inc.
+ # 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, 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.
+ # serial 1
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+ # Check how to create a tarball in format FORMAT.
+ # FORMAT should be one of `v7', `ustar', or `pax'.
+ #
+ # Substitute a variable $(am__tar) that is a command
+ # writing to stdout a FORMAT-tarball containing the directory
+ # $tardir.
+ #     tardir=directory && $(am__tar) > result.tar
+ #
+ # Substitute a variable $(am__untar) that extract such
+ # a tarball read from stdin.
+ #     $(am__untar) < result.tar
+ AC_DEFUN([_AM_PROG_TAR],
+ [# Always define AMTAR for backward compatibility.
+ AM_MISSING_PROG([AMTAR], [tar])
+ m4_if([$1], [v7],
+      [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+      [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=${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__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])
+     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_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_SUBST([am__tar])
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR

  Legend:

 
 
 Removed lines/characters
  
 
 
 Changed lines/characters
 
 
  
 Added lines/characters
 Legend:

 
 
 Removed lines/characters
  
 
 
 Changed lines/characters
 
 
  
 Added lines/characters
-Removed lines/characters
+Added lines/characters

webmaster@leafok.com	ViewVC Help
Powered by ViewVC 1.3.0-beta1