Index: Makefile.am
===================================================================
--- Makefile.am	(revision 138933)
+++ Makefile.am	(working copy)
@@ -112,6 +112,23 @@
 	  ${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
 
 
+# Runs the container & iterator tests with a non-standard pointer
+# type to test support for allocators which don't use standard pointers
+# XXX Need to add dependency on libtestc++.a
+check-nonstd-pointer: 
+	-@(outputdir=${glibcxx_builddir}/testsuite/nonstd_pointer; export outputdir; \
+	if test ! -d $${outputdir}; then \
+	  mkdir $${outputdir}; \
+	fi; \
+	if test ! -d $${outputdir}/bits; then \
+	  mkdir $${outputdir}/bits; \
+	fi; \
+	patch ${glibcxx_srcdir}/include/bits/allocator.h -o $${outputdir}/bits/allocator.h < ${glibcxx_srcdir}/scripts/nonstd_allocator.patch; \
+	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+	EXPECT=$(EXPECT); export EXPECT; \
+	$(MAKE) CXXFLAGS="-I$${outputdir}" RUNTESTFLAGS="$(RUNTESTFLAGS) --outdir $${outputdir} --objdir $${outputdir}" check-DEJAGNU; )
+
+
 # Runs the testsuite in parallel mode.
 libgomp_dir=${glibcxx_builddir}/../libgomp
 libgomp_flags=-B${glibcxx_builddir}/../libgomp \