svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .

1 files changed, 58 insertions, 36 deletions

diff --git a/xorg-server/configure b/xorg-server/configure
index e305008de..94a9c67ed 100644
--- a/xorg-server/configure
+++ b/xorg-server/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xorg-server 1.6.99.900.
+# Generated by GNU Autoconf 2.63 for xorg-server 1.6.99.901.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.6.99.900'
-PACKAGE_STRING='xorg-server 1.6.99.900'
+PACKAGE_VERSION='1.6.99.901'
+PACKAGE_STRING='xorg-server 1.6.99.901'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -977,6 +977,8 @@ XVFB_LIBS
 XVFB_FALSE
 XVFB_TRUE
 LD_EXPORT_SYMBOLS_FLAG
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
 CWARNFLAGS
 UTILS_SYS_LIBS
 XSERVER_SYS_LIBS
@@ -1112,7 +1114,7 @@ SECURE_RPC_TRUE
 INSTALL_SETUID_FALSE
 INSTALL_SETUID_TRUE
 XQUARTZ_SPARKLE
-APPLE_APPLICATION_ID
+LAUNCHD_ID_PREFIX
 APPLE_APPLICATION_NAME
 APPLE_APPLICATIONS_DIR
 SPARC64_VIDEO_FALSE
@@ -1310,7 +1312,7 @@ with_default_xkb_options
 with_serverconfig_path
 with_apple_applications_dir
 with_apple_application_name
-with_apple_application_id
+with_launchd_id_prefix
 enable_sparkle
 enable_builddocs
 enable_install_libxf86config
@@ -1369,6 +1371,7 @@ enable_tcp_transport
 enable_ipv6
 enable_local_transport
 enable_secure_rpc
+enable_silent_rules
 enable_shave
 '
       ac_precious_vars='build_alias
@@ -1995,7 +1998,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 1.6.99.900 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.6.99.901 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2065,7 +2068,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorg-server 1.6.99.900:";;
+     short | recursive ) echo "Configuration of xorg-server 1.6.99.901:";;
    esac
   cat <<\_ACEOF
 
@@ -2130,7 +2133,7 @@ Optional Features:
   --enable-vbe            Build Xorg with VBE module (default: enabled)
   --enable-int10-module   Build Xorg with int10 module (default: enabled)
   --enable-xorg           Build Xorg server (default: auto)
-  --enable-dmx            Build DMX server (default: no)
+  --enable-dmx            Build DMX server (default: auto)
   --enable-xvfb           Build Xvfb server (default: yes)
   --enable-xnest          Build Xnest server (default: yes)
   --enable-xquartz        Build Xquartz server for OS-X (default: auto)
@@ -2148,6 +2151,8 @@ Optional Features:
   --enable-install-setuid Install Xorg server as owned by root with setuid bit
                           (default: auto)
   --enable-secure-rpc     Enable Secure RPC
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --enable-shave          use shave to make the build pretty [default=yes]
 
 Optional Packages:
@@ -2204,9 +2209,9 @@ Optional Packages:
                           /Applications/Utilities)
   --with-apple-application-name=NAME
                           Name for the .app (default: X11)
-  --with-apple-application-id=VALUE
-                          CFBundleIdentification for the .app (default:
-                          org.x.X11)
+  --with-launchd-id-prefix=PATH
+                          Prefix to use for launchd identifiers (default:
+                          org.x)
   --with-dri-driver-path=PATH
                           Path to DRI drivers (default: ${libdir}/dri)
 
@@ -2392,7 +2397,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.6.99.900
+xorg-server configure 1.6.99.901
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2406,7 +2411,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 1.6.99.900, which was
+It was created by xorg-server $as_me 1.6.99.901, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -3257,7 +3262,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.6.99.900'
+ VERSION='1.6.99.901'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5749,13 +5754,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5752: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5757: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5755: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5760: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5758: output\"" >&5)
+  (eval echo "\"\$as_me:5763: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6947,7 +6952,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6950 "configure"' > conftest.$ac_ext
+  echo '#line 6955 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8772,11 +8777,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8775: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8780: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8779: \$? = $ac_status" >&5
+   echo "$as_me:8784: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9111,11 +9116,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9114: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9119: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9118: \$? = $ac_status" >&5
+   echo "$as_me:9123: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9216,11 +9221,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9219: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9224: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9223: \$? = $ac_status" >&5
+   echo "$as_me:9228: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9271,11 +9276,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9274: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9279: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9278: \$? = $ac_status" >&5
+   echo "$as_me:9283: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12074,7 +12079,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12077 "configure"
+#line 12082 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12170,7 +12175,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12173 "configure"
+#line 12178 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19679,14 +19684,19 @@ fi
 
 
 
-# Check whether --with-apple-application-id was given.
-if test "${with_apple_application_id+set}" = set; then
-  withval=$with_apple_application_id;  APPLE_APPLICATION_ID="${withval}"
+# Check whether --with-launchd-id-prefix was given.
+if test "${with_launchd_id_prefix+set}" = set; then
+  withval=$with_launchd_id_prefix;  LAUNCHD_ID_PREFIX="${withval}"
 else
-   APPLE_APPLICATION_ID="org.x.X11"
+   LAUNCHD_ID_PREFIX="org.x"
 fi
 
 
+
+cat >>confdefs.h <<_ACEOF
+#define LAUNCHD_ID_PREFIX "$LAUNCHD_ID_PREFIX"
+_ACEOF
+
 # Check whether --enable-sparkle was given.
 if test "${enable_sparkle+set}" = set; then
   enableval=$enable_sparkle;  XQUARTZ_SPARKLE="${enableval}"
@@ -19981,7 +19991,7 @@ fi
 if test "${enable_dmx+set}" = set; then
   enableval=$enable_dmx; DMX=$enableval
 else
-  DMX=no
+  DMX=auto
 fi
 
 # Check whether --enable-xvfb was given.
@@ -25160,6 +25170,18 @@ fi
     fi
 fi
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
 
 if test "x$GCC" = "xyes"; then
        if test "x$WERROR" = "xyes"; then
@@ -28319,7 +28341,7 @@ $as_echo "$as_me: error: Xdmx build explicitly requested, but required
 	fi
 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
-	XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
+	XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $FIXES_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
 	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
 
 
@@ -31801,7 +31823,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 1.6.99.900, which was
+This file was extended by xorg-server $as_me 1.6.99.901, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31864,7 +31886,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xorg-server config.status 1.6.99.900
+xorg-server config.status 1.6.99.901
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"