|
|
@@ -1,7 +1,7 @@
|
|
|
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
|
|
|
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
|
|
-# Free Software Foundation, Inc.
|
|
|
+# 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.
|
|
|
@@ -11,55 +11,32 @@
|
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
# 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
|
|
|
+# 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)
|
|
|
# ----------------------------
|
|
|
# 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.5])])
|
|
|
-
|
|
|
-# AM_AUX_DIR_EXPAND
|
|
|
-
|
|
|
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
|
|
|
+ [AM_AUTOMAKE_VERSION([1.9.6])])
|
|
|
|
|
|
-# 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.
|
|
|
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
|
|
|
|
-# 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.
|
|
|
+# 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
|
|
|
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
|
|
|
@@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
|
|
|
am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
])
|
|
|
|
|
|
-# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
+# 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.
|
|
|
+# 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 6
|
|
|
+# serial 7
|
|
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
|
# -------------------------------------
|
|
|
@@ -145,30 +112,19 @@ else
|
|
|
fi
|
|
|
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.])
|
|
|
+ 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
|
|
|
+# 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.
|
|
|
|
|
|
-# 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 8
|
|
|
|
|
|
# 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,
|
|
|
@@ -177,7 +133,6 @@ fi])])
|
|
|
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
|
|
|
|
|
|
|
|
|
-
|
|
|
# _AM_DEPENDENCIES(NAME)
|
|
|
# ----------------------
|
|
|
# See how the compiler implements dependency checking.
|
|
|
@@ -317,26 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
|
|
AC_SUBST([AMDEPBACKSLASH])
|
|
|
])
|
|
|
|
|
|
-# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
|
+# 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.
|
|
|
+# 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 2
|
|
|
+#serial 3
|
|
|
|
|
|
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
|
# ------------------------------
|
|
|
@@ -355,27 +300,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
else
|
|
|
continue
|
|
|
fi
|
|
|
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
|
|
|
- # Extract the definition of DEP_FILES from the Makefile without
|
|
|
- # running `make'.
|
|
|
+ # 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"`
|
|
|
- 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" | \
|
|
|
+ # 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.
|
|
|
test -f "$dirpart/$file" && continue
|
|
|
@@ -401,54 +340,31 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
|
|
|
])
|
|
|
|
|
|
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
|
|
|
-
|
|
|
-# 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.
|
|
|
+# 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 7
|
|
|
+# serial 8
|
|
|
|
|
|
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
|
|
|
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
|
|
|
|
-# 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.
|
|
|
+# Do all the work for Automake. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
|
+# 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.
|
|
|
|
|
|
-# 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 12
|
|
|
|
|
|
-# serial 11
|
|
|
+# 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])
|
|
|
# AM_INIT_AUTOMAKE([OPTIONS])
|
|
|
@@ -506,7 +422,6 @@ 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
|
|
|
@@ -515,7 +430,9 @@ 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)],
|
|
|
@@ -549,51 +466,27 @@ for _am_header in $config_headers :; do
|
|
|
done
|
|
|
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.
|
|
|
-
|
|
|
-# 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
|
|
|
install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
|
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.
|
|
|
+# 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 1
|
|
|
+# serial 2
|
|
|
|
|
|
# Check whether the underlying file-system supports filenames
|
|
|
# with a leading dot. For instance MS-DOS doesn't.
|
|
|
@@ -608,26 +501,15 @@ fi
|
|
|
rmdir .tst 2>/dev/null
|
|
|
AC_SUBST([am__leading_dot])])
|
|
|
|
|
|
-# Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
|
+# 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.
|
|
|
+# 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 2
|
|
|
+# serial 3
|
|
|
|
|
|
# AM_MAKE_INCLUDE()
|
|
|
# -----------------
|
|
|
@@ -671,27 +553,16 @@ AC_MSG_RESULT([$_am_result])
|
|
|
rm -f confinc confmf
|
|
|
])
|
|
|
|
|
|
-# -*- Autoconf -*-
|
|
|
-
|
|
|
+# Fake the existence of programs that GNU maintainers use. -*- 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.
|
|
|
+# 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 3
|
|
|
+# serial 4
|
|
|
|
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
|
# ------------------------------
|
|
|
@@ -717,27 +588,16 @@ else
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
+# 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.
|
|
|
-
|
|
|
-# 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
|
|
|
# installer happens to have an overly restrictive umask (e.g. 077).
|
|
|
@@ -758,13 +618,21 @@ 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
|
|
|
- # argument. Indeed, we sometimes output rules like
|
|
|
+ # 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.
|
|
|
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
|
|
|
- # expensive solution, as it forces Make to start a sub-shell.)
|
|
|
- mkdir_p='mkdir -p -- .'
|
|
|
+ # 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
|
|
|
# recognize any option. It will interpret all options as
|
|
|
@@ -783,26 +651,15 @@ else
|
|
|
fi
|
|
|
AC_SUBST([mkdir_p])])
|
|
|
|
|
|
-# Helper functions for option handling. -*- Autoconf -*-
|
|
|
+# 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.
|
|
|
+# 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 2
|
|
|
+# serial 3
|
|
|
|
|
|
# _AM_MANGLE_OPTION(NAME)
|
|
|
# -----------------------
|
|
|
@@ -827,28 +684,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
|
|
|
AC_DEFUN([_AM_IF_OPTION],
|
|
|
[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.
|
|
|
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
|
|
|
|
-# 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.
|
|
|
+# 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 3
|
|
|
+# serial 4
|
|
|
|
|
|
# AM_SANITY_CHECK
|
|
|
# ---------------
|
|
|
@@ -891,25 +736,14 @@ Check your system clock])
|
|
|
fi
|
|
|
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.
|
|
|
+# 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
|
|
|
# annoying in cross-compiling environments, where the build's strip
|
|
|
@@ -930,4 +764,100 @@ fi
|
|
|
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
|
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([acinclude.m4])
|
Nikola Kotur