1.1 --- a/common/autoconf/generated-configure.sh Mon Feb 04 10:53:38 2013 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Mon Feb 04 11:02:03 2013 +0100
1.3 @@ -3723,7 +3723,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1359376859
1.8 +DATE_WHEN_GENERATED=1359971740
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -10778,7 +10778,8 @@
1.13 as_fn_error $? "Milestone must have a value" "$LINENO" 5
1.14 elif test "x$with_milestone" != x; then
1.15 MILESTONE="$with_milestone"
1.16 -else
1.17 +fi
1.18 +if test "x$MILESTONE" = x; then
1.19 MILESTONE=internal
1.20 fi
1.21
1.22 @@ -29247,6 +29248,12 @@
1.23 fi
1.24
1.25
1.26 +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
1.27 +# this doesn't make sense so we remove it.
1.28 +if test "x$COMPILE_TYPE" = xcross; then
1.29 + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
1.30 +fi
1.31 +
1.32 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
1.33
1.34 # Print a helpful message on how to acquire the necessary build dependency.
