Honor CFLAGS and misc. cleanups.

PR:		10763
Submitted by:	Mikhail Teterin <mi@aldan.algebra.com>

4 files changed, 919 insertions, 7 deletions

diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 0905700..a8792db 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -3,7 +3,7 @@
 # Date created:        19 February 1998
 # Whom:                Josh Gilliam <josh@quick.net>
 #
-# $Id: Makefile,v 1.4 1998/12/23 19:33:25 obrien Exp $
+# $Id: Makefile,v 1.5 1999/03/22 01:17:24 obrien Exp $
 #
 
 DISTNAME=	dictd-1.4.9
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.cs.unc.edu/pub/users/faith/dict/ \
 MAINTAINER=	josh@quick.net
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	"--with-cflags=${CFLAGS}"
 USE_GMAKE=	yes
 ALL_TARGET=	dict
 INSTALL_TARGET=	install.dict
diff --git a/textproc/dict/files/patch-ab b/textproc/dict/files/patch-ab
index b3394b7..4591a80 100644
--- a/textproc/dict/files/patch-ab
+++ b/textproc/dict/files/patch-ab
@@ -1,13 +1,72 @@
---- Makefile.in.orig	Mon Feb 16 12:00:09 1998
-+++ Makefile.in	Fri Feb 20 03:53:10 1998
-@@ -141,8 +141,8 @@
- 	$(CC) -c $(XTRACFLAGS) $(CFLAGS) -Wno-implicit $<
+--- Makefile.in.orig	Sun Jul  5 18:09:59 1998
++++ Makefile.in	Tue Mar 23 16:38:53 1999
+@@ -35,3 +35,3 @@
+ prefix=		@prefix@
+-subdirs=        @allsubdirs@ regex # doc -- use rfc2229 instead
++subdirs=        @allsubdirs@ # regex # doc -- use rfc2229 instead
+ exec_prefix=	@exec_prefix@
+@@ -59,5 +59,5 @@
+ LDFLAGS=        @LDFLAGS@
+-XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
++XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
+ XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
+-LDLIBS=		@LIBS@ -Lregex -lregex
++LDLIBS=		@LIBS@ -lgnuregex
  
+@@ -77,13 +77,3 @@
+ 		echo making in $$subdir; \
+-	 	if [ "$$subdir" = "zlib" ]; then \
+-			(cd $$subdir \
+-			&& $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
+-			|| exit 1; \
+-		elif [ "$$subdir" = "regex" ]; then \
+-			(cd $$subdir \
+-			&& $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
+-			|| exit 1; \
+-		else \
+-			(cd $$subdir && $(MAKE)) || exit 1; \
+-		fi \
++		(cd $$subdir && $(MAKE)) || exit 1; \
+ 	done
+@@ -104,3 +94,3 @@
+ dict:: dict.c $(HEADERS) $(CLIOBJS)
+-	$(CC) $(ALLFLAGS) -o $@ $< $(CLIOBJS) $(LDLIBS)
++	$(CC) $(ALLFLAGS) -o $@ $< $(CLIOBJS) -Llibmaa -lmaa
+ 
+@@ -118,7 +108,9 @@
+ 
+-servparse.c: servparse.y
+-	$(YACC) -tdv $<
+-	cmp -s y.tab.h servparse.h || mv y.tab.h servparse.h
+-	cmp -s y.tab.c servparse.c || mv y.tab.c servparse.c
+-	-rm -f y.tab.h y.tab.c
++servparse.c: servparse.h
++
++servparse.h: servparse.y
++	$(YACC) -tdv -b serv $<
++	cmp -s serv.tab.h servparse.h || mv serv.tab.h servparse.h
++	cmp -s serv.tab.c servparse.c || mv serv.tab.c servparse.c
++	-rm -f serv.tab.h serv.tab.c
+ 
+@@ -133,7 +125,9 @@
+ 
+-clientparse.c: clientparse.y
+-	$(YACC) -tdv $<
+-	cmp -s y.tab.h clientparse.h || mv y.tab.h clientparse.h
+-	cmp -s y.tab.c clientparse.c || mv y.tab.c clientparse.c
+-	-rm -f y.tab.h y.tab.c
++clientparse.c: clientparse.h
++
++clientparse.h: clientparse.y
++	$(YACC) -tdv -b client $<
++	cmp -s client.tab.h clientparse.h || mv client.tab.h clientparse.h
++	cmp -s client.tab.c clientparse.c || mv client.tab.c clientparse.c
++	-rm -f client.tab.h client.tab.c
+ 
+@@ -143,4 +137,4 @@
  install.dict: dict
 -	install dict $(bindir)
 -	install -m 644 dict.1 $(man1_prefix)
 +	$(INSTALL) -m 755 -o bin -g bin dict $(bindir)
 +	$(INSTALL) -m 644 -o bin -g bin dict.1 $(man1_prefix)
  
- install.dictzip: dictzip
- 	install dictzip $(bindir)
diff --git a/textproc/dict/files/patch-ad b/textproc/dict/files/patch-ad
new file mode 100644
index 0000000..039774f
--- /dev/null
+++ b/textproc/dict/files/patch-ad
@@ -0,0 +1,11 @@
+--- libmaa/configure.in.orig	Sun Jul  5 18:14:34 1998
++++ libmaa/configure.in	Tue Mar 23 16:05:38 1999
+@@ -58,8 +58,2 @@
+ REALCC="$CC"
+-if test "$CC" = gcc; then
+-    CFLAGS='-g -O'
+-    WCFLAGS='-Wall -pedantic'
+-else
+-    CFLAGS='-g'
+-fi
+ 
diff --git a/textproc/dict/files/patch-ae b/textproc/dict/files/patch-ae
new file mode 100644
index 0000000..8206841
--- /dev/null
+++ b/textproc/dict/files/patch-ae
@@ -0,0 +1,841 @@
+--- libmaa/configure.orig	Sun Jul  5 21:38:05 1998
++++ libmaa/configure	Tue Mar 23 16:05:48 1999
+@@ -4,3 +4,3 @@
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.12 
++# Generated automatically using autoconf version 2.13 
+ # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+@@ -74,2 +74,3 @@
+ MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
+ # Maximum number of lines to put in a shell here document.
+@@ -357,3 +358,3 @@
+   -version | --version | --versio | --versi | --vers)
+-    echo "configure generated by autoconf version 2.12"
++    echo "configure generated by autoconf version 2.13"
+     exit 0 ;;
+@@ -527,5 +528,7 @@
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 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
+@@ -583,3 +586,3 @@
+ # Make sure we can run config.sub.
+-if $ac_config_sub sun4 >/dev/null 2>&1; then :
++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+@@ -588,3 +591,3 @@
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:590: checking host system type" >&5
++echo "configure:593: checking host system type" >&5
+ 
+@@ -595,3 +598,3 @@
+   NONE)
+-    if host_alias=`$ac_config_guess`; then :
++    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+@@ -602,3 +605,3 @@
+ 
+-host=`$ac_config_sub $host_alias`
++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -611,3 +614,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:613: checking for $ac_word" >&5
++echo "configure:616: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+@@ -618,4 +621,5 @@
+ 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=.
+@@ -640,3 +644,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:642: checking for $ac_word" >&5
++echo "configure:646: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+@@ -647,5 +651,6 @@
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+-  for ac_dir in $PATH; do
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+@@ -684,2 +689,36 @@
+ 
++  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:697: 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>&6
++fi
++ ;;
++    esac
++  fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+@@ -688,3 +727,3 @@
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:690: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+@@ -694,11 +733,13 @@
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 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 700 "configure"
++cat > conftest.$ac_ext << EOF
++
++#line 740 "configure"
+ #include "confdefs.h"
++
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+@@ -716,2 +757,8 @@
+ 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
+ 
+@@ -722,3 +769,3 @@
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:724: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+@@ -727,3 +774,3 @@
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:729: checking whether we are using GNU C" >&5
++echo "configure:776: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+@@ -736,3 +783,3 @@
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+@@ -747,7 +794,11 @@
+   GCC=yes
+-  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:753: checking whether ${CC-cc} accepts -g" >&5
++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:804: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -766,12 +817,16 @@
+ 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 "$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="-O2"
++    CFLAGS="-g"
+   fi
+ else
+-  GCC=
+-  test "${CFLAGS+set}" = set || CFLAGS="-g"
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+@@ -779,3 +834,3 @@
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:781: checking for POSIXized ISC" >&5
++echo "configure:836: checking for POSIXized ISC" >&5
+ if test -d /etc/conf/kconfig.d &&
+@@ -801,8 +856,2 @@
+ REALCC="$CC"
+-if test "$CC" = gcc; then
+-    CFLAGS='-g -O'
+-    WCFLAGS='-Wall -pedantic'
+-else
+-    CFLAGS='-g'
+-fi
+ 
+@@ -976,2 +1025,3 @@
+ # 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
+@@ -980,3 +1030,3 @@
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:982: checking for a BSD compatible install" >&5
++echo "configure:1032: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+@@ -985,3 +1035,3 @@
+ else
+-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+   for ac_dir in $PATH; do
+@@ -992,3 +1042,5 @@
+       # 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
+@@ -997,3 +1049,2 @@
+ 	    # AIX install.  It has an incompatible calling convention.
+-	    # OSF/1 installbsd also uses dspmsg, but is usable.
+ 	    :
+@@ -1027,2 +1078,4 @@
+ 
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+@@ -1032,3 +1085,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1034: checking for $ac_word" >&5
++echo "configure:1087: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+@@ -1039,4 +1092,5 @@
+ 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=.
+@@ -1063,3 +1117,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1065: checking for $ac_word" >&5
++echo "configure:1119: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
+@@ -1070,4 +1124,5 @@
+ 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=.
+@@ -1096,3 +1151,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1098: checking for $ac_word" >&5
++echo "configure:1153: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LATEX'+set}'`\" = set"; then
+@@ -1103,4 +1158,5 @@
+ 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=.
+@@ -1129,3 +1185,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1131: checking for $ac_word" >&5
++echo "configure:1187: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_FIG2DEV'+set}'`\" = set"; then
+@@ -1136,4 +1192,5 @@
+ 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=.
+@@ -1162,3 +1219,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1164: checking for $ac_word" >&5
++echo "configure:1221: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_DVIPS'+set}'`\" = set"; then
+@@ -1169,4 +1226,5 @@
+ 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=.
+@@ -1195,3 +1253,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1197: checking for $ac_word" >&5
++echo "configure:1255: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_REFBIBTEX'+set}'`\" = set"; then
+@@ -1202,4 +1260,5 @@
+ 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=.
+@@ -1228,3 +1287,3 @@
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1230: checking for $ac_word" >&5
++echo "configure:1289: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_BIBTEX'+set}'`\" = set"; then
+@@ -1235,4 +1294,5 @@
+ 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=.
+@@ -1262,3 +1322,3 @@
+     echo $ac_n "checking for main in -ldmalloc""... $ac_c" 1>&6
+-echo "configure:1264: checking for main in -ldmalloc" >&5
++echo "configure:1324: checking for main in -ldmalloc" >&5
+ ac_lib_var=`echo dmalloc'_'main | sed 'y%./+-%__p_%'`
+@@ -1270,3 +1330,3 @@
+ cat > conftest.$ac_ext <<EOF
+-#line 1272 "configure"
++#line 1332 "configure"
+ #include "confdefs.h"
+@@ -1277,3 +1337,3 @@
+ EOF
+-if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -1303,3 +1363,3 @@
+     echo $ac_n "checking for dmalloc in local source tree""... $ac_c" 1>&6
+-echo "configure:1305: checking for dmalloc in local source tree" >&5
++echo "configure:1365: checking for dmalloc in local source tree" >&5
+     if test -d dmalloc; then
+@@ -1330,3 +1390,3 @@
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1332: checking how to run the C preprocessor" >&5
++echo "configure:1392: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+@@ -1345,3 +1405,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1347 "configure"
++#line 1407 "configure"
+ #include "confdefs.h"
+@@ -1351,4 +1411,4 @@
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1413: \"$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
+@@ -1362,3 +1422,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1364 "configure"
++#line 1424 "configure"
+ #include "confdefs.h"
+@@ -1368,4 +1428,21 @@
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1430: \"$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 1441 "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:1447: \"$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
+@@ -1382,2 +1459,4 @@
+ rm -f conftest*
++fi
++rm -f conftest*
+   ac_cv_prog_CPP="$CPP"
+@@ -1391,3 +1470,3 @@
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1393: checking for ANSI C header files" >&5
++echo "configure:1472: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+@@ -1396,3 +1475,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1398 "configure"
++#line 1477 "configure"
+ #include "confdefs.h"
+@@ -1404,4 +1483,4 @@
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1485: \"$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
+@@ -1421,3 +1500,3 @@
+ cat > conftest.$ac_ext <<EOF
+-#line 1423 "configure"
++#line 1502 "configure"
+ #include "confdefs.h"
+@@ -1439,3 +1518,3 @@
+ cat > conftest.$ac_ext <<EOF
+-#line 1441 "configure"
++#line 1520 "configure"
+ #include "confdefs.h"
+@@ -1460,3 +1539,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1462 "configure"
++#line 1541 "configure"
+ #include "confdefs.h"
+@@ -1471,3 +1550,3 @@
+ EOF
+-if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -1495,3 +1574,3 @@
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:1497: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:1576: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+@@ -1500,3 +1579,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1502 "configure"
++#line 1581 "configure"
+ #include "confdefs.h"
+@@ -1509,3 +1588,3 @@
+ EOF
+-if { (eval echo configure:1511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+@@ -1533,3 +1612,3 @@
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1535: checking for $ac_hdr" >&5
++echo "configure:1614: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+@@ -1538,3 +1617,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1540 "configure"
++#line 1619 "configure"
+ #include "confdefs.h"
+@@ -1543,4 +1622,4 @@
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1624: \"$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
+@@ -1573,3 +1652,3 @@
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1575: checking for $ac_hdr" >&5
++echo "configure:1654: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+@@ -1578,3 +1657,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1580 "configure"
++#line 1659 "configure"
+ #include "confdefs.h"
+@@ -1583,4 +1662,4 @@
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1664: \"$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
+@@ -1614,3 +1693,3 @@
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:1616: checking for size_t" >&5
++echo "configure:1695: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+@@ -1619,3 +1698,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1621 "configure"
++#line 1700 "configure"
+ #include "confdefs.h"
+@@ -1628,3 +1707,3 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "size_t[^a-zA-Z_0-9]" >/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*
+@@ -1647,3 +1726,3 @@
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:1649: checking return type of signal handlers" >&5
++echo "configure:1728: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+@@ -1652,3 +1731,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1654 "configure"
++#line 1733 "configure"
+ #include "confdefs.h"
+@@ -1669,3 +1748,3 @@
+ EOF
+-if { (eval echo configure:1671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+@@ -1688,3 +1767,3 @@
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1690: checking for working const" >&5
++echo "configure:1769: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+@@ -1693,3 +1772,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1695 "configure"
++#line 1774 "configure"
+ #include "confdefs.h"
+@@ -1742,3 +1821,3 @@
+ EOF
+-if { (eval echo configure:1744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+@@ -1763,3 +1842,3 @@
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:1765: checking for inline" >&5
++echo "configure:1844: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+@@ -1770,3 +1849,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1772 "configure"
++#line 1851 "configure"
+ #include "confdefs.h"
+@@ -1777,3 +1856,3 @@
+ EOF
+-if { (eval echo configure:1779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+@@ -1803,3 +1882,3 @@
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:1805: checking whether byte ordering is bigendian" >&5
++echo "configure:1884: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+@@ -1810,3 +1889,3 @@
+ cat > conftest.$ac_ext <<EOF
+-#line 1812 "configure"
++#line 1891 "configure"
+ #include "confdefs.h"
+@@ -1821,3 +1900,3 @@
+ EOF
+-if { (eval echo configure:1823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+@@ -1825,3 +1904,3 @@
+ cat > conftest.$ac_ext <<EOF
+-#line 1827 "configure"
++#line 1906 "configure"
+ #include "confdefs.h"
+@@ -1836,3 +1915,3 @@
+ EOF
+-if { (eval echo configure:1838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+@@ -1856,3 +1935,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1858 "configure"
++#line 1937 "configure"
+ #include "confdefs.h"
+@@ -1869,3 +1948,3 @@
+ EOF
+-if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -1893,3 +1972,3 @@
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:1895: checking size of int" >&5
++echo "configure:1974: checking size of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+@@ -1901,3 +1980,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1903 "configure"
++#line 1982 "configure"
+ #include "confdefs.h"
+@@ -1912,3 +1991,3 @@
+ EOF
+-if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -1932,3 +2011,3 @@
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:1934: checking size of long" >&5
++echo "configure:2013: checking size of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+@@ -1940,3 +2019,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1942 "configure"
++#line 2021 "configure"
+ #include "confdefs.h"
+@@ -1951,3 +2030,3 @@
+ EOF
+-if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -1971,3 +2050,3 @@
+ echo $ac_n "checking size of void *""... $ac_c" 1>&6
+-echo "configure:1973: checking size of void *" >&5
++echo "configure:2052: checking size of void *" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
+@@ -1979,3 +2058,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 1981 "configure"
++#line 2060 "configure"
+ #include "confdefs.h"
+@@ -1990,3 +2069,3 @@
+ EOF
+-if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -2010,3 +2089,3 @@
+ echo $ac_n "checking size of long long int""... $ac_c" 1>&6
+-echo "configure:2012: checking size of long long int" >&5
++echo "configure:2091: checking size of long long int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then
+@@ -2018,3 +2097,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2020 "configure"
++#line 2099 "configure"
+ #include "confdefs.h"
+@@ -2029,3 +2108,3 @@
+ EOF
+-if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -2055,3 +2134,3 @@
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:2057: checking for working alloca.h" >&5
++echo "configure:2136: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+@@ -2060,3 +2139,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2062 "configure"
++#line 2141 "configure"
+ #include "confdefs.h"
+@@ -2067,3 +2146,3 @@
+ EOF
+-if { (eval echo configure:2069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2088,3 +2167,3 @@
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:2090: checking for alloca" >&5
++echo "configure:2169: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+@@ -2093,3 +2172,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2095 "configure"
++#line 2174 "configure"
+ #include "confdefs.h"
+@@ -2099,10 +2178,15 @@
+ #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
+@@ -2116,3 +2200,3 @@
+ EOF
+-if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2141,3 +2225,3 @@
+   # use ar to extract alloca.o from them instead of compiling alloca.c.
+-  ALLOCA=alloca.o
++  ALLOCA=alloca.${ac_objext}
+   cat >> confdefs.h <<\EOF
+@@ -2148,3 +2232,3 @@
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:2150: checking whether alloca needs Cray hooks" >&5
++echo "configure:2234: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+@@ -2153,3 +2237,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2155 "configure"
++#line 2239 "configure"
+ #include "confdefs.h"
+@@ -2178,3 +2262,3 @@
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2180: checking for $ac_func" >&5
++echo "configure:2264: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+@@ -2183,3 +2267,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2185 "configure"
++#line 2269 "configure"
+ #include "confdefs.h"
+@@ -2206,3 +2290,3 @@
+ EOF
+-if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2233,3 +2317,3 @@
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:2235: checking stack direction for C alloca" >&5
++echo "configure:2319: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+@@ -2241,3 +2325,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2243 "configure"
++#line 2327 "configure"
+ #include "confdefs.h"
+@@ -2260,3 +2344,3 @@
+ EOF
+-if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+@@ -2282,3 +2366,3 @@
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:2284: checking for vprintf" >&5
++echo "configure:2368: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+@@ -2287,3 +2371,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2289 "configure"
++#line 2373 "configure"
+ #include "confdefs.h"
+@@ -2310,3 +2394,3 @@
+ EOF
+-if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2334,3 +2418,3 @@
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:2336: checking for _doprnt" >&5
++echo "configure:2420: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+@@ -2339,3 +2423,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2341 "configure"
++#line 2425 "configure"
+ #include "confdefs.h"
+@@ -2362,3 +2446,3 @@
+ EOF
+-if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2389,3 +2473,3 @@
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2391: checking for $ac_func" >&5
++echo "configure:2475: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+@@ -2394,3 +2478,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2396 "configure"
++#line 2480 "configure"
+ #include "confdefs.h"
+@@ -2417,3 +2501,3 @@
+ EOF
+-if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2444,3 +2528,3 @@
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2446: checking for $ac_func" >&5
++echo "configure:2530: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+@@ -2449,3 +2533,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2451 "configure"
++#line 2535 "configure"
+ #include "confdefs.h"
+@@ -2472,3 +2556,3 @@
+ EOF
+-if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2499,3 +2583,3 @@
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2501: checking for $ac_func" >&5
++echo "configure:2585: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+@@ -2504,3 +2588,3 @@
+   cat > conftest.$ac_ext <<EOF
+-#line 2506 "configure"
++#line 2590 "configure"
+ #include "confdefs.h"
+@@ -2527,3 +2611,3 @@
+ EOF
+-if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2548,3 +2632,3 @@
+   echo "$ac_t""no" 1>&6
+-LIBOBJS="$LIBOBJS ${ac_func}.o"
++LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
+ fi
+@@ -2596,3 +2680,3 @@
+ (set) 2>&1 |
+-  case `(ac_space=' '; set) 2>&1` in
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+   *ac_space=\ *)
+@@ -2663,3 +2747,3 @@
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+     exit 0 ;;
+@@ -2683,2 +2767,3 @@
+ $extrasub
++s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+@@ -2686,2 +2771,3 @@
+ s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+@@ -2711,2 +2797,3 @@
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g