CVS: swish-e configure,1.37,1.38 configure.in,1.36,1.37

[Bill M. <whm...@us...>]

Update of /cvsroot/swishe/swish-e
In directory usw-pr-cvs1:/tmp/cvs-serv6166

Modified Files:
	configure configure.in 
Log Message:
This is a merge of the updates from 2.2.1 to 2.2.2. 
It was a manual merge as it seemed easier than trying to resolve
all the conflicts.

Some of the conflicts seem lame:

<<<<<<< index.c
$Id: index.c,v 1.201 2002/10/09 00:25:47 whmoseley Exp $
=======
$Id: index.c,v 1.198.2.3 2002/10/11 00:18:06 whmoseley Exp $
>>>>>>> 1.198.2.3

That was the only conflict in that file.  Shouldn't CVS realize this??





Index: configure
===================================================================
RCS file: /cvsroot/swishe/swish-e/configure,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- configure	7 Nov 2002 01:56:21 -0000	1.37
+++ configure	14 Nov 2002 21:11:22 -0000	1.38
@@ -1,19 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.54.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
[...1634 lines suppressed...]
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
 
       rm -f $ac_file
       mv $tmp/config.h $ac_file

Index: configure.in
===================================================================
RCS file: /cvsroot/swishe/swish-e/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- configure.in	7 Nov 2002 01:56:21 -0000	1.36
+++ configure.in	14 Nov 2002 21:11:23 -0000	1.37
@@ -7,7 +7,7 @@
 
 dnl revision name
 AC_SUBST(VERSION)
-VERSION=2.3-dev-03
+VERSION=2.3-dev-04
 
 dnl Corresponds to NAME in src/Makefile.in
 AC_SUBST(PROJECT)