From 55203dd5483cc57fd7bee1116ca524a5e9b61c42 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 26 Nov 2006 17:58:16 +0000 Subject: [PATCH] Regenerate. --- configure | 261 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 126 insertions(+), 135 deletions(-) diff --git a/configure b/configure index 12721b8b..0365a4ea 100755 --- a/configure +++ b/configure @@ -42,25 +42,34 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits as_nl=' ' export as_nl -case `(printf %s foo) 2>/dev/null` in -foo) +# Printing a 2060-byte string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo +if test "X`(printf %s $as_echo) 2>/dev/null`" = "X$as_echo"; then as_echo='printf %s\n' - as_echo_n='printf %s';; -*) - as_echo_body='eval expr "X" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_body as_echo_n_body + as_echo_n='printf %s' +else + if test "X`PATH=/usr/ucb; echo -n -n $as_echo`" = "X-n $as_echo"; then + as_echo_body='PATH=/usr/ucb; eval echo -n "$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body X' + fi + export as_echo_body as_echo='sh -c $as_echo_body X' - as_echo_n='sh -c $as_echo_n_body X';; -esac +fi # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then @@ -3057,25 +3066,34 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits as_nl=' ' export as_nl -case `(printf %s foo) 2>/dev/null` in -foo) +# Printing a 2060-byte string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo +if test "X`(printf %s $as_echo) 2>/dev/null`" = "X$as_echo"; then as_echo='printf %s\n' - as_echo_n='printf %s';; -*) - as_echo_body='eval expr "X" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_body as_echo_n_body + as_echo_n='printf %s' +else + if test "X`PATH=/usr/ucb; echo -n -n $as_echo`" = "X-n $as_echo"; then + as_echo_body='PATH=/usr/ucb; eval echo -n "$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body X' + fi + export as_echo_body as_echo='sh -c $as_echo_body X' - as_echo_n='sh -c $as_echo_n_body X';; -esac +fi # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then @@ -3532,98 +3550,27 @@ $debug || { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF +echo 'BEGIN {' >"$tmp/subs.awk" +_ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' + echo "_ACEOF" +} >conf$$subs.sh +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -ac_cv_sh_n_works!$ac_cv_sh_n_works$ac_delim -EXPR!$EXPR$ac_delim -M4!$M4$ac_delim -M4_DEBUGFILE!$M4_DEBUGFILE$ac_delim -HELP2MAN!$HELP2MAN$ac_delim -PERL!$PERL$ac_delim -TEST_EMACS!$TEST_EMACS$ac_delim -EMACS!$EMACS$ac_delim -EMACSLOADPATH!$EMACSLOADPATH$ac_delim -lispdir!$lispdir$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -SED!$SED$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then break elif $ac_last_try; then { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -3633,33 +3580,77 @@ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.awk` if test -n "$ac_eof"; then ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ac_eof=`expr $ac_eof + 1` fi - cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +cat >>"\$tmp/subs.awk" <<\CEOF$ac_eof _ACEOF sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS +rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g CEOF$ac_eof -_ACEOF +cat >>"\$tmp/subs.awk" <$tmp/out +" $ac_file_inputs | awk -f "$tmp/subs.awk" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -- 2.11.4.GIT