Index: config/auto/gdbm.pl
===================================================================
--- config/auto/gdbm.pl	(Revision 9468)
+++ config/auto/gdbm.pl	(Arbeitskopie)
@@ -25,9 +25,9 @@
 sub runstep {
     my ($verbose) = @_;
 
-    my $libs = Configure::Data->get('libs');
+    my $libs      = Configure::Data->get('libs');
     my $linkflags = Configure::Data->get('linkflags');
-    my $ccflags = Configure::Data->get('ccflags');
+    my $ccflags   = Configure::Data->get('ccflags');
     
     my $archname = $Config{archname};
     my ($cpuarch, $osname) = split('-', $archname);
@@ -56,19 +56,15 @@
             $has_gdbm = 1;
 	    print " (yes) " if $verbose;
             $Configure::Step::result = 'yes';
-
-	    Configure::Data->set(
-		has_gdbm => '1',         # for gdbmhash.t
-		gdbmhash => 'gdbmhash',  # for dynclasses.in
-	    );
 	}
     }
     unless ($has_gdbm) {
         # The Config::Data settings might have changed for the test 
-        Configure::Data->set('libs', $libs);
-        Configure::Data->set('ccflags', $ccflags);
-        Configure::Data->set('linkflags', $linkflags);
+        Configure::Data->set( libs      => $libs );
+        Configure::Data->set( ccflags   => $ccflags );
+        Configure::Data->set( linkflags => $linkflags );
         print " (no) " if $verbose;
         $Configure::Step::result = 'no';
     }
+    Configure::Data->set( has_gdbm => $has_gdbm ); # for gdbmhash.t and dynclasses.in
 }
Index: config/gen/makefiles/dynclasses.in
===================================================================
--- config/gen/makefiles/dynclasses.in	(Revision 9468)
+++ config/gen/makefiles/dynclasses.in	(Arbeitskopie)
@@ -8,7 +8,7 @@
 # gdbmhash is only built when 'libgdbm.so' is available
 PMCS = \
 foo \
-${gdbmhash} \
+#CONDITIONED_LINE(has_gdbm):gdbmhash \
 match matchrange \
 pybuiltin \
 pyclass \
Index: config/gen/makefiles.pl
===================================================================
--- config/gen/makefiles.pl	(Revision 9468)
+++ config/gen/makefiles.pl	(Arbeitskopie)
@@ -1,5 +1,5 @@
 #! perl -w
-# Copyright: 2001-2003 The Perl Foundation.  All Rights Reserved.
+# Copyright: 2001-2005 The Perl Foundation.  All Rights Reserved.
 # $Id: makefiles.pl,v 1.39 2004/11/22 19:55:50 pmichaud Exp $
 
 =head1 NAME
@@ -82,7 +80,7 @@
   genfile('config/gen/makefiles/tcl_examples.in', 'languages/tcl/examples/Makefile',
           commentType => '#', replace_slashes => 1);
   genfile('config/gen/makefiles/dynclasses.in',   'dynclasses/Makefile',
-          commentType => '#', replace_slashes => 1);
+          commentType => '#', replace_slashes => 1, conditioned_lines => 1);
   genfile('config/gen/makefiles/dynclasses_pl.in',   'dynclasses/build.pl',
           commentType => '#', replace_slashes => 0);
   genfile('config/gen/makefiles/dynoplibs.in',   'dynoplibs/Makefile',