Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1136
diff -u -r1.1136 automake.in
--- automake.in	2001/06/03 17:16:40	1.1136
+++ automake.in	2001/06/05 16:27:13
@@ -2512,13 +2512,26 @@
 	# Canonicalize names and check for misspellings.
 	my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_LDFLAGS',
 					      '_SOURCES', '_OBJECTS',
-					      '_DEPENDENCIES');
+					      '_DEPENDENCIES', '_CFLAGS');
 
 	if (! &variable_defined ($xlib . '_LDFLAGS'))
 	{
 	    # Define the lib_LDFLAGS variable.
 	    &define_variable ($xlib . '_LDFLAGS', '');
 	}
+
+	# Tell the source code what library we are building
+	my $tempvariable = '';
+	if ( &variable_defined ($xlib . '_CFLAGS'))
+	{
+	    # Define the lib_CFLAGS variable.
+	    $tempvariable .= &variable_value ($xlib . '_CFLAGS');
+	    &variable_delete ($xlib . '_CFLAGS');
+	}
+	my $libname_short = $xlib;
+	$libname_short =~ s/_la$//  ;
+	$libname_short = uc ($libname_short);
+	&define_variable ($xlib . '_CFLAGS', ' -D' . $libname_short . '_COMPILATION ' . $tempvariable);
 
 	# Check that the library fits the standard naming convention.
     	my $libname_rx = "^lib.*\.la";