Fixed to get rid of spurious _ for common blocks under NT.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@601 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 26 insertions, 2 deletions

diff --git a/lib/make/configure.pl b/lib/make/configure.pl
index 3f54c469..8b78bed6 100755
--- a/lib/make/configure.pl
+++ b/lib/make/configure.pl
@@ -72,7 +72,20 @@ EOT
       {
 	$name = $1;
 	$underscores = $2;
-      
+
+	# Extremely quick hack to sort out problems later on with common block
+	# names.
+
+	if($_ =~ m:_TEST_NAME:i)
+	{
+	  $symbols_preceeded_by_underscores=1;
+	}
+	else
+	{
+	  $symbols_preceeded_by_underscores=0;
+	}
+
+	# Find out suffices.
 	if($name =~ m:TEST_NAME:)
 	{
 	  print "Uppercase - ";
@@ -197,7 +210,18 @@ EOT
       $prefix = $1;
       $name = $2;
       $underscores = $3;
-      
+
+      # This is a pain.  If all symbols have underscores, need to remove
+      # the first one here.
+
+      if($symbols_preceeded_by_underscores)
+      {
+	if($prefix =~ m:^_(.*):)
+	{
+	  $prefix = $1;
+	}
+      }
+
       if($name =~ m:TEST_COMMON:)
       {
 	print "Uppercase - ";