diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 984020e9f2cc75a582960bd3a76cae84ce9ddcba..416970cb05e7bd19f7e4d1f5e322e29b34e25bcd 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.121 2006/06/17 20:26:04 mast Exp $
+dnl $Id: aclocal.m4,v 1.122 2006/06/17 21:36:20 mast Exp $
 
 dnl Some compatibility with Autoconf 2.50+. Not complete.
 dnl newer Autoconf calls substr m4_substr
@@ -395,7 +395,7 @@ define([PIKE_RETAIN_VARIABLES],
 
 define([AC_LOW_MODULE_INIT],
 [
-  # $Id: aclocal.m4,v 1.121 2006/06/17 20:26:04 mast Exp $
+  # $Id: aclocal.m4,v 1.122 2006/06/17 21:36:20 mast Exp $
 
   MY_AC_PROG_CC
 
@@ -517,8 +517,6 @@ pushdef([AC_OUTPUT],
   export CPPFLAGS
   AC_SUBST(LDFLAGS)
   export LDFLAGS
-  AC_SUBST(CCSHARED)
-  export CCSHARED
 
   PMOD_TARGETS=`echo $srcdir/*.cmod | sed -e "s/\.cmod/\.c/g" | sed -e "s|$srcdir/|\\$(SRCDIR)/|g"`
   test "$PMOD_TARGETS" = '$(SRCDIR)/*.c' && PMOD_TARGETS=
diff --git a/src/make_variables.in b/src/make_variables.in
index 85cb7a5ba935cd8c290483afb81eab1234478e66..e60bd0c8ebaca1e51a6b8ec7277b08a09e6b4389 100644
--- a/src/make_variables.in
+++ b/src/make_variables.in
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# $Id: make_variables.in,v 1.21 2006/06/17 20:55:52 mast Exp $
+# $Id: make_variables.in,v 1.22 2006/06/17 21:36:20 mast Exp $
 #
 # Note: This template is actually used only for make_variables in the
 # subdirectories; the one created in the build base dir is just an
@@ -22,7 +22,7 @@
 # top directory).
 @propagated_variables@
 #propagated_variables: CC CPP LDSHARED AR INSTALL
-#propagated_variables: BASE_CFLAGS BASE_CPPFLAGS BASE_LDFLAGS
+#propagated_variables: BASE_CFLAGS BASE_CPPFLAGS BASE_LDFLAGS CCSHARED
 #propagated_variables: OPTIMIZE WARN PROFIL
 #propagated_variables: TMP_BUILDDIR TMP_BINDIR PIKE_SRC_DIR BUILD_BASE