diff -r 2f8fd30f02e6 -r bebeaa04ab8e common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Tue Jan 22 19:30:52 2013 -0500
+++ b/common/autoconf/generated-configure.sh	Mon Feb 04 18:08:42 2013 -0500
@@ -3731,7 +3731,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1358901036
+DATE_WHEN_GENERATED=1359938124
 
 ###############################################################################
 #
@@ -10786,7 +10786,8 @@
   as_fn_error $? "Milestone must have a value" "$LINENO" 5
 elif test "x$with_milestone" != x; then
     MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
   MILESTONE=internal
 fi
 
@@ -29255,6 +29256,12 @@
 fi
 
 
+# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
+# this doesn't make sense so we remove it.
+if test "x$COMPILE_TYPE" = xcross; then
+  X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
+fi
+
 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
 
     # Print a helpful message on how to acquire the necessary build dependency.