From bd184b7aded0565ffe0eb75cf90a094e64dc2b92 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 18 Oct 2000 10:43:07 +0000
Subject: [PATCH] regex regression test update

[SVN r7996]
---
 configure                | 35 ++++++++++++-----------------------
 configure.in             | 17 +++--------------
 demo/regress/makefile.in |  3 ++-
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/configure b/configure
index fa60e641..605e1a31 100644
--- a/configure
+++ b/configure
@@ -3444,22 +3444,10 @@ echo "$ac_rules" >> ./lib/makefile.in
 
 
 
-if test "$enable_ms_windows" != "no"; then
-ac_regress="r1$ac_exe_ext"
-fi
-ac_regress="$ac_regress r2$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r3$ac_exe_ext"
-fi
+ac_regress="$ac_regress r1$ac_exe_ext"
 
 if test "$enable_wstring" != "no"; then
-if test "$enable_ms_windows" != "no"; then
-ac_regress="$ac_regress r4$ac_exe_ext"
-fi
-ac_regress="$ac_regress r5$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r6$ac_exe_ext"
-fi
+ac_regress="$ac_regress r2$ac_exe_ext"
 fi
 
 
@@ -3526,9 +3514,9 @@ old_libs="$LIBS"
 LIBS="conf2.cpp $old_libs"
 
 echo $ac_n "checking for link time template merging""... $ac_c" 1>&6
-echo "configure:3530: checking for link time template merging" >&5
+echo "configure:3518: checking for link time template merging" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3532 "configure"
+#line 3520 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -3541,7 +3529,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3565,9 +3553,9 @@ if eval "$CXX $CXXFLAGS -c conf2.cpp" && eval "ar -rc libconf2.a conf2$ac_obj_ex
 LIBS="-L./ -lconf2 $old_libs"
 
 echo $ac_n "checking for link time template merging from archive files""... $ac_c" 1>&6
-echo "configure:3569: checking for link time template merging from archive files" >&5
+echo "configure:3557: checking for link time template merging from archive files" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3571 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -3580,7 +3568,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3709,9 +3697,9 @@ old_libs="$LIBS"
 LIBS="conf2.cpp $old_libs"
 
 echo $ac_n "checking for link time template merging of switch statements""... $ac_c" 1>&6
-echo "configure:3713: checking for link time template merging of switch statements" >&5
+echo "configure:3701: checking for link time template merging of switch statements" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+#line 3703 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -3724,7 +3712,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4103,5 +4091,6 @@ rm -f jm_opt.out
 
 
 
+
 
 
diff --git a/configure.in b/configure.in
index 8f924bb4..fcf0965a 100644
--- a/configure.in
+++ b/configure.in
@@ -1422,22 +1422,10 @@ AC_SUBST(ac_all_h)
 AC_SUBST(ac_all_cpp)
 AC_SUBST(ac_all_dep)
 
-if test "$enable_ms_windows" != "no"; then
-ac_regress="r1$ac_exe_ext"
-fi
-ac_regress="$ac_regress r2$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r3$ac_exe_ext"
-fi
+ac_regress="$ac_regress r1$ac_exe_ext"
 
 if test "$enable_wstring" != "no"; then
-if test "$enable_ms_windows" != "no"; then
-ac_regress="$ac_regress r4$ac_exe_ext"
-fi
-ac_regress="$ac_regress r5$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r6$ac_exe_ext"
-fi
+ac_regress="$ac_regress r2$ac_exe_ext"
 fi
 
 AC_SUBST(ac_regress)
@@ -1719,5 +1707,6 @@ rm -f jm_opt.out
 
 
 
+
 
 
diff --git a/demo/regress/makefile.in b/demo/regress/makefile.in
index 27d6fad2..1f441f58 100644
--- a/demo/regress/makefile.in
+++ b/demo/regress/makefile.in
@@ -2,7 +2,7 @@
 # very basic makefile for regression tests
 #
 CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
+CXXFLAGS=@CXXFLAGS@ -I../../../../
 LIBS=@LIBS@ -L../../lib -lregex++
 EXE=@ac_exe_ext@
 OBJ=@ac_obj_ext@
@@ -41,5 +41,6 @@ r2$(EXE) ::  tests.cpp parse.cpp regress.cpp
 
 
 
+