|
|
@@ -1,7 +1,7 @@
|
|
|
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
|
|
|
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
-# 2005, 2006 Free Software Foundation, Inc.
|
|
|
+# 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,11 +11,6 @@
|
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
# PARTICULAR PURPOSE.
|
|
|
|
|
|
-m4_if(m4_PACKAGE_VERSION, [2.61],,
|
|
|
-[m4_fatal([this file was generated for autoconf 2.61.
|
|
|
-You have another version of autoconf. If you want to use that,
|
|
|
-you should regenerate the build system entirely.], [63])])
|
|
|
-
|
|
|
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
|
|
|
|
|
# serial 48 AC_PROG_LIBTOOL
|
|
|
@@ -1602,7 +1597,7 @@ linux*)
|
|
|
|
|
|
# Append ld.so.conf contents to the search path
|
|
|
if test -f /etc/ld.so.conf; then
|
|
|
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
|
|
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
|
|
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
fi
|
|
|
|
|
|
@@ -4310,6 +4305,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
|
|
|
# Is the compiler the GNU C compiler?
|
|
|
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
|
|
|
|
|
|
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
|
|
|
+gcc_ver=\`gcc -dumpversion\`
|
|
|
+
|
|
|
# An ERE matcher.
|
|
|
EGREP=$lt_EGREP
|
|
|
|
|
|
@@ -4443,11 +4441,11 @@ striplib=$lt_striplib
|
|
|
|
|
|
# Dependencies to place before the objects being linked to create a
|
|
|
# shared library.
|
|
|
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
|
|
|
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
|
|
|
|
|
# Dependencies to place after the objects being linked to create a
|
|
|
# shared library.
|
|
|
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
|
|
|
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
|
|
|
|
|
# Dependencies to place before the objects being linked to create a
|
|
|
# shared library.
|
|
|
@@ -4459,7 +4457,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
|
|
|
|
|
|
# The library search path used internally by the compiler when linking
|
|
|
# a shared library.
|
|
|
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
|
|
|
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
|
|
|
|
|
# Method to check whether dependent libraries are shared objects.
|
|
|
deplibs_check_method=$lt_deplibs_check_method
|
|
|
@@ -4539,7 +4537,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
|
|
|
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
|
|
|
|
|
|
# Compile-time system search path for libraries
|
|
|
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
|
|
|
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
|
|
|
|
|
# Run-time system search path for libraries
|
|
|
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
|
|
|
@@ -6412,7 +6410,7 @@ AC_SUBST([SED])
|
|
|
AC_MSG_RESULT([$SED])
|
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
|
|
|
+# 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,
|
|
|
@@ -6422,29 +6420,14 @@ AC_MSG_RESULT([$SED])
|
|
|
# ----------------------------
|
|
|
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
|
-# (This private macro should not be called outside this file.)
|
|
|
-AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
|
-[am__api_version='1.10'
|
|
|
-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.
|
|
|
-m4_if([$1], [1.10], [],
|
|
|
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
|
-])
|
|
|
-
|
|
|
-# _AM_AUTOCONF_VERSION(VERSION)
|
|
|
-# -----------------------------
|
|
|
-# aclocal traces this macro to find the Autoconf version.
|
|
|
-# This is a private macro too. Using m4_define simplifies
|
|
|
-# the logic in aclocal, which can simply ignore this definition.
|
|
|
-m4_define([_AM_AUTOCONF_VERSION], [])
|
|
|
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
|
|
|
|
|
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
|
|
# -------------------------------
|
|
|
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
|
+# 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.10])dnl
|
|
|
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
|
|
|
+ [AM_AUTOMAKE_VERSION([1.9.6])])
|
|
|
|
|
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
|
|
|
|
@@ -6501,14 +6484,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
|
|
|
+# 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 8
|
|
|
+# serial 7
|
|
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
|
# -------------------------------------
|
|
|
@@ -6517,10 +6500,8 @@ AC_DEFUN([AM_CONDITIONAL],
|
|
|
[AC_PREREQ(2.52)dnl
|
|
|
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
|
-AC_SUBST([$1_TRUE])dnl
|
|
|
-AC_SUBST([$1_FALSE])dnl
|
|
|
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
|
|
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
|
|
+AC_SUBST([$1_TRUE])
|
|
|
+AC_SUBST([$1_FALSE])
|
|
|
if $2; then
|
|
|
$1_TRUE=
|
|
|
$1_FALSE='#'
|
|
|
@@ -6534,14 +6515,15 @@ AC_CONFIG_COMMANDS_PRE(
|
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
|
fi])])
|
|
|
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
|
|
+
|
|
|
+# 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 9
|
|
|
+# 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,
|
|
|
@@ -6569,7 +6551,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
|
|
|
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
|
|
|
[$1], CXX, [depcc="$CXX" am_compiler_list=],
|
|
|
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
|
|
|
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
|
|
|
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
|
|
|
[depcc="$$1" am_compiler_list=])
|
|
|
|
|
|
@@ -6635,7 +6616,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
|
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
|
>/dev/null 2>conftest.err &&
|
|
|
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
|
@@ -6688,8 +6668,7 @@ if test "x$enable_dependency_tracking" != xno; then
|
|
|
AMDEPBACKSLASH='\'
|
|
|
fi
|
|
|
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
|
|
-AC_SUBST([AMDEPBACKSLASH])dnl
|
|
|
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
|
|
+AC_SUBST([AMDEPBACKSLASH])
|
|
|
])
|
|
|
|
|
|
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
|
@@ -6714,9 +6693,8 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
# some people rename them; so instead we look at the file content.
|
|
|
# Grep'ing the first line is not enough: some people post-process
|
|
|
# each Makefile.in and add a new line on top of each file to say so.
|
|
|
- # Grep'ing the whole file is not good either: AIX grep has a line
|
|
|
- # limit of 2048, but all sed's we know have understand at least 4000.
|
|
|
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
|
|
|
+ # So let's grep whole file.
|
|
|
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
|
|
dirpart=`AS_DIRNAME("$mf")`
|
|
|
else
|
|
|
continue
|
|
|
@@ -6763,8 +6741,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
|
|
|
# Do all the work for Automake. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
-# 2005, 2006 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,
|
|
|
@@ -6787,20 +6765,16 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
# arguments mandatory, and then we can depend on a new Autoconf
|
|
|
# release and drop the old call support.
|
|
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
|
-[AC_PREREQ([2.60])dnl
|
|
|
+[AC_PREREQ([2.58])dnl
|
|
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
|
|
dnl the ones we care about.
|
|
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
|
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
|
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
|
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
|
|
|
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
|
|
|
- # is not polluted with repeated "-I."
|
|
|
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
|
|
|
- # test to see if srcdir already configured
|
|
|
- if test -f $srcdir/config.status; then
|
|
|
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
|
- fi
|
|
|
+# test to see if srcdir already configured
|
|
|
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
|
|
+ test -f $srcdir/config.status; then
|
|
|
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
|
fi
|
|
|
|
|
|
# test whether we have cygpath
|
|
|
@@ -6820,9 +6794,6 @@ m4_ifval([$2],
|
|
|
AC_SUBST([PACKAGE], [$1])dnl
|
|
|
AC_SUBST([VERSION], [$2])],
|
|
|
[_AM_SET_OPTIONS([$1])dnl
|
|
|
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
|
|
|
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
|
|
|
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
|
|
|
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
|
|
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
|
|
|
|
|
@@ -6858,10 +6829,6 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
|
[_AM_DEPENDENCIES(CXX)],
|
|
|
[define([AC_PROG_CXX],
|
|
|
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
|
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
|
|
- [_AM_DEPENDENCIES(OBJC)],
|
|
|
- [define([AC_PROG_OBJC],
|
|
|
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
|
|
])
|
|
|
])
|
|
|
|
|
|
@@ -6897,7 +6864,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
|
|
# Define $install_sh.
|
|
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
|
|
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
|
AC_SUBST(install_sh)])
|
|
|
|
|
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
|
@@ -7002,14 +6969,13 @@ AC_MSG_RESULT([$_am_result])
|
|
|
rm -f confinc confmf
|
|
|
])
|
|
|
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
|
|
|
-# Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 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 5
|
|
|
+# serial 3
|
|
|
|
|
|
# AM_PROG_CC_C_O
|
|
|
# --------------
|
|
|
@@ -7017,7 +6983,6 @@ rm -f confinc confmf
|
|
|
AC_DEFUN([AM_PROG_CC_C_O],
|
|
|
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
|
|
|
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
-AC_REQUIRE_AUX_FILE([compile])dnl
|
|
|
# FIXME: we rely on the cache variable name because
|
|
|
# there is no other way.
|
|
|
set dummy $CC
|
|
|
@@ -7030,22 +6995,18 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
|
|
|
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
|
|
|
CC="$am_aux_dir/compile $CC"
|
|
|
fi
|
|
|
-dnl Make sure AC_PROG_CC is never called again, or it will override our
|
|
|
-dnl setting of CC.
|
|
|
-m4_define([AC_PROG_CC],
|
|
|
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
|
|
|
])
|
|
|
|
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
|
|
|
+# 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 5
|
|
|
+# serial 4
|
|
|
|
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
|
# ------------------------------
|
|
|
@@ -7061,7 +7022,6 @@ AC_SUBST($1)])
|
|
|
# If it does, set am_missing_run to use it, otherwise, to nothing.
|
|
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
-AC_REQUIRE_AUX_FILE([missing])dnl
|
|
|
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
|
# Use eval to expand $SHELL
|
|
|
if eval "$MISSING --run true"; then
|
|
|
@@ -7072,7 +7032,7 @@ else
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
+# 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,
|
|
|
@@ -7080,23 +7040,60 @@ fi
|
|
|
|
|
|
# AM_PROG_MKDIR_P
|
|
|
# ---------------
|
|
|
-# Check for `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
|
|
|
+# installer happens to have an overly restrictive umask (e.g. 077).
|
|
|
+# This was a mistake. There are at least two reasons why we must not
|
|
|
+# use `-m 0755':
|
|
|
+# - it causes special bits like SGID to be ignored,
|
|
|
+# - it may be too restrictive (some setups expect 775 directories).
|
|
|
+#
|
|
|
+# Do not use -m 0755 and let people choose whatever they expect by
|
|
|
+# setting umask.
|
|
|
+#
|
|
|
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
|
|
|
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
|
|
|
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
|
|
|
+# concurrently, both version can detect that a/ is missing, but only
|
|
|
+# one can create it and the other will error out. Consequently we
|
|
|
+# restrict ourselves to GNU make (using the --version option ensures
|
|
|
+# this.)
|
|
|
AC_DEFUN([AM_PROG_MKDIR_P],
|
|
|
-[AC_PREREQ([2.60])dnl
|
|
|
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
|
|
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
|
|
|
-dnl while keeping a definition of mkdir_p for backward compatibility.
|
|
|
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
|
|
|
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
|
|
|
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
|
|
|
-dnl adjustment using top_builddir (which is defined more often than
|
|
|
-dnl MKDIR_P).
|
|
|
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
|
|
|
-case $mkdir_p in
|
|
|
- [[\\/$]]* | ?:[[\\/]]*) ;;
|
|
|
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
|
|
|
-esac
|
|
|
-])
|
|
|
+[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
|
|
|
+ # recognize any option. It will interpret all options as
|
|
|
+ # directories to create, and then abort because `.' already
|
|
|
+ # exists.
|
|
|
+ for d in ./-p ./--version;
|
|
|
+ do
|
|
|
+ test -d $d && rmdir $d
|
|
|
+ done
|
|
|
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
|
|
|
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
|
|
|
+ mkdir_p='$(mkinstalldirs)'
|
|
|
+ else
|
|
|
+ mkdir_p='$(install_sh) -d'
|
|
|
+ fi
|
|
|
+fi
|
|
|
+AC_SUBST([mkdir_p])])
|
|
|
|
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
|
|
|
|
@@ -7208,21 +7205,9 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
|
|
if test "$cross_compiling" != no; then
|
|
|
AC_CHECK_TOOL([STRIP], [strip], :)
|
|
|
fi
|
|
|
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
|
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
|
|
|
-# Copyright (C) 2006 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_SUBST_NOTMAKE(VARIABLE)
|
|
|
-# ---------------------------
|
|
|
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
|
|
|
-# This macro is traced by Automake.
|
|
|
-AC_DEFUN([_AM_SUBST_NOTMAKE])
|
|
|
-
|
|
|
# Check how to create a tarball. -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
Rich Megginson