[beepmp-cvs] bmpx aclocal.m4,1.1.1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/beepmp/bmpx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13164

Modified Files:
	aclocal.m4 
Log Message:
Added WM icons as SVG source

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/beepmp/bmpx/aclocal.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aclocal.m4	3 Aug 2005 13:06:37 -0000	1.1.1.1
--- aclocal.m4	10 Sep 2005 14:07:52 -0000	1.2
***************
*** 1,6 ****
! # generated automatically by aclocal 1.8.3 -*- Autoconf -*-

! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
! # Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # generated automatically by aclocal 1.9.5 -*- Autoconf -*-

! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
! # 2005  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 12,32 ****
  # PARTICULAR PURPOSE.

! #                                                        -*- Autoconf -*-
! # Copyright (C) 2002, 2003  Free Software Foundation, Inc.
! # Generated from amversion.in; do not edit by hand.
! 
! # 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

  # AM_AUTOMAKE_VERSION(VERSION)
--- 12,20 ----
  # PARTICULAR PURPOSE.

! # Copyright (C) 2002, 2003, 2005  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_AUTOMAKE_VERSION(VERSION)
***************
*** 34,38 ****
  # 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"])

  # AM_SET_CURRENT_AUTOMAKE_VERSION
--- 22,26 ----
  # 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.9"])

  # AM_SET_CURRENT_AUTOMAKE_VERSION
***************
*** 41,66 ****
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! 	 [AM_AUTOMAKE_VERSION([1.8.3])])
! 
! # Figure out how to run the assembler.             -*- Autoconf -*-
! 
! # serial 3
! 
! # Copyright (C) 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
! # 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.

  # AM_PROG_AS
--- 29,43 ----
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! 	 [AM_AUTOMAKE_VERSION([1.9.5])])

! # Figure out how to run the assembler.                      -*- Autoconf -*-

! # Copyright (C) 2001, 2003, 2004, 2005  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.

! # serial 4

  # AM_PROG_AS
***************
*** 75,96 ****
  ])

! # AM_AUX_DIR_EXPAND
! 
! # Copyright (C) 2001, 2003 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.

  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--- 52,62 ----
  ])

! # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

! # Copyright (C) 2001, 2003, 2005  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.

  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
***************
*** 139,162 ****
  ])

! # AM_CONDITIONAL                                              -*- Autoconf -*-
! 
! # Copyright (C) 1997, 2000, 2001, 2003 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 6

  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
--- 105,118 ----
  ])

! # AM_CONDITIONAL                                            -*- Autoconf -*-

! # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
! # 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.

! # serial 7

  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
***************
*** 178,205 ****
  AC_CONFIG_COMMANDS_PRE(
  [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
!   AC_MSG_ERROR([conditional "$1" was never defined.
! Usually this means the macro was only invoked conditionally.])
  fi])])

- # serial 7						-*- Autoconf -*-

! # 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
! # 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.
! 

  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--- 134,150 ----
  AC_CONFIG_COMMANDS_PRE(
  [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
!   AC_MSG_ERROR([[conditional "$1" was never defined.
! Usually this means the macro was only invoked conditionally.]])
  fi])])

! # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
  # 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.

! # serial 8

  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
***************
*** 210,214 ****

- 
  # _AM_DEPENDENCIES(NAME)
  # ----------------------
--- 155,158 ----
***************
*** 299,305 ****
         ${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
!       # that says an option was ignored.
!       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
          am_cv_$1_dependencies_compiler_type=$depmode
          break
--- 243,254 ----
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
!       # or remarks (even with -Werror).  So we grep stderr for any message
!       # that says an option was ignored or not supported.
!       # 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
***************
*** 345,368 ****
  ])

! # Generate code to set up dependency tracking.   -*- Autoconf -*-
! 
! # 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
! # 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 2

  # _AM_OUTPUT_DEPENDENCY_COMMANDS
--- 294,307 ----
  ])

! # Generate code to set up dependency tracking.              -*- Autoconf -*-

! # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
! # 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.

! #serial 3

  # _AM_OUTPUT_DEPENDENCY_COMMANDS
***************
*** 383,407 ****
      continue
    fi
!   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
!   # Extract the definition of DEP_FILES from the Makefile without
!   # running `make'.
    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    test -z "$DEPDIR" && continue
    # 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"
!   # We invoke sed twice because it is the simplest approach to
!   # changing $(DEPDIR) to its actual value in the expansion.
!   for file in `sed -n '
!     /^DEP_FILES = .*\\\\$/ {
!       s/^DEP_FILES = //
!       :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.
--- 322,340 ----
      continue
    fi
!   # Extract the definition of DEPDIR, am__include, and am__quote
!   # from the Makefile without 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"`
!   # Find all dependency output files, they are included files with
!   # $(DEPDIR) in their names.  We invoke sed twice because it is the
!   # simplest approach to changing $(DEPDIR) to its actual value in the
!   # expansion.
!   for file in `sed -n "
!     s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
***************
*** 429,456 ****
  ])

! # Do all the work for Automake.                            -*- Autoconf -*-
! 
! # 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
  # 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 11

  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--- 362,378 ----
  ])

! # Do all the work for Automake.                             -*- Autoconf -*-

! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  # 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.

! # serial 12

! # 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.

  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
***************
*** 510,514 ****
  AM_MISSING_PROG(AUTOHEADER, autoheader)
  AM_MISSING_PROG(MAKEINFO, makeinfo)
- AM_MISSING_PROG(AMTAR, tar)
  AM_PROG_INSTALL_SH
  AM_PROG_INSTALL_STRIP
--- 432,435 ----
***************
*** 519,523 ****
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
! 
  _AM_IF_OPTION([no-dependencies],,
  [AC_PROVIDE_IFELSE([AC_PROG_CC],
--- 440,446 ----
  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],
***************
*** 553,577 ****
  echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

  # AM_PROG_INSTALL_SH
  # ------------------
  # Define $install_sh.
- 
- # Copyright (C) 2001, 2003 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.
- 
  AC_DEFUN([AM_PROG_INSTALL_SH],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--- 476,488 ----
  echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

+ # Copyright (C) 2001, 2003, 2005  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_INSTALL_SH
  # ------------------
  # Define $install_sh.
  AC_DEFUN([AM_PROG_INSTALL_SH],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
***************
*** 579,601 ****
  AC_SUBST(install_sh)])

! #                                                          -*- Autoconf -*-
! # Copyright (C) 2003  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

  # Check whether the underlying file-system supports filenames
--- 490,500 ----
  AC_SUBST(install_sh)])

! # Copyright (C) 2003, 2005  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.

! # serial 2

  # Check whether the underlying file-system supports filenames
***************
*** 612,635 ****
  AC_SUBST([am__leading_dot])])

! # Check to see how 'make' treats includes.	-*- Autoconf -*-
! 
! # Copyright (C) 2001, 2002, 2003 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 2

  # AM_MAKE_INCLUDE()
--- 511,523 ----
  AC_SUBST([am__leading_dot])])

! # Check to see how 'make' treats includes.	            -*- Autoconf -*-

! # Copyright (C) 2001, 2002, 2003, 2005  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.

! # serial 3

  # AM_MAKE_INCLUDE()
***************
*** 675,699 ****
  ])

! #  -*- Autoconf -*-
! 
! 
! # Copyright (C) 1997, 1999, 2000, 2001, 2003 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 3

  # AM_MISSING_PROG(NAME, PROGRAM)
--- 563,576 ----
  ])

! # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

! # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
! # 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.

! # serial 4

  # AM_MISSING_PROG(NAME, PROGRAM)
***************
*** 721,745 ****
  ])

  # AM_PROG_MKDIR_P
  # ---------------
  # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
! 
! # Copyright (C) 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
! # 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.
! 
  # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
  # created by `make install' are always world readable, even if the
--- 598,611 ----
  ])

+ # Copyright (C) 2003, 2004, 2005  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_MKDIR_P
  # ---------------
  # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
! #
  # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
  # created by `make install' are always world readable, even if the
***************
*** 762,772 ****
  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
!   # argument.  Indeed, we sometimes output rules like
    #   $(mkdir_p) $(somedir)
!   # where $(somedir) is conditionally defined.
!   # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
!   # expensive solution, as it forces Make to start a sub-shell.)
!   mkdir_p='mkdir -p -- .'
  else
    # On NextStep and OpenStep, the `mkdir' command does not
--- 628,646 ----
  AC_DEFUN([AM_PROG_MKDIR_P],
  [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
!   # We used to keeping the `.' as first argument, in order to
!   # allow $(mkdir_p) to be used without argument.  As in
    #   $(mkdir_p) $(somedir)
!   # where $(somedir) is conditionally defined.  However this is wrong
!   # for two reasons:
!   #  1. if the package is installed by a user who cannot write `.'
!   #     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
***************
*** 787,810 ****
  AC_SUBST([mkdir_p])])

! # Helper functions for option handling.                    -*- Autoconf -*-
! 
! # Copyright (C) 2001, 2002, 2003  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 2

  # _AM_MANGLE_OPTION(NAME)
--- 661,673 ----
  AC_SUBST([mkdir_p])])

! # Helper functions for option handling.                     -*- Autoconf -*-

! # Copyright (C) 2001, 2002, 2003, 2005  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.

! # serial 3

  # _AM_MANGLE_OPTION(NAME)
***************
*** 831,856 ****
  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

! #
! # Check to make sure that the build environment is sane.
! #
! 
! # Copyright (C) 1996, 1997, 2000, 2001, 2003 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 3

  # AM_SANITY_CHECK
--- 694,707 ----
  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

! # Check to make sure that the build environment is sane.    -*- Autoconf -*-

! # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
! # 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.

! # serial 4

  # AM_SANITY_CHECK
***************
*** 895,917 ****
  AC_MSG_RESULT(yes)])

! # AM_PROG_INSTALL_STRIP
! 
! # Copyright (C) 2001, 2003 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.

  # One issue with vendor `install' (even GNU) is that you can't
  # specify the program used to strip binaries.  This is especially
--- 746,757 ----
  AC_MSG_RESULT(yes)])

! # Copyright (C) 2001, 2003, 2005  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_INSTALL_STRIP
+ # ---------------------
  # One issue with vendor `install' (even GNU) is that you can't
  # specify the program used to strip binaries.  This is especially
***************
*** 934,937 ****
--- 774,900 ----
  AC_SUBST([INSTALL_STRIP_PROGRAM])])

+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+ # Copyright (C) 2004, 2005  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.
+ 
+ # serial 2
+ 
+ # _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
+ 
+ m4_include([m4/codeset.m4])
+ m4_include([m4/gettext.m4])
+ m4_include([m4/glibc21.m4])
+ m4_include([m4/iconv.m4])
+ m4_include([m4/intdiv0.m4])
+ m4_include([m4/intmax.m4])
+ m4_include([m4/inttypes-pri.m4])
+ m4_include([m4/inttypes.m4])
+ m4_include([m4/inttypes_h.m4])
+ m4_include([m4/lcmessage.m4])
+ m4_include([m4/lib-ld.m4])
+ m4_include([m4/lib-link.m4])
+ m4_include([m4/lib-prefix.m4])
  m4_include([m4/libtool.m4])
+ m4_include([m4/longdouble.m4])
+ m4_include([m4/longlong.m4])
+ m4_include([m4/nls.m4])
  m4_include([m4/pkg.m4])
+ m4_include([m4/po.m4])
+ m4_include([m4/printf-posix.m4])
+ m4_include([m4/progtest.m4])
+ m4_include([m4/signed.m4])
+ m4_include([m4/size_max.m4])
+ m4_include([m4/stdint_h.m4])
+ m4_include([m4/uintmax_t.m4])
+ m4_include([m4/ulonglong.m4])
+ m4_include([m4/wchar_t.m4])
+ m4_include([m4/wint_t.m4])
+ m4_include([m4/xsize.m4])