diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-01-21 00:02:04 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-21 00:02:04 +0000 |
commit | 72c804c76aad3560d5b2c3a436b7006bb2d6ed20 (patch) | |
tree | 47cfb8f58b30f9a1852c54be58e80641cd36ad4f /sys-devel/flex/files | |
parent | sneak into cvs real quick (diff) | |
download | gentoo-2-72c804c76aad3560d5b2c3a436b7006bb2d6ed20.tar.gz gentoo-2-72c804c76aad3560d5b2c3a436b7006bb2d6ed20.tar.bz2 gentoo-2-72c804c76aad3560d5b2c3a436b7006bb2d6ed20.zip |
sneak back out
Diffstat (limited to 'sys-devel/flex/files')
-rw-r--r-- | sys-devel/flex/files/flex-2.5.4a-autoconf.patch | 1947 |
1 files changed, 0 insertions, 1947 deletions
diff --git a/sys-devel/flex/files/flex-2.5.4a-autoconf.patch b/sys-devel/flex/files/flex-2.5.4a-autoconf.patch deleted file mode 100644 index 28598d71db6f..000000000000 --- a/sys-devel/flex/files/flex-2.5.4a-autoconf.patch +++ /dev/null @@ -1,1947 +0,0 @@ -Clean up flex autotool files to suck less. - -diff -ur flex-2.5.4.orig/Makefile.in flex-2.5.4/Makefile.in ---- flex-2.5.4.orig/Makefile.in 2005-01-20 18:39:23.568396408 -0500 -+++ flex-2.5.4/Makefile.in 2005-01-20 18:40:36.931243560 -0500 -@@ -17,7 +17,7 @@ - CFLAGS = @CFLAGS@ - CPPFLAGS = @CPPFLAGS@ - DEFS = @DEFS@ --LDFLAGS = -+LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - - # Installation targeting. Files will be installed under the tree -@@ -28,13 +28,13 @@ - # Raw, unformatted troff source will be installed if INSTALLMAN=man, - # nroff preformatted versions will be installed if INSTALLMAN=cat. - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --bindir = $(exec_prefix)/bin --libdir = $(exec_prefix)/lib --includedir = $(prefix)/include -+bindir = @bindir@ -+libdir = @libdir@ -+includedir = @includedir@ - manext = 1 --mandir = $(prefix)/man/man$(manext) -+mandir = $(prefix)/share/man/man$(manext) - - # You can define these to be "lex" and "libl.a" if you want to replace - # lex at your site. -@@ -50,7 +50,7 @@ - LN_S = @LN_S@ - YACC = @YACC@ - CC = @CC@ --AR = ar -+AR = @AR@ - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ -@@ -166,26 +166,26 @@ - cd $(srcdir) && nroff -man flex.1 >$(FLEX).man - - install: $(FLEX) $(FLEXLIB) installdirs install.$(INSTALLMAN) -- $(INSTALL_PROGRAM) $(FLEX) $(bindir)/$(FLEX) -- @rm -f $(bindir)/$(FLEX)++ -- cd $(bindir) && $(LN_S) $(FLEX) $(FLEX)++ -- $(INSTALL_DATA) $(FLEXLIB) $(libdir)/$(FLEXLIB) -- -cd $(libdir) && $(RANLIB) $(FLEXLIB) -- $(INSTALL_DATA) $(srcdir)/FlexLexer.h $(includedir)/FlexLexer.h -+ $(INSTALL_PROGRAM) $(FLEX) $(DESTDIR)$(bindir)/$(FLEX) -+ @rm -f $(DESTDIR)$(bindir)/$(FLEX)++ -+ cd $(DESTDIR)$(bindir) && $(LN_S) $(FLEX) $(FLEX)++ -+ $(INSTALL_DATA) $(FLEXLIB) $(DESTDIR)$(libdir)/$(FLEXLIB) -+ -cd $(DESTDIR)$(libdir) && $(RANLIB) $(FLEXLIB) -+ $(INSTALL_DATA) $(srcdir)/FlexLexer.h $(DESTDIR)$(includedir)/FlexLexer.h - - # Note, the following rules delete any vestigial flexdoc installed - # for a prior flex release. - install.man: flex.1 -- rm -f $(mandir)/$(FLEX)doc.$(manext) -- $(INSTALL_DATA) $(srcdir)/flex.1 $(mandir)/$(FLEX).$(manext) -+ rm -f $(DESTDIR)$(mandir)/$(FLEX)doc.$(manext) -+ $(INSTALL_DATA) $(srcdir)/flex.1 $(DESTDIR)$(mandir)/$(FLEX).$(manext) - - install.cat: $(FLEX).man -- rm -f $(mandir)/$(FLEX)doc.$(manext) -- $(INSTALL_DATA) $(srcdir)/$(FLEX).man $(mandir)/$(FLEX).$(manext) -+ rm -f $(DESTDIR)$(mandir)/$(FLEX)doc.$(manext) -+ $(INSTALL_DATA) $(srcdir)/$(FLEX).man $(DESTDIR)$(mandir)/$(FLEX).$(manext) - - installdirs: - $(SHELL) $(srcdir)/mkinstalldirs \ -- $(bindir) $(libdir) $(includedir) $(mandir) -+ $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(mandir) - - uninstall: - rm -f $(bindir)/$(FLEX) $(bindir)/$(FLEX)++ -diff -ur flex-2.5.4.orig/configure flex-2.5.4/configure ---- flex-2.5.4.orig/configure 2005-01-20 18:39:23.641385312 -0500 -+++ flex-2.5.4/configure 2005-01-20 18:40:27.582664760 -0500 -@@ -1,8 +1,8 @@ --#!/bin/sh -+#! /bin/sh - - # Guess values for system-dependent variables and create Makefiles. --# Generated automatically using autoconf version 2.1 --# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. -+# Generated automatically using autoconf version 2.13 -+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. - # - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -@@ -33,9 +33,25 @@ - verbose= - x_includes=NONE - x_libraries=NONE -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datadir='${prefix}/share' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+libdir='${exec_prefix}/lib' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+infodir='${prefix}/info' -+mandir='${prefix}/man' - - # Initialize some other variables. - subdirs= -+MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 - - ac_prev= - for ac_option -@@ -57,9 +73,14 @@ - - case "$ac_option" in - -- -build | --build | --buil | --bui | --bu | --b) -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir="$ac_optarg" ;; -+ -+ -build | --build | --buil | --bui | --bu) - ac_prev=build ;; -- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ -@@ -69,6 +90,12 @@ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - -+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -+ | --da=*) -+ datadir="$ac_optarg" ;; -+ - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. -@@ -119,12 +146,29 @@ - Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -- --exec-prefix=PREFIX install architecture-dependent files in PREFIX -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] -+ --bindir=DIR user executables in DIR [EPREFIX/bin] -+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data in DIR -+ [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data in DIR -+ [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] -+ --includedir=DIR C header files in DIR [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -+ --infodir=DIR info documentation in DIR [PREFIX/info] -+ --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names -- --program-transform-name=PROGRAM run sed PROGRAM on installed program names -+ --program-transform-name=PROGRAM -+ run sed PROGRAM on installed program names -+EOF -+ cat << EOF - Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] -@@ -136,8 +180,10 @@ - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR ----enable and --with options recognized:$ac_help - EOF -+ if test -n "$ac_help"; then -+ echo "--enable and --with options recognized:$ac_help" -+ fi - exit 0 ;; - - -host | --host | --hos | --ho) -@@ -145,6 +191,44 @@ - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir="$ac_optarg" ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir="$ac_optarg" ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir="$ac_optarg" ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir="$ac_optarg" ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst \ -+ | --locals | --local | --loca | --loc | --lo) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ localstatedir="$ac_optarg" ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir="$ac_optarg" ;; -+ - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; -@@ -157,6 +241,15 @@ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir="$ac_optarg" ;; -+ - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -@@ -197,6 +290,23 @@ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir="$ac_optarg" ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir="$ac_optarg" ;; -+ - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) -@@ -207,6 +317,13 @@ - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir="$ac_optarg" ;; -+ - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -@@ -216,7 +333,7 @@ - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) -- echo "configure generated by autoconf version 2.1" -+ echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) -@@ -262,7 +379,7 @@ - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - -- *) -+ *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi -@@ -279,19 +396,20 @@ - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } - fi - --trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15 -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - - # File descriptor usage: --# 0 unused; standard input -+# 0 standard input - # 1 file creation - # 2 errors and warnings --# 3 unused; some systems may open it to /dev/tty --# 4 checking for... messages and results -+# 3 some systems may open it to /dev/tty -+# 4 used on the Kubota Titan -+# 6 checking for... messages and results - # 5 compiler messages saved in config.log - if test "$silent" = yes; then -- exec 4>/dev/null -+ exec 6>/dev/null - else -- exec 4>&1 -+ exec 6>&1 - fi - exec 5>./config.log - -@@ -317,11 +435,14 @@ - done - - # NLS nuisances. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). --if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. - if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - - # confdefs.h avoids OS command line length limits that DEFS can exceed. - rm -rf conftest* confdefs.h -@@ -381,9 +502,12 @@ - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5' --ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - -+ac_exeext= -+ac_objext=o - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -@@ -399,9 +523,10 @@ - - - --echo $ac_n "checking whether ln -s works""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_prog_LN_S'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -+echo "configure:528: checking whether ln -s works" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - rm -f conftestdata - if ln -s X conftestdata 2>/dev/null -@@ -414,24 +539,26 @@ - fi - LN_S="$ac_cv_prog_LN_S" - if test "$ac_cv_prog_LN_S" = "ln -s"; then -- echo "$ac_t""yes" 1>&4 -+ echo "$ac_t""yes" 1>&6 - else -- echo "$ac_t""no" 1>&4 -+ echo "$ac_t""no" 1>&6 - fi - - for ac_prog in 'bison -y' byacc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_prog_YACC'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:553: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YACC="$ac_prog" -@@ -443,9 +570,9 @@ - fi - YACC="$ac_cv_prog_YACC" - if test -n "$YACC"; then -- echo "$ac_t""$YACC" 1>&4 -+ echo "$ac_t""$YACC" 1>&6 - else -- echo "$ac_t""no" 1>&4 -+ echo "$ac_t""no" 1>&6 - fi - - test -n "$YACC" && break -@@ -454,15 +581,17 @@ - - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_prog_CC'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:586: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" -@@ -470,72 +599,221 @@ - fi - done - IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" - fi - fi - CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&4 -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:616: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_prog_rejected=no -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# -gt 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" -+ fi -+fi -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:667: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$ac_t""no" 1>&4 -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi - -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+cat > conftest.$ac_ext << EOF -+ -+#line 710 "configure" -+#include "confdefs.h" - --echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+main(){return(0);} -+EOF -+if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no -+ else -+ ac_cv_prog_cc_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no -+fi -+rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -+fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:746: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.c <<EOF - #ifdef __GNUC__ - yes; - #endif - EOF --if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no - fi - fi --echo "$ac_t""$ac_cv_prog_gcc" 1>&4 -+ -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+ - if test $ac_cv_prog_gcc = yes; then - GCC=yes -- if test "${CFLAGS+set}" != set; then -- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+else -+ GCC= -+fi -+ -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:774: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - echo 'void f(){}' > conftest.c - if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -- ac_cv_prog_gcc_g=yes -+ ac_cv_prog_cc_g=yes - else -- ac_cv_prog_gcc_g=no -+ ac_cv_prog_cc_g=no - fi - rm -f conftest* - - fi -- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4 -- if test $ac_cv_prog_gcc_g = yes; then -- CFLAGS="-g -O" -- else -- CFLAGS="-O" -- fi -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" - fi - else -- GCC= -- test "${CFLAGS+set}" = set || CFLAGS="-g" -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi - fi - - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_prog_RANLIB'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:808: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" -@@ -548,9 +826,39 @@ - fi - RANLIB="$ac_cv_prog_RANLIB" - if test -n "$RANLIB"; then -- echo "$ac_t""$RANLIB" 1>&4 -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+# Extract the first word of "ar", so it can be a program name with args. -+set dummy ar; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:808: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AR="ar" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR=":" -+fi -+fi -+AR="$ac_cv_prog_AR" -+if test -n "$AR"; then -+ echo "$ac_t""$AR" 1>&6 - else -- echo "$ac_t""no" 1>&4 -+ echo "$ac_t""no" 1>&6 - fi - - ac_aux_dir= -@@ -579,26 +887,30 @@ - # SunOS /usr/etc/install - # IRIX /sbin/install - # AIX /bin/install -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. --echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&4 -+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -+echo "configure:866: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then --if eval "test \"`echo '${'ac_cv_path_install'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do -- case "$ac_dir" in -- ''|.|/etc|/usr/sbin|/usr/etc|/sbin|/usr/afsws/bin|/usr/ucb) ;; -+ # Account for people who put trailing slashes in PATH elements. -+ case "$ac_dir/" in -+ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -- for ac_prog in ginstall installbsd scoinst install; do -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -- # OSF/1 installbsd also uses dspmsg, but is usable. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" -@@ -609,24 +921,34 @@ - ;; - esac - done -- IFS="$ac_save_ifs" -- # As a last resort, use the slow shell script. -- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" -+ IFS="$ac_save_IFS" -+ - fi -- INSTALL="$ac_cv_path_install" -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL="$ac_cv_path_install" -+ else -+ # As a last resort, use the slow shell script. We don't cache a -+ # path for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the path is relative. -+ INSTALL="$ac_install_sh" -+ fi - fi --echo "$ac_t""$INSTALL" 1>&4 -+echo "$ac_t""$INSTALL" 1>&6 - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -+ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4 --set dummy ${MAKE-make}; ac_make=$2 --if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -+echo "configure:919: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftestmake <<\EOF - all: -@@ -642,23 +964,23 @@ - rm -f conftestmake - fi - if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$ac_t""yes" 1>&4 -+ echo "$ac_t""yes" 1>&6 - SET_MAKE= - else -- echo "$ac_t""no" 1>&4 -+ echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" - fi - --echo $ac_n "checking for working const""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_c_const'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for working const""... $ac_c" 1>&6 -+echo "configure:946: checking for working const" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 658 "configure" -+#line 951 "configure" - #include "confdefs.h" - --int main() { return 0; } --int t() { -+int main() { - - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; const charset x; -@@ -667,7 +989,7 @@ - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; --static struct point const zero; -+static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -@@ -704,17 +1026,19 @@ - - ; return 0; } - EOF --if eval $ac_compile; then -+if { (eval echo configure:1000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no - fi - rm -f conftest* -- - fi --echo "$ac_t""$ac_cv_c_const" 1>&4 -+ -+echo "$ac_t""$ac_cv_c_const" 1>&6 - if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF - #define const -@@ -722,14 +1046,15 @@ - - fi - --echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&4 -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:1021: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then --if eval "test \"`echo '${'ac_cv_prog_CPP'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. -@@ -737,87 +1062,93 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 741 "configure" -+#line 1036 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF --eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --ac_err=`grep -v '^ *+' conftest.out` -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 755 "configure" -+#line 1053 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#line 1070 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF --eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --ac_err=`grep -v '^ *+' conftest.out` -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp - fi - rm -f conftest* - fi - rm -f conftest* -- ac_cv_prog_CPP="$CPP" - fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" - fi --CPP="$ac_cv_prog_CPP" --echo "$ac_t""$CPP" 1>&4 -- --# If we cannot run a trivial program, we must be cross compiling. --echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_c_cross'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 --else -- if test "$cross_compiling" = yes; then -- ac_cv_cross=yes --else --cat > conftest.$ac_ext <<EOF --#line 787 "configure" --#include "confdefs.h" --main(){return(0);} --EOF --eval $ac_link --if test -s conftest && (./conftest; exit) 2>/dev/null; then -- ac_cv_c_cross=no -+ CPP="$ac_cv_prog_CPP" - else -- ac_cv_c_cross=yes --fi --fi --rm -fr conftest* -+ ac_cv_prog_CPP="$CPP" - fi --cross_compiling=$ac_cv_c_cross --echo "$ac_t""$ac_cv_c_cross" 1>&4 -+echo "$ac_t""$CPP" 1>&6 - --echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -+echo "configure:1101: checking for ANSI C header files" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 808 "configure" -+#line 1106 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> - #include <string.h> - #include <float.h> - EOF --eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --ac_err=`grep -v '^ *+' conftest.out` -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no - fi -@@ -826,7 +1157,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 830 "configure" -+#line 1131 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -844,7 +1175,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 848 "configure" -+#line 1149 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -862,10 +1193,10 @@ - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then -- ac_cv_header_stdc=no -+ : - else --cat > conftest.$ac_ext <<EOF --#line 869 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 1170 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -876,17 +1207,22 @@ - exit (0); } - - EOF --eval $ac_link --if test -s conftest && (./conftest; exit) 2>/dev/null; then -+if { (eval echo configure:1181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - : - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - ac_cv_header_stdc=no - fi --fi - rm -fr conftest* - fi -+ -+fi - fi --echo "$ac_t""$ac_cv_header_stdc" 1>&4 -+ -+echo "$ac_t""$ac_cv_header_stdc" 1>&6 - if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF - #define STDC_HEADERS 1 -@@ -894,20 +1230,22 @@ - - fi - --echo $ac_n "checking for size_t""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_type_size_t'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for size_t""... $ac_c" 1>&6 -+echo "configure:1205: checking for size_t" >&5 -+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 903 "configure" -+#line 1210 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS - #include <stdlib.h> -+#include <stddef.h> - #endif - EOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "size_t" >/dev/null 2>&1; then -+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes - else -@@ -917,7 +1255,7 @@ - rm -f conftest* - - fi --echo "$ac_t""$ac_cv_type_size_t" 1>&4 -+echo "$ac_t""$ac_cv_type_size_t" 1>&6 - if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF - #define size_t unsigned -@@ -925,25 +1263,29 @@ - - fi - --echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -+echo "configure:1238: checking for ANSI C header files" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 934 "configure" -+#line 1243 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> - #include <string.h> - #include <float.h> - EOF --eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --ac_err=`grep -v '^ *+' conftest.out` -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no - fi -@@ -952,7 +1294,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 956 "configure" -+#line 1268 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -970,7 +1312,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 974 "configure" -+#line 1286 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -988,10 +1330,10 @@ - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then -- ac_cv_header_stdc=no -+ : - else --cat > conftest.$ac_ext <<EOF --#line 995 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 1307 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1002,17 +1344,22 @@ - exit (0); } - - EOF --eval $ac_link --if test -s conftest && (./conftest; exit) 2>/dev/null; then -+if { (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - : - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - ac_cv_header_stdc=no - fi --fi - rm -fr conftest* - fi -+ -+fi - fi --echo "$ac_t""$ac_cv_header_stdc" 1>&4 -+ -+echo "$ac_t""$ac_cv_header_stdc" 1>&6 - if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF - #define STDC_HEADERS 1 -@@ -1022,37 +1369,41 @@ - - for ac_hdr in string.h malloc.h sys/types.h - do --ac_safe=`echo "$ac_hdr" | tr './\055' '___'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:1345: checking for $ac_hdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1032 "configure" -+#line 1350 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF --eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --ac_err=`grep -v '^ *+' conftest.out` -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* - fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&4 -- ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF - #define $ac_tr_hdr 1 - EOF - - else -- echo "$ac_t""no" 1>&4 -+ echo "$ac_t""no" 1>&6 - fi - done - -@@ -1061,30 +1412,32 @@ - *bison*) - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! --echo $ac_n "checking for working alloca.h""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -+echo "configure:1387: checking for working alloca.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1070 "configure" -+#line 1392 "configure" - #include "confdefs.h" - #include <alloca.h> --int main() { return 0; } --int t() { -+int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if eval $ac_link; then -+if { (eval echo configure:1399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no - fi - rm -f conftest* -- - fi --echo "$ac_t""$ac_cv_header_alloca_h" 1>&4 -+ -+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 - if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF - #define HAVE_ALLOCA_H 1 -@@ -1092,70 +1445,78 @@ - - fi - --echo $ac_n "checking for alloca""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking for alloca""... $ac_c" 1>&6 -+echo "configure:1420: checking for alloca" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1101 "configure" -+#line 1425 "configure" - #include "confdefs.h" - - #ifdef __GNUC__ - # define alloca __builtin_alloca - #else --# if HAVE_ALLOCA_H --# include <alloca.h> -+# ifdef _MSC_VER -+# include <malloc.h> -+# define alloca _alloca - # else --# ifdef _AIX -- #pragma alloca -+# if HAVE_ALLOCA_H -+# include <alloca.h> - # else --# ifndef alloca /* predefined by HP cc +Olibcalls */ -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca /* predefined by HP cc +Olibcalls */ - char *alloca (); -+# endif - # endif - # endif - # endif - #endif - --int main() { return 0; } --int t() { -+int main() { - char *p = (char *) alloca(1); - ; return 0; } - EOF --if eval $ac_link; then -+if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_func_alloca=yes -+ ac_cv_func_alloca_works=yes - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_func_alloca=no -+ ac_cv_func_alloca_works=no - fi - rm -f conftest* -- - fi --echo "$ac_t""$ac_cv_func_alloca" 1>&4 --if test $ac_cv_func_alloca = yes; then -+ -+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 -+if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF - #define HAVE_ALLOCA 1 - EOF - - fi - --if test $ac_cv_func_alloca = no; then -+if test $ac_cv_func_alloca_works = no; then - # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. -- ALLOCA=alloca.o -+ ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF - #define C_ALLOCA 1 - EOF - - --echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -+echo "configure:1485: checking whether alloca needs Cray hooks" >&5 -+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1159 "configure" -+#line 1490 "configure" - #include "confdefs.h" - #if defined(CRAY) && ! defined(CRAY2) - webecray -@@ -1175,154 +1536,75 @@ - rm -f conftest* - - fi --echo "$ac_t""$ac_cv_os_cray" 1>&4 --if test $ac_cv_os_cray = yes; then --echo $ac_n "checking for _getb67""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 --else -- cat > conftest.$ac_ext <<EOF --#line 1186 "configure" --#include "confdefs.h" --#include <ctype.h> /* Arbitrary system header to define __stub macros. */ --/* Override any gcc2 internal prototype to avoid an error. */ --char _getb67(); -- --int main() { return 0; } --int t() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub__getb67) || defined (__stub____getb67) --choke me --#else --_getb67(); --#endif -- --; return 0; } --EOF --if eval $ac_link; then -- rm -rf conftest* -- eval "ac_cv_func__getb67=yes" --else -- rm -rf conftest* -- eval "ac_cv_func__getb67=no" --fi --rm -f conftest* -- --fi --if eval "test \"`echo '$ac_cv_func_'_getb67`\" = yes"; then -- echo "$ac_t""yes" 1>&4 -- cat >> confdefs.h <<\EOF --#define CRAY_STACKSEG_END _getb67 --EOF - --else -- echo "$ac_t""no" 1>&4 --echo $ac_n "checking for GETB67""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo "$ac_t""$ac_cv_os_cray" 1>&6 -+if test $ac_cv_os_cray = yes; then -+for ac_func in _getb67 GETB67 getb67; do -+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:1515: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1229 "configure" -+#line 1520 "configure" - #include "confdefs.h" --#include <ctype.h> /* Arbitrary system header to define __stub macros. */ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func(); below. */ -+#include <assert.h> - /* Override any gcc2 internal prototype to avoid an error. */ --char GETB67(); -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - --int main() { return 0; } --int t() { -+int main() { - - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_GETB67) || defined (__stub___GETB67) -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) - choke me - #else --GETB67(); -+$ac_func(); - #endif - - ; return 0; } - EOF --if eval $ac_link; then -+if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func_GETB67=yes" -+ eval "ac_cv_func_$ac_func=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_GETB67=no" -+ eval "ac_cv_func_$ac_func=no" - fi - rm -f conftest* -- --fi --if eval "test \"`echo '$ac_cv_func_'GETB67`\" = yes"; then -- echo "$ac_t""yes" 1>&4 -- cat >> confdefs.h <<\EOF --#define CRAY_STACKSEG_END GETB67 --EOF -- --else -- echo "$ac_t""no" 1>&4 --echo $ac_n "checking for getb67""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 --else -- cat > conftest.$ac_ext <<EOF --#line 1272 "configure" --#include "confdefs.h" --#include <ctype.h> /* Arbitrary system header to define __stub macros. */ --/* Override any gcc2 internal prototype to avoid an error. */ --char getb67(); -- --int main() { return 0; } --int t() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_getb67) || defined (__stub___getb67) --choke me --#else --getb67(); --#endif -- --; return 0; } --EOF --if eval $ac_link; then -- rm -rf conftest* -- eval "ac_cv_func_getb67=yes" --else -- rm -rf conftest* -- eval "ac_cv_func_getb67=no" - fi --rm -f conftest* - --fi --if eval "test \"`echo '$ac_cv_func_'getb67`\" = yes"; then -- echo "$ac_t""yes" 1>&4 -- cat >> confdefs.h <<\EOF --#define CRAY_STACKSEG_END getb67 -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<EOF -+#define CRAY_STACKSEG_END $ac_func - EOF - -+ break - else -- echo "$ac_t""no" 1>&4 --fi -- --fi -- -+ echo "$ac_t""no" 1>&6 - fi - -+done - fi - --echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&4 --if eval "test \"`echo '${'ac_cv_c_stack_direction'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&4 -+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -+echo "configure:1570: checking stack direction for C alloca" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 - else --cat > conftest.$ac_ext <<EOF --#line 1326 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 1578 "configure" - #include "confdefs.h" - find_stack_direction () - { -@@ -1341,16 +1623,21 @@ - exit (find_stack_direction() < 0); - } - EOF --eval $ac_link --if test -s conftest && (./conftest; exit) 2>/dev/null; then -+if { (eval echo configure:1597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - ac_cv_c_stack_direction=1 - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - ac_cv_c_stack_direction=-1 - fi --fi - rm -fr conftest* - fi --echo "$ac_t""$ac_cv_c_stack_direction" 1>&4 -+ -+fi -+ -+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 - cat >> confdefs.h <<EOF - #define STACK_DIRECTION $ac_cv_c_stack_direction - EOF -@@ -1361,9 +1648,7 @@ - esac - - trap '' 1 2 15 --if test -w $cache_file; then --echo "updating cache $cache_file" --cat > $cache_file <<\EOF -+cat > confcache <<\EOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure - # scripts and configure runs. It is not useful on other systems. -@@ -1379,15 +1664,38 @@ - # --recheck option to rerun configure. - # - EOF --# Ultrix sh set writes to stderr and can't be redirected directly. -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, don't put newlines in cache variables' values. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. - (set) 2>&1 | -- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \ -- >> $cache_file -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache -+if cmp -s $cache_file confcache; then -+ : - else --echo "not updating unwritable cache $cache_file" -+ if test -w $cache_file; then -+ echo "updating cache $cache_file" -+ cat confcache > $cache_file -+ else -+ echo "not updating unwritable cache $cache_file" -+ fi - fi -+rm -f confcache - --trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15 -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - - test "x$prefix" = xNONE && prefix=$ac_default_prefix - # Let make expand exec_prefix. -@@ -1410,7 +1718,7 @@ - echo creating $CONFIG_STATUS - rm -f $CONFIG_STATUS - cat > $CONFIG_STATUS <<EOF --#!/bin/sh -+#! /bin/sh - # Generated automatically by configure. - # Run this file to recreate the current configuration. - # This directory was configured as follows, -@@ -1429,7 +1737,7 @@ - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -- echo "$CONFIG_STATUS generated by autoconf version 2.1" -+ echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; -@@ -1440,27 +1748,45 @@ - ac_given_srcdir=$srcdir - ac_given_INSTALL="$INSTALL" - --trap 'rm -fr Makefile config.h:conf.in conftest*; exit 1' 1 2 15 -+trap 'rm -fr `echo "Makefile config.h:conf.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+EOF -+cat >> $CONFIG_STATUS <<EOF - --# Protect against being on the right side of a sed subst in config.status. --sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; -- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF -+# Protect against being on the right side of a sed subst in config.status. -+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; -+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF - $ac_vpsub - $extrasub -+s%@SHELL@%$SHELL%g - s%@CFLAGS@%$CFLAGS%g - s%@CPPFLAGS@%$CPPFLAGS%g - s%@CXXFLAGS@%$CXXFLAGS%g -+s%@FFLAGS@%$FFLAGS%g - s%@DEFS@%$DEFS%g - s%@LDFLAGS@%$LDFLAGS%g - s%@LIBS@%$LIBS%g - s%@exec_prefix@%$exec_prefix%g - s%@prefix@%$prefix%g - s%@program_transform_name@%$program_transform_name%g -+s%@bindir@%$bindir%g -+s%@sbindir@%$sbindir%g -+s%@libexecdir@%$libexecdir%g -+s%@datadir@%$datadir%g -+s%@sysconfdir@%$sysconfdir%g -+s%@sharedstatedir@%$sharedstatedir%g -+s%@localstatedir@%$localstatedir%g -+s%@libdir@%$libdir%g -+s%@includedir@%$includedir%g -+s%@oldincludedir@%$oldincludedir%g -+s%@infodir@%$infodir%g -+s%@mandir@%$mandir%g - s%@LN_S@%$LN_S%g - s%@YACC@%$YACC%g - s%@CC@%$CC%g - s%@RANLIB@%$RANLIB%g -+s%@AR@%$AR%g - s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@SET_MAKE@%$SET_MAKE%g - s%@CPP@%$CPP%g -@@ -1468,27 +1794,63 @@ - - CEOF - EOF -+ -+cat >> $CONFIG_STATUS <<\EOF -+ -+# Split the substitutions into bite-sized pieces for seds with -+# small command number limits, like on Digital OSF/1 and HP-UX. -+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -+ac_file=1 # Number of current file. -+ac_beg=1 # First line for current file. -+ac_end=$ac_max_sed_cmds # Line after last line for current file. -+ac_more_lines=: -+ac_sed_cmds="" -+while $ac_more_lines; do -+ if test $ac_beg -gt 1; then -+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file -+ else -+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file -+ fi -+ if test ! -s conftest.s$ac_file; then -+ ac_more_lines=false -+ rm -f conftest.s$ac_file -+ else -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds="sed -f conftest.s$ac_file" -+ else -+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" -+ fi -+ ac_file=`expr $ac_file + 1` -+ ac_beg=$ac_end -+ ac_end=`expr $ac_end + $ac_max_sed_cmds` -+ fi -+done -+if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds=cat -+fi -+EOF -+ - cat >> $CONFIG_STATUS <<EOF - - CONFIG_FILES=\${CONFIG_FILES-"Makefile"} - EOF - cat >> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -- # Support "outfile[:infile]", defaulting infile="outfile.in". -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in -- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - -- # Adjust relative srcdir, etc. for subdirectories. -+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" -- ac_dir_suffix="/$ac_dir" -+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else -@@ -1509,6 +1871,7 @@ - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac -+ - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." -@@ -1517,14 +1880,16 @@ - # $configure_input" ;; - *) ac_comsub= ;; - esac -+ -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub - s%@configure_input@%$configure_input%g - s%@srcdir@%$srcdir%g - s%@top_srcdir@%$top_srcdir%g - s%@INSTALL@%$INSTALL%g --" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file -+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file - fi; done --rm -f conftest.subs -+rm -f conftest.s* - - # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where - # NAME is the cpp macro being defined and VALUE is the value it is being given. -@@ -1545,11 +1910,17 @@ - ac_eC=' ' - ac_eD='%g' - --CONFIG_HEADERS=${CONFIG_HEADERS-"config.h:conf.in"} -+if test "${CONFIG_HEADERS+set}" != set; then -+EOF -+cat >> $CONFIG_STATUS <<EOF -+ CONFIG_HEADERS="config.h:conf.in" -+EOF -+cat >> $CONFIG_STATUS <<\EOF -+fi - for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then -- # Support "outfile[:infile]", defaulting infile="outfile.in". -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in -- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac -@@ -1557,19 +1928,20 @@ - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out -- cp $ac_given_srcdir/$ac_file_in conftest.in -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -+ cat $ac_file_inputs > conftest.in - - EOF - - # Transform confdefs.h into a sed script conftest.vals that substitutes - # the proper values into config.h.in to produce config.h. And first: --# Protect against being on the right side of a sed subst in config.status. -+# Protect against being on the right side of a sed subst in config.status. - # Protect against being in an unquoted here document in config.status. - rm -f conftest.vals - cat > conftest.hdr <<\EOF - s/[\\&%]/\\&/g - s%[\\$`]%\\&%g --s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp - s%ac_d%ac_u%gp - s%ac_u%ac_e%gp - EOF -@@ -1585,8 +1957,6 @@ - - # Break up conftest.vals because some shells have a limit on - # the size of here documents, and old seds have small limits too. --# Maximum number of lines to put in a single here document. --ac_max_here_lines=12 - - rm -f conftest.tail - while : -@@ -1617,16 +1987,26 @@ - echo "$ac_file is unchanged" - rm -f conftest.h - else -+ # Remove last slash and all that follows it. Not all systems have dirname. -+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -+ # The file is in a subdirectory. -+ test ! -d "$ac_dir" && mkdir "$ac_dir" -+ fi - rm -f $ac_file - mv conftest.h $ac_file - fi - fi; done - -+EOF -+cat >> $CONFIG_STATUS <<EOF - -+EOF -+cat >> $CONFIG_STATUS <<\EOF - test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h - exit 0 - EOF - chmod +x $CONFIG_STATUS - rm -fr confdefs* $ac_clean_files --test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS -+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - |