Index: docs/manual/programs/configure.xml
===================================================================
--- docs/manual/programs/configure.xml	(revision 1327088)
+++ docs/manual/programs/configure.xml	(working copy)
@@ -695,6 +695,10 @@
     <dt><code>LDFLAGS</code></dt>
     <dd>Set linker flags, e.g. <code>-L<var>libdir</var></code> if you have
       libraries in a nonstandard directory <var>libdir</var>.</dd>
+
+    <dt><code>BUILDCC</code></dt>
+    <dd>Define the C compiler command to be used for compilation of programs
+      that run on BUILD during cross-compiling, e.g. gen_test_char.</dd>
   </dl>
 </section>
 </manualpage>
Index: docs/manual/programs/configure.html.en
===================================================================
--- docs/manual/programs/configure.html.en	(revision 1327088)
+++ docs/manual/programs/configure.html.en	(working copy)
@@ -676,6 +676,10 @@
     <dt><code>LDFLAGS</code></dt>
     <dd>Set linker flags, e.g. <code>-L<var>libdir</var></code> if you have
       libraries in a nonstandard directory <var>libdir</var>.</dd>
+
+    <dt><code>BUILDCC</code></dt>
+    <dd>Define the C compiler command to be used for compilation of programs
+      that run on BUILD during cross-compiling, e.g. gen_test_char.</dd>
   </dl>
 </div></div>
 <div class="bottomlang">
@@ -685,4 +689,4 @@
 </div><div id="footer">
 <p class="apache">Copyright 2012 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Index: server/Makefile.in
===================================================================
--- server/Makefile.in	(revision 1327088)
+++ server/Makefile.in	(working copy)
@@ -24,7 +24,11 @@
 
 gen_test_char_OBJECTS = gen_test_char.lo
 gen_test_char: $(gen_test_char_OBJECTS)
-	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
+	@if test "x$(BUILDCC)" != "x"; then \
+	    $(BUILDCC) -DCROSS_COMPILE -o $@ gen_test_char.c; \
+	else \
+	    $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS); \
+	fi
 
 test_char.h: gen_test_char
 	./gen_test_char > test_char.h
Index: acinclude.m4
===================================================================
--- acinclude.m4	(revision 1327088)
+++ acinclude.m4	(working copy)
@@ -47,6 +47,7 @@
   APACHE_SUBST(progname)
   APACHE_SUBST(prefix)
   APACHE_SUBST(AWK)
+  APACHE_SUBST(BUILDCC)
   APACHE_SUBST(CC)
   APACHE_SUBST(CPP)
   APACHE_SUBST(CXX)