|
@@ -1,7 +1,7 @@
|
|
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
|
|
|
|
|
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
-# 2005 Free Software Foundation, Inc.
|
|
|
|
|
|
+# 2005, 2006 Free Software Foundation, Inc.
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -11,6 +11,11 @@
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
# PARTICULAR PURPOSE.
|
|
# 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-*-
|
|
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
|
|
|
|
|
# serial 48 AC_PROG_LIBTOOL
|
|
# serial 48 AC_PROG_LIBTOOL
|
|
@@ -6388,7 +6393,7 @@ SED=$lt_cv_path_SED
|
|
AC_MSG_RESULT([$SED])
|
|
AC_MSG_RESULT([$SED])
|
|
])
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
|
|
|
|
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
|
|
#
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -6398,14 +6403,29 @@ AC_MSG_RESULT([$SED])
|
|
# ----------------------------
|
|
# ----------------------------
|
|
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
|
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
|
|
|
|
|
+# (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], [])
|
|
|
|
|
|
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
|
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
|
# -------------------------------
|
|
# -------------------------------
|
|
-# Call AM_AUTOMAKE_VERSION so it can be traced.
|
|
|
|
|
|
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
|
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
- [AM_AUTOMAKE_VERSION([1.9.6])])
|
|
|
|
|
|
+[AM_AUTOMAKE_VERSION([1.10])dnl
|
|
|
|
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
|
|
|
|
|
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
|
|
|
|
@@ -6462,14 +6482,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
|
|
|
|
|
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
|
|
# Free Software Foundation, Inc.
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 7
|
|
|
|
|
|
+# serial 8
|
|
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
# -------------------------------------
|
|
# -------------------------------------
|
|
@@ -6478,8 +6498,10 @@ AC_DEFUN([AM_CONDITIONAL],
|
|
[AC_PREREQ(2.52)dnl
|
|
[AC_PREREQ(2.52)dnl
|
|
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
-AC_SUBST([$1_TRUE])
|
|
|
|
-AC_SUBST([$1_FALSE])
|
|
|
|
|
|
+AC_SUBST([$1_TRUE])dnl
|
|
|
|
+AC_SUBST([$1_FALSE])dnl
|
|
|
|
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
|
|
|
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
|
if $2; then
|
|
if $2; then
|
|
$1_TRUE=
|
|
$1_TRUE=
|
|
$1_FALSE='#'
|
|
$1_FALSE='#'
|
|
@@ -6493,15 +6515,14 @@ AC_CONFIG_COMMANDS_PRE(
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
fi])])
|
|
fi])])
|
|
|
|
|
|
-
|
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
|
|
|
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
|
# Free Software Foundation, Inc.
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 8
|
|
|
|
|
|
+# serial 9
|
|
|
|
|
|
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
|
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
|
# written in clear, in which case automake, when reading aclocal.m4,
|
|
# written in clear, in which case automake, when reading aclocal.m4,
|
|
@@ -6529,6 +6550,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
|
|
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
|
|
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
|
|
[$1], CXX, [depcc="$CXX" am_compiler_list=],
|
|
[$1], CXX, [depcc="$CXX" am_compiler_list=],
|
|
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
|
|
[$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'],
|
|
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
|
|
[depcc="$$1" am_compiler_list=])
|
|
[depcc="$$1" am_compiler_list=])
|
|
|
|
|
|
@@ -6594,6 +6616,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
>/dev/null 2>conftest.err &&
|
|
>/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/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
grep sub/conftest.${OBJEXT-o} 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
|
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
@@ -6646,7 +6669,8 @@ if test "x$enable_dependency_tracking" != xno; then
|
|
AMDEPBACKSLASH='\'
|
|
AMDEPBACKSLASH='\'
|
|
fi
|
|
fi
|
|
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
|
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
|
-AC_SUBST([AMDEPBACKSLASH])
|
|
|
|
|
|
+AC_SUBST([AMDEPBACKSLASH])dnl
|
|
|
|
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
|
])
|
|
])
|
|
|
|
|
|
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
@@ -6671,8 +6695,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
# some people rename them; so instead we look at the file content.
|
|
# some people rename them; so instead we look at the file content.
|
|
# Grep'ing the first line is not enough: some people post-process
|
|
# 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.
|
|
# each Makefile.in and add a new line on top of each file to say so.
|
|
- # So let's grep whole file.
|
|
|
|
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
|
|
|
|
|
+ # 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
|
|
dirpart=`AS_DIRNAME("$mf")`
|
|
dirpart=`AS_DIRNAME("$mf")`
|
|
else
|
|
else
|
|
continue
|
|
continue
|
|
@@ -6759,8 +6784,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
|
|
|
|
# Do all the work for Automake. -*- Autoconf -*-
|
|
# Do all the work for Automake. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
|
-# Free Software Foundation, Inc.
|
|
|
|
|
|
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
|
+# 2005, 2006 Free Software Foundation, Inc.
|
|
#
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -6783,16 +6808,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
# arguments mandatory, and then we can depend on a new Autoconf
|
|
# arguments mandatory, and then we can depend on a new Autoconf
|
|
# release and drop the old call support.
|
|
# release and drop the old call support.
|
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
-[AC_PREREQ([2.58])dnl
|
|
|
|
|
|
+[AC_PREREQ([2.60])dnl
|
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
|
dnl the ones we care about.
|
|
dnl the ones we care about.
|
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
|
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
-# 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])
|
|
|
|
|
|
+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
|
|
fi
|
|
fi
|
|
|
|
|
|
# test whether we have cygpath
|
|
# test whether we have cygpath
|
|
@@ -6812,6 +6841,9 @@ m4_ifval([$2],
|
|
AC_SUBST([PACKAGE], [$1])dnl
|
|
AC_SUBST([PACKAGE], [$1])dnl
|
|
AC_SUBST([VERSION], [$2])],
|
|
AC_SUBST([VERSION], [$2])],
|
|
[_AM_SET_OPTIONS([$1])dnl
|
|
[_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([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
|
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
|
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
|
|
|
|
|
@@ -6847,6 +6879,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
[_AM_DEPENDENCIES(CXX)],
|
|
[_AM_DEPENDENCIES(CXX)],
|
|
[define([AC_PROG_CXX],
|
|
[define([AC_PROG_CXX],
|
|
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
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
|
|
])
|
|
])
|
|
])
|
|
])
|
|
|
|
|
|
@@ -6882,7 +6918,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
|
# Define $install_sh.
|
|
# Define $install_sh.
|
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
|
|
|
|
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
|
AC_SUBST(install_sh)])
|
|
AC_SUBST(install_sh)])
|
|
|
|
|
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
@@ -6989,14 +7025,14 @@ rm -f confinc confmf
|
|
|
|
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
|
|
|
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
|
|
|
|
|
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
|
|
# Free Software Foundation, Inc.
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
-# serial 4
|
|
|
|
|
|
+# serial 5
|
|
|
|
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
# ------------------------------
|
|
# ------------------------------
|
|
@@ -7012,6 +7048,7 @@ AC_SUBST($1)])
|
|
# If it does, set am_missing_run to use it, otherwise, to nothing.
|
|
# If it does, set am_missing_run to use it, otherwise, to nothing.
|
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
|
|
+AC_REQUIRE_AUX_FILE([missing])dnl
|
|
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
# Use eval to expand $SHELL
|
|
# Use eval to expand $SHELL
|
|
if eval "$MISSING --run true"; then
|
|
if eval "$MISSING --run true"; then
|
|
@@ -7022,7 +7059,7 @@ else
|
|
fi
|
|
fi
|
|
])
|
|
])
|
|
|
|
|
|
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
|
|
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
#
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -7030,60 +7067,23 @@ fi
|
|
|
|
|
|
# AM_PROG_MKDIR_P
|
|
# 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
|
|
|
|
-# 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.)
|
|
|
|
|
|
+# Check for `mkdir -p'.
|
|
AC_DEFUN([AM_PROG_MKDIR_P],
|
|
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
|
|
|
|
- # 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])])
|
|
|
|
|
|
+[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
|
|
|
|
+])
|
|
|
|
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
|
|
|
|
@@ -7195,9 +7195,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
|
if test "$cross_compiling" != no; then
|
|
if test "$cross_compiling" != no; then
|
|
AC_CHECK_TOOL([STRIP], [strip], :)
|
|
AC_CHECK_TOOL([STRIP], [strip], :)
|
|
fi
|
|
fi
|
|
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
|
|
|
|
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
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 -*-
|
|
# Check how to create a tarball. -*- Autoconf -*-
|
|
|
|
|
|
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
@@ -7298,7 +7310,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro:
|
|
dnl
|
|
dnl
|
|
dnl DO NOT EDIT THIS FILE (libopts.m4)
|
|
dnl DO NOT EDIT THIS FILE (libopts.m4)
|
|
dnl
|
|
dnl
|
|
-dnl It has been AutoGen-ed Sunday April 9, 2006 at 11:49:18 AM PDT
|
|
|
|
|
|
+dnl It has been AutoGen-ed Saturday February 17, 2007 at 12:49:37 PM PST
|
|
dnl From the definitions libopts.def
|
|
dnl From the definitions libopts.def
|
|
dnl and the template file conftest.tpl
|
|
dnl and the template file conftest.tpl
|
|
dnl
|
|
dnl
|
|
@@ -7320,7 +7332,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
|
|
# =================
|
|
# =================
|
|
AC_CHECK_HEADERS(dlfcn.h errno.h fcntl.h libgen.h memory.h netinet/in.h \
|
|
AC_CHECK_HEADERS(dlfcn.h errno.h fcntl.h libgen.h memory.h netinet/in.h \
|
|
setjmp.h sys/mman.h sys/param.h sys/poll.h sys/procset.h sys/select.h \
|
|
setjmp.h sys/mman.h sys/param.h sys/poll.h sys/procset.h sys/select.h \
|
|
- sys/socket.h sys/stropts.h sys/time.h sys/un.h sys/wait.h unistd.h)
|
|
|
|
|
|
+ sys/socket.h sys/stropts.h sys/time.h sys/un.h sys/wait.h unistd.h \
|
|
|
|
+ utime.h )
|
|
|
|
|
|
# --------------------------------------------
|
|
# --------------------------------------------
|
|
# Verify certain entries from AC_CHECK_HEADERS
|
|
# Verify certain entries from AC_CHECK_HEADERS
|
|
@@ -7362,7 +7375,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
|
|
# ========================
|
|
# ========================
|
|
AC_CHECK_HEADERS(stdint.h inttypes.h, break)
|
|
AC_CHECK_HEADERS(stdint.h inttypes.h, break)
|
|
AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
|
|
AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
|
|
- intptr_t])
|
|
|
|
|
|
+ intptr_t, uint_t])
|
|
|
|
|
|
# ====================
|
|
# ====================
|
|
# uintptr type & sizes
|
|
# uintptr type & sizes
|
|
@@ -7380,7 +7393,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
|
|
# ----------------------------------------------------------------------
|
|
# ----------------------------------------------------------------------
|
|
AC_CHECK_LIB(gen, pathfind)
|
|
AC_CHECK_LIB(gen, pathfind)
|
|
AC_FUNC_VPRINTF
|
|
AC_FUNC_VPRINTF
|
|
- AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup])
|
|
|
|
|
|
+ AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr strrchr])
|
|
[ INVOKE_LIBOPTS_MACROS_FIRST_done=yes
|
|
[ INVOKE_LIBOPTS_MACROS_FIRST_done=yes
|
|
fi]])
|
|
fi]])
|
|
|
|
|
|
@@ -7476,7 +7489,7 @@ AC_DEFUN([LIBOPTS_WITHLIB_REGEX],[
|
|
@%:@include <sys/types.h>
|
|
@%:@include <sys/types.h>
|
|
@%:@include REGEX_HEADER
|
|
@%:@include REGEX_HEADER
|
|
static regex_t re;
|
|
static regex_t re;
|
|
-void comp_re( const char* pzPat ) {
|
|
|
|
|
|
+void comp_re( char const* pzPat ) {
|
|
int res = regcomp( &re, pzPat, REG_EXTENDED|REG_ICASE|REG_NEWLINE );
|
|
int res = regcomp( &re, pzPat, REG_EXTENDED|REG_ICASE|REG_NEWLINE );
|
|
if (res == 0) return;
|
|
if (res == 0) return;
|
|
exit( res ); }
|
|
exit( res ); }
|
|
@@ -7496,20 +7509,13 @@ int main() {
|
|
]) # end of AC_CACHE_VAL for libopts_cv_with_libregex
|
|
]) # end of AC_CACHE_VAL for libopts_cv_with_libregex
|
|
AC_MSG_RESULT([${libopts_cv_with_libregex}])
|
|
AC_MSG_RESULT([${libopts_cv_with_libregex}])
|
|
|
|
|
|
- if test "X${libopts_cv_with_libregex}" = Xno
|
|
|
|
|
|
+ if test "X${libopts_cv_with_libregex}" != Xno
|
|
then
|
|
then
|
|
|
|
+ AC_DEFINE([WITH_LIBREGEX],[1],
|
|
|
|
+ [Define this if a working libregex can be found])
|
|
|
|
+ else
|
|
CPPFLAGS="${libopts_save_CPPFLAGS}"
|
|
CPPFLAGS="${libopts_save_CPPFLAGS}"
|
|
LIBS="${libopts_save_LIBS}"
|
|
LIBS="${libopts_save_LIBS}"
|
|
- cat >&2 <<'_EOF_'
|
|
|
|
-I cannot detect POSIX compliant regcomp/regexec routines.
|
|
|
|
-These are required for AutoGen to work correctly. If you have
|
|
|
|
-such a library present on your system, you must specify it by
|
|
|
|
-setting the LIBS environment variable, e.g., "LIBS='-lregex'".
|
|
|
|
-If you do not have such a library on your system, then you should
|
|
|
|
-download and install, for example, the one from:
|
|
|
|
- ftp://ftp.gnu.org/gnu/rx/
|
|
|
|
-_EOF_
|
|
|
|
-AC_MSG_ERROR([Cannot find working POSIX regex library])
|
|
|
|
fi
|
|
fi
|
|
|
|
|
|
]) # end of AC_DEFUN of LIBOPTS_WITHLIB_REGEX
|
|
]) # end of AC_DEFUN of LIBOPTS_WITHLIB_REGEX
|
|
@@ -7542,7 +7548,7 @@ AC_DEFUN([LIBOPTS_TEST_DEV_ZERO],[
|
|
AC_MSG_CHECKING([whether /dev/zero is readable device])
|
|
AC_MSG_CHECKING([whether /dev/zero is readable device])
|
|
AC_CACHE_VAL([libopts_cv_test_dev_zero],[
|
|
AC_CACHE_VAL([libopts_cv_test_dev_zero],[
|
|
libopts_cv_test_dev_zero=`exec 2> /dev/null
|
|
libopts_cv_test_dev_zero=`exec 2> /dev/null
|
|
-dzero=\`ls -l /dev/zero | egrep ^c......r\`
|
|
|
|
|
|
+dzero=\`ls -lL /dev/zero | egrep ^c......r\`
|
|
test -z "${dzero}" && exit 1
|
|
test -z "${dzero}" && exit 1
|
|
echo ${dzero}`
|
|
echo ${dzero}`
|
|
if test $? -ne 0
|
|
if test $? -ne 0
|
|
@@ -7597,7 +7603,7 @@ AC_DEFUN([LIBOPTS_RUN_STRFTIME],[
|
|
@%:@include <string.h>
|
|
@%:@include <string.h>
|
|
char t_buf@<:@ 64 @:>@;
|
|
char t_buf@<:@ 64 @:>@;
|
|
int main() {
|
|
int main() {
|
|
- static const char z@<:@@:>@ = "Thursday Aug 28 240";
|
|
|
|
|
|
+ static char const z@<:@@:>@ = "Thursday Aug 28 240";
|
|
struct tm tm;
|
|
struct tm tm;
|
|
tm.tm_sec = 36; /* seconds after the minute @<:@0, 61@:>@ */
|
|
tm.tm_sec = 36; /* seconds after the minute @<:@0, 61@:>@ */
|
|
tm.tm_min = 44; /* minutes after the hour @<:@0, 59@:>@ */
|
|
tm.tm_min = 44; /* minutes after the hour @<:@0, 59@:>@ */
|
|
@@ -7702,6 +7708,9 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
|
|
|
|
|
|
dnl @synopsis LIBOPTS_CHECK
|
|
dnl @synopsis LIBOPTS_CHECK
|
|
dnl
|
|
dnl
|
|
|
|
+dnl Time-stamp: "2006-09-23 19:36:24 bkorb"
|
|
|
|
+dnl Last Committed: $Date: 2006/09/24 02:59:00 $
|
|
|
|
+dnl
|
|
dnl If autoopts-config works, add the linking information to LIBS.
|
|
dnl If autoopts-config works, add the linking information to LIBS.
|
|
dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
|
|
dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
|
|
dnl the config tests that the library needs. Invoke the
|
|
dnl the config tests that the library needs. Invoke the
|
|
@@ -7724,6 +7733,11 @@ AC_DEFUN([LIBOPTS_CHECK],[
|
|
NEED_LIBOPTS_DIR=true
|
|
NEED_LIBOPTS_DIR=true
|
|
fi])
|
|
fi])
|
|
|
|
|
|
|
|
+ AC_ARG_ENABLE([libopts-install],
|
|
|
|
+ AC_HELP_STRING([--disable-libopts-install],
|
|
|
|
+ [Do not install libopts with client installation]))
|
|
|
|
+ AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
|
|
|
|
+
|
|
[if test -z "${NEED_LIBOPTS_DIR}" ; then]
|
|
[if test -z "${NEED_LIBOPTS_DIR}" ; then]
|
|
AC_MSG_CHECKING([whether autoopts-config can be found])
|
|
AC_MSG_CHECKING([whether autoopts-config can be found])
|
|
AC_ARG_WITH([autoopts-config],
|
|
AC_ARG_WITH([autoopts-config],
|
|
@@ -7786,7 +7800,10 @@ dnl Copyright (C) 2005 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
-dnl
|
|
|
|
|
|
+
|
|
|
|
+dnl Time-stamp: "2006-09-23 19:42:31 bkorb"
|
|
|
|
+dnl Last Committed: $Date: 2006/09/24 02:59:00 $
|
|
|
|
+
|
|
dnl This file can can be used in projects which are not available under
|
|
dnl This file can can be used in projects which are not available under
|
|
dnl the GNU General Public License or the GNU Library General Public
|
|
dnl the GNU General Public License or the GNU Library General Public
|
|
dnl License but which still want to provide support for the GNU gettext
|
|
dnl License but which still want to provide support for the GNU gettext
|