From 908824dd90146905c0dd46eb25b56ade55009847 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 8 Oct 2001 11:54:06 +0000 Subject: [PATCH] Regen. --- aclocal.m4 | 75 +++++--------- configure | 291 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 219 insertions(+), 147 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 3c9f4b21..c29c1b24 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.5a +# aclocal.m4 generated automatically by aclocal 1.5 # Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -11,9 +11,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. 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 -*- + +# 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 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -32,7 +33,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 5 +# serial 6 # 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, @@ -41,55 +42,29 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +AC_PREREQ([2.52]) +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) # ---------------------------------------------- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +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 # Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl +AC_SUBST([PACKAGE], [$1])dnl +AC_SUBST([VERSION], [$2])dnl ifelse([$3],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl @@ -284,9 +259,12 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH @@ -621,7 +599,7 @@ AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) -# AM_CONDITIONAL +# AM_CONDITIONAL -*- Autoconf -*- # Copyright 1997, 2000, 2001 Free Software Foundation, Inc. @@ -640,23 +618,16 @@ rm -f confinc confmf # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 3 +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then diff --git a/configure b/configure index 228e4783..be874a9f 100755 --- a/configure +++ b/configure @@ -24,35 +24,93 @@ fi # Name of the executable. as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'` -# If LINENO is not supported by the shell, produce a version of this -# script where LINENO is hard coded. Rewrite if not up to date only. -# Comparing LINENO against _oline_ is not a good solution, since in -# the case of embedded executables (such as config.status within -# configure) you'd compare LINENO wrt config.status vs. _oline_ vs -# configure. Hence a useless rewrite (not to mention the risk of -# ``infinite'' rewrites. Merely check that LINENO is incremented -# between two lines, which is a property guaranteed for _oline_, hence -# it protects us from repetitive rewrites. -as_lineno_1=$LINENO -as_lineno_2=$LINENO -# Compute as_lineno_1 in two steps: some shells restart LINENO for -# subshells. -as_lineno_1=`(expr $as_lineno_1 + 1) 2>/dev/null` -if test "x$as_lineno_1" != "x$as_lineno_2"; then - if test ! -f $as_me.lineno || - test x`ls -1dt $as_me.lineno $as_me 2>/dev/null | sed 1q` \ - != x$as_me.lineno; then +# Rewrite early, but we need PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conftest.sh +fi + +as_command=' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" +' +if eval "$as_command"; then + : +else + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin:/usr/bin:$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c "$as_command") 2>/dev/null; then + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + if test ! -f "$as_me.lineno" || + test x`ls -1dt "$as_me.lineno" "$as_myself" 2>/dev/null | sed 1q` \ + != x"$as_me.lineno"; then # Be sure to write the pattern so that it doesn't replace itself: # it must not match itself. - awk '{ - if ($0 ~ /[$]LINENO/) - while (sub (/[$]LINENO/, NR)) - continue - print - }' <$as_me >$as_me.lineno + awk <$as_myself ' + /[$]LINENO/ { printf "%d:", NR } + { print } + ' | + sed '/[$]LINENO/s/^\([0-9][0-9]*\):\(.*\)[$]LINENO/\2\1/' \ + >$as_me.lineno chmod +x $as_me.lineno fi - exec ${SHELL-/bin/sh} ./$as_me.lineno + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit fi # Avoid depending upon Character Ranges. @@ -93,19 +151,6 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! $SHELL" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -683,8 +728,10 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - cd $ac_dir - if test "$ac_dir" != .; then + test -d $ac_dir || continue + ac_builddir=. + +if test "$ac_dir" != .; then ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A "../" for each directory in $ac_dir_suffix. ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` @@ -707,7 +754,14 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. if test -f $ac_srcdir/configure.gnu; then echo @@ -1125,7 +1179,7 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL @@ -1236,7 +1290,7 @@ fi rmdir .deps 2>/dev/null # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} @@ -1255,17 +1309,6 @@ cat >>confdefs.h <<_ACEOF #define VERSION "$VERSION" _ACEOF -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. - -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} - # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} @@ -1486,35 +1529,94 @@ fi # Name of the executable. as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'` -# If LINENO is not supported by the shell, produce a version of this -# script where LINENO is hard coded. Rewrite if not up to date only. -# Comparing LINENO against _oline_ is not a good solution, since in -# the case of embedded executables (such as config.status within -# configure) you'd compare LINENO wrt config.status vs. _oline_ vs -# configure. Hence a useless rewrite (not to mention the risk of -# ``infinite'' rewrites. Merely check that LINENO is incremented -# between two lines, which is a property guaranteed for _oline_, hence -# it protects us from repetitive rewrites. -as_lineno_1=$LINENO -as_lineno_2=$LINENO -# Compute as_lineno_1 in two steps: some shells restart LINENO for -# subshells. -as_lineno_1=`(expr $as_lineno_1 + 1) 2>/dev/null` -if test "x$as_lineno_1" != "x$as_lineno_2"; then - if test ! -f $as_me.lineno || - test x`ls -1dt $as_me.lineno $as_me 2>/dev/null | sed 1q` \ - != x$as_me.lineno; then +# Rewrite early, but we need PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conftest.sh +fi + +as_command=' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" +' +if eval "$as_command"; then + : +else + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin:/usr/bin:$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c "$as_command") 2>/dev/null; then + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + if test ! -f "$as_me.lineno" || + test x`ls -1dt "$as_me.lineno" "$as_myself" 2>/dev/null | sed 1q` \ + != x"$as_me.lineno"; then # Be sure to write the pattern so that it doesn't replace itself: # it must not match itself. - awk '{ - if ($0 ~ /[$]LINENO/) - while (sub (/[$]LINENO/, NR)) - continue - print - }' <$as_me >$as_me.lineno + awk <$as_myself ' + /[$]LINENO/ { printf "%d:", NR } + { print } + ' | + sed '/[$]LINENO/s/^\([0-9][0-9]*\):\(.*\)[$]LINENO/\2\1/' \ + >$as_me.lineno chmod +x $as_me.lineno fi - exec ${SHELL-/bin/sh} ./$as_me.lineno + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit fi # Avoid depending upon Character Ranges. @@ -1555,19 +1657,6 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! $SHELL" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -1611,7 +1700,7 @@ exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running \$as_me. ## +## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF @@ -1846,8 +1935,6 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t s,@ACLOCAL@,$ACLOCAL,;t t s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t @@ -1952,7 +2039,9 @@ echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} esac done; } - if test "$ac_dir" != .; then + ac_builddir=. + +if test "$ac_dir" != .; then ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A "../" for each directory in $ac_dir_suffix. ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` @@ -1975,6 +2064,12 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; @@ -2029,7 +2124,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@srcpath@,$ac_srcpath,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@top_srcpath@,$ac_top_srcpath,;t t +s,@builddir@,$ac_builddir,;t t +s,@buildpath@,$ac_buildpath,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@top_buildpath@,$ac_top_buildpath,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin -- 2.43.5