dinput: Use a 1x1 clipping rect instead of warping the mouse in exclusive mode.
[wine] / configure
index c763328..ad73d52 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Wine 1.3.12.
+# Generated by GNU Autoconf 2.67 for Wine 1.3.18.
 #
 # Report bugs to <wine-devel@winehq.org>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Wine'
 PACKAGE_TARNAME='wine'
-PACKAGE_VERSION='1.3.12'
-PACKAGE_STRING='Wine 1.3.12'
+PACKAGE_VERSION='1.3.18'
+PACKAGE_STRING='Wine 1.3.18'
 PACKAGE_BUGREPORT='wine-devel@winehq.org'
 PACKAGE_URL='http://www.winehq.org'
 
@@ -657,12 +657,12 @@ QUICKTIMELIB
 LIBOPENCL
 FRAMEWORK_OPENAL
 COREAUDIO
+SECURITYLIB
 DISKARBITRATIONLIB
 LDEXECFLAGS
 APPLICATIONSERVICESLIB
 IOKITLIB
 COREFOUNDATIONLIB
-SECURITYLIB
 DLLWRAP
 DLLTOOL
 LDD
@@ -806,6 +806,7 @@ with_xcomposite
 with_xcursor
 with_xinerama
 with_xinput
+with_xinput2
 with_xml
 with_xrandr
 with_xrender
@@ -813,6 +814,7 @@ with_xshape
 with_xshm
 with_xslt
 with_xxf86vm
+with_zlib
 with_wine_tools
 with_wine64
 enable_largefile
@@ -1373,7 +1375,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 Wine 1.3.12 to adapt to many kinds of systems.
+\`configure' configures Wine 1.3.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1442,7 +1444,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Wine 1.3.12:";;
+     short | recursive ) echo "Configuration of Wine 1.3.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1496,6 +1498,7 @@ Optional Packages:
   --without-xcursor       do not use the Xcursor extension
   --without-xinerama      do not use Xinerama (multi-monitor support)
   --without-xinput        do not use the Xinput extension
+  --without-xinput2       do not use the Xinput 2 extension
   --without-xml           do not use XML
   --without-xrandr        do not use Xrandr (resolution changes)
   --without-xrender       do not use the Xrender extension
@@ -1503,6 +1506,7 @@ Optional Packages:
   --without-xshm          do not use XShm (shared memory extension)
   --without-xslt          do not use XSLT
   --without-xxf86vm       do not use XFree video mode extension
+  --without-zlib          do not use Zlib (data compression)
   --with-wine-tools=DIR   use Wine tools from directory DIR
   --with-wine64=DIR       use the 64-bit Wine in DIR for a Wow64 build
   --with-x                use the X Window System
@@ -1587,7 +1591,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Wine configure 1.3.12
+Wine configure 1.3.18
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2105,7 +2109,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 Wine $as_me 1.3.12, which was
+It was created by Wine $as_me 1.3.18, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2720,6 +2724,12 @@ if test "${with_xinput+set}" = set; then :
 fi
 
 
+# Check whether --with-xinput2 was given.
+if test "${with_xinput2+set}" = set; then :
+  withval=$with_xinput2; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi
+fi
+
+
 # Check whether --with-xml was given.
 if test "${with_xml+set}" = set; then :
   withval=$with_xml;
@@ -2762,6 +2772,12 @@ if test "${with_xxf86vm+set}" = set; then :
 fi
 
 
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib; if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi
+fi
+
+
 
 # Check whether --with-wine-tools was given.
 if test "${with_wine_tools+set}" = set; then :
@@ -5774,6 +5790,7 @@ for ac_header in \
        OpenAL/al.h \
        OpenCL/opencl.h \
        QuickTime/ImageCompression.h \
+       Security/Security.h \
        alias.h \
        alsa/asoundlib.h \
        arpa/inet.h \
@@ -6510,9 +6527,7 @@ fi
     LDSHARED="\$(CC) -dynamiclib"
     STRIP="$STRIP -x"
     LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
-        SECURITYLIB="-framework Security -framework CoreFoundation"
-
-    COREFOUNDATIONLIB="-framework CoreFoundation"
+        COREFOUNDATIONLIB="-framework CoreFoundation"
 
     IOKITLIB="-framework IOKit -framework CoreFoundation"
 
@@ -6525,6 +6540,12 @@ fi
                 DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation"
 
     fi
+    if test "$ac_cv_header_Security_Security_h" = "yes"
+    then
+        SECURITYLIB="-framework Security -framework CoreFoundation"
+
+        with_gnutls=${with_gnutls:-no}
+    fi
     if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
     then
         if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"
@@ -8022,6 +8043,7 @@ fi
                       X11/Xcursor/Xcursor.h \
                       X11/extensions/shape.h \
                       X11/extensions/XInput.h \
+                      X11/extensions/XInput2.h \
                       X11/extensions/XShm.h \
                       X11/extensions/Xcomposite.h \
                       X11/extensions/Xinerama.h \
@@ -8218,6 +8240,18 @@ This is an error since --with-xinput was requested." "$LINENO" 5  ;;
 esac
 fi
 
+                if test "x$ac_cv_lib_soname_Xi" != x
+        then
+            if test "$ac_cv_header_X11_extensions_XInput2_h" != "yes"; then :
+  case "x$with_xinput2" in
+  x)   as_fn_append wine_notices "|XInput2 headers not found, the XInput 2 extension won't be supported." ;;
+  xno) ;;
+  *)   as_fn_error $? "XInput2 headers not found, the XInput 2 extension won't be supported.
+This is an error since --with-xinput2 was requested." "$LINENO" 5  ;;
+esac
+fi
+        fi
+
                 if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
         then
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5
@@ -8719,6 +8753,18 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+fi
+ac_fn_c_check_member "$LINENO" "XEvent" "xcookie" "ac_cv_member_XEvent_xcookie" "#ifdef HAVE_X11_XLIB_H
+#include <X11/Xlib.h>
+#endif
+"
+if test "x$ac_cv_member_XEvent_xcookie" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_XEVENT_XCOOKIE 1
+_ACEOF
+
+
 fi
 
 
@@ -9026,10 +9072,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuCreateFlow" >&5
 $as_echo "$ac_cv_lib_audio_AuCreateFlow" >&6; }
 if test "x$ac_cv_lib_audio_AuCreateFlow" = x""yes; then :
-
-$as_echo "#define HAVE_NAS 1" >>confdefs.h
-
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5
 $as_echo_n "checking for XauGetBestAuthByAddr in -lXau... " >&6; }
 if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9171,14 +9214,22 @@ then
         ac_xml_cflags="`xml2-config --cflags  2>/dev/null`"
     fi
     CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
-    for ac_header in libxml/parser.h
+    for ac_header in libxml/parser.h libxml/xmlsave.h libxml/SAX2.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default"
-if test "x$ac_cv_header_libxml_parser_h" = x""yes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXML_PARSER_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseMemory in -lxml2" >&5
+
+fi
+
+done
+
+    if test "$ac_cv_header_libxml_parser_h" = "yes" -a "$ac_cv_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_header_libxml_SAX2_h" = "yes"
+    then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseMemory in -lxml2" >&5
 $as_echo_n "checking for xmlParseMemory in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlParseMemory+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9218,11 +9269,11 @@ if test "x$ac_cv_lib_xml2_xmlParseMemory" = x""yes; then :
 
 $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
 
-                 XML2LIBS="$ac_xml_libs"
-                 XML2INCL="$ac_xml_cflags"
+             XML2LIBS="$ac_xml_libs"
+             XML2INCL="$ac_xml_cflags"
 fi
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlReadMemory in -lxml2" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlReadMemory in -lxml2" >&5
 $as_echo_n "checking for xmlReadMemory in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9264,7 +9315,7 @@ $as_echo "#define HAVE_XMLREADMEMORY 1" >>confdefs.h
 
 fi
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlNewDocPI in -lxml2" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlNewDocPI in -lxml2" >&5
 $as_echo_n "checking for xmlNewDocPI in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9306,7 +9357,7 @@ $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h
 
 fi
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetParserStructuredErrors in -lxml2" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetParserStructuredErrors in -lxml2" >&5
 $as_echo_n "checking for xmlSchemaSetParserStructuredErrors in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9348,7 +9399,7 @@ $as_echo "#define HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS 1" >>confdefs.h
 
 fi
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5
 $as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9390,7 +9441,7 @@ $as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h
 
 fi
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in -lxml2" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in -lxml2" >&5
 $as_echo_n "checking for xmlFirstElementChild in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlFirstElementChild+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -9432,7 +9483,7 @@ $as_echo "#define HAVE_XMLFIRSTELEMENTCHILD 1" >>confdefs.h
 
 fi
 
-             ac_fn_c_check_type "$LINENO" "xmlDocProperties" "ac_cv_type_xmlDocProperties" "#include <libxml/tree.h>
+        ac_fn_c_check_type "$LINENO" "xmlDocProperties" "ac_cv_type_xmlDocProperties" "#include <libxml/tree.h>
 "
 if test "x$ac_cv_type_xmlDocProperties" = x""yes; then :
 
@@ -9440,18 +9491,14 @@ $as_echo "#define HAVE_XMLDOC_PROPERTIES 1" >>confdefs.h
 
 fi
 
-
-fi
-
-done
-
+    fi
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
 if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then :
   case "x$with_xml" in
-  x)   as_fn_append wine_warnings "|libxml2 ${notice_platform}development files not found, XML won't be supported." ;;
+  x)   as_fn_append wine_warnings "|libxml2 ${notice_platform}development files not found (or too old), XML won't be supported." ;;
   xno) ;;
-  *)   as_fn_error $? "libxml2 ${notice_platform}development files not found, XML won't be supported.
+  *)   as_fn_error $? "libxml2 ${notice_platform}development files not found (or too old), XML won't be supported.
 This is an error since --with-xml was requested." "$LINENO" 5  ;;
 esac
 fi
@@ -10613,6 +10660,14 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
 
 fi
 
+fi
+if test "x$ZLIB" = "x"; then :
+  case "x$with_zlib" in
+  x)   as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;;
+  xno) ;;
+  *)   as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported.
+This is an error since --with-zlib was requested." "$LINENO" 5  ;;
+esac
 fi
 
 if test "x$enable_tools" != xno
@@ -10774,9 +10829,6 @@ if test "x$ac_cv_lib_esd_esd_open_sound" = x""yes; then :
 
              ESDLIBS="$ac_esd_libs"
 
-
-$as_echo "#define HAVE_ESD 1" >>confdefs.h
-
 fi
 
 fi
@@ -10960,10 +11012,7 @@ int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_ALSA 1" >>confdefs.h
-
-                         ALSALIBS="-lasound"
+  ALSALIBS="-lasound"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -12045,6 +12094,16 @@ _ACEOF
 
 fi
 
+test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
+test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
+test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no}
+test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no}
+test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
+test "$ac_cv_header_sys_soundcard_h" = "yes" -o \
+     "$ac_cv_header_machine_soundcard_h" = "yes" -o \
+     "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no}
+test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
+
 if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
         "$ac_cv_header_sys_soundcard_h" != "yes" -a \
         "$ac_cv_header_machine_soundcard_h" != "yes" -a \
 $as_echo "$ac_cv_cflags__Wtype_limits" >&6; }
 if test $ac_cv_cflags__Wtype_limits = yes; then :
   EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits"
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wunused-but-set-parameter" >&5
+$as_echo_n "checking whether the compiler supports -Wunused-but-set-parameter... " >&6; }
+if test "${ac_cv_cflags__Wunused_but_set_parameter+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -Wunused-but-set-parameter"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(int argc, char **argv) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_cflags__Wunused_but_set_parameter=yes
+else
+  ac_cv_cflags__Wunused_but_set_parameter=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wunused_but_set_parameter" >&5
+$as_echo "$ac_cv_cflags__Wunused_but_set_parameter" >&6; }
+if test $ac_cv_cflags__Wunused_but_set_parameter = yes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -Wunused-but-set-parameter"
 fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5
 $as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; }
@@ -12798,7 +12882,6 @@ for ac_func in \
        pwrite \
        readdir \
        readlink \
-       sched_setaffinity \
        sched_yield \
        select \
        setproctitle \
@@ -13297,6 +13380,40 @@ $as_echo "#define HAVE_ONE_ARG_MKDIR 1" >>confdefs.h
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_setaffinity" >&5
+$as_echo_n "checking for sched_setaffinity... " >&6; }
+if test "${wine_cv_have_sched_setaffinity+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _GNU_SOURCE
+#include <sched.h>
+int
+main ()
+{
+sched_setaffinity(0, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  wine_cv_have_sched_setaffinity=yes
+else
+  wine_cv_have_sched_setaffinity=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sched_setaffinity" >&5
+$as_echo "$wine_cv_have_sched_setaffinity" >&6; }
+if test "$wine_cv_have_sched_setaffinity" = "yes"
+then
+
+$as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h
+
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
@@ -14304,32 +14421,6 @@ $as_echo "$ac_cv_cpp_def___x86_64__" >&6; }
 if test $ac_cv_cpp_def___x86_64__ = yes; then :
   CFLAGS="$CFLAGS -D__x86_64__"
   LINTFLAGS="$LINTFLAGS -D__x86_64__"
-fi ;;
-  *alpha*)          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __ALPHA__" >&5
-$as_echo_n "checking whether we need to define __ALPHA__... " >&6; }
-if test "${ac_cv_cpp_def___ALPHA__+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __ALPHA__
-yes
-#endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-  ac_cv_cpp_def___ALPHA__=yes
-else
-  ac_cv_cpp_def___ALPHA__=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___ALPHA__" >&5
-$as_echo "$ac_cv_cpp_def___ALPHA__" >&6; }
-if test $ac_cv_cpp_def___ALPHA__ = yes; then :
-  CFLAGS="$CFLAGS -D__ALPHA__"
-  LINTFLAGS="$LINTFLAGS -D__ALPHA__"
 fi ;;
   *sparc*)          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc__" >&5
 $as_echo_n "checking whether we need to define __sparc__... " >&6; }
@@ -14382,6 +14473,32 @@ $as_echo "$ac_cv_cpp_def___powerpc__" >&6; }
 if test $ac_cv_cpp_def___powerpc__ = yes; then :
   CFLAGS="$CFLAGS -D__powerpc__"
   LINTFLAGS="$LINTFLAGS -D__powerpc__"
+fi ;;
+  *arm*)            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __arm__" >&5
+$as_echo_n "checking whether we need to define __arm__... " >&6; }
+if test "${ac_cv_cpp_def___arm__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __arm__
+yes
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  ac_cv_cpp_def___arm__=yes
+else
+  ac_cv_cpp_def___arm__=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___arm__" >&5
+$as_echo "$ac_cv_cpp_def___arm__" >&6; }
+if test $ac_cv_cpp_def___arm__ = yes; then :
+  CFLAGS="$CFLAGS -D__arm__"
+  LINTFLAGS="$LINTFLAGS -D__arm__"
 fi ;;
 esac
 
@@ -14799,6 +14916,8 @@ test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls
 ac_config_links="$ac_config_links wine:tools/winewrapper"
 wine_fn_config_symlink wine
 
+ac_config_commands="$ac_config_commands dlls/gdi32/dibdrv"
+
 ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv"
 
 ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv"
@@ -14987,7 +15106,7 @@ wine_fn_config_test dlls/dsound/tests dsound_test
 wine_fn_config_dll dssenh enable_dssenh
 wine_fn_config_dll dswave enable_dswave
 wine_fn_config_dll dwmapi enable_dwmapi implib
-wine_fn_config_dll dxdiagn enable_dxdiagn
+wine_fn_config_dll dxdiagn enable_dxdiagn po
 wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test
 wine_fn_config_lib dxerr8
 wine_fn_config_lib dxerr9
@@ -15101,16 +15220,19 @@ wine_fn_config_test dlls/mshtml/tests mshtml_test
 wine_fn_config_dll msi enable_msi po,implib
 wine_fn_config_test dlls/msi/tests msi_test
 wine_fn_config_dll msimg32 enable_msimg32 implib
+wine_fn_config_dll msimsg enable_msimsg
 wine_fn_config_dll msimtf enable_msimtf
 wine_fn_config_dll msisip enable_msisip
 wine_fn_config_dll msisys.ocx enable_msisys_ocx
 wine_fn_config_dll msnet32 enable_msnet32
+wine_fn_config_dll mspatcha enable_mspatcha
 wine_fn_config_dll msrle32 enable_msrle32 po
 wine_fn_config_dll mssign32 enable_mssign32
 wine_fn_config_dll mssip32 enable_mssip32
 wine_fn_config_dll mstask enable_mstask
 wine_fn_config_test dlls/mstask/tests mstask_test
 wine_fn_config_dll msvcirt enable_msvcirt
+wine_fn_config_dll msvcp100 enable_msvcp100
 wine_fn_config_dll msvcp80 enable_msvcp80
 wine_fn_config_dll msvcp90 enable_msvcp90
 wine_fn_config_test dlls/msvcp90/tests msvcp90_test
@@ -15216,6 +15338,7 @@ wine_fn_config_dll rstrtmgr enable_rstrtmgr
 wine_fn_config_dll rtutils enable_rtutils implib
 wine_fn_config_dll samlib enable_samlib
 wine_fn_config_dll sane.ds enable_sane_ds po
+wine_fn_config_dll scarddlg enable_scarddlg
 wine_fn_config_dll sccbase enable_sccbase
 wine_fn_config_dll schannel enable_schannel
 wine_fn_config_test dlls/schannel/tests schannel_test
@@ -15282,6 +15405,7 @@ wine_fn_config_test dlls/usp10/tests usp10_test
 wine_fn_config_lib uuid
 wine_fn_config_dll uxtheme enable_uxtheme implib
 wine_fn_config_test dlls/uxtheme/tests uxtheme_test
+wine_fn_config_dll vcomp enable_vcomp
 wine_fn_config_dll vdhcp.vxd enable_win16
 wine_fn_config_dll vdmdbg enable_vdmdbg implib
 wine_fn_config_dll ver.dll16 enable_win16
@@ -15440,6 +15564,7 @@ wine_fn_config_program wmic enable_wmic install
 wine_fn_config_program wordpad enable_wordpad po,install
 wine_fn_config_program write enable_write po,install
 wine_fn_config_program wscript enable_wscript install
+wine_fn_config_test programs/wscript/tests wscript.exe_test
 wine_fn_config_program xcopy enable_xcopy po,install
 wine_fn_config_makefile server enable_server
 wine_fn_config_tool tools
@@ -16044,7 +16169,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Wine $as_me 1.3.12, which was
+This file was extended by Wine $as_me 1.3.18, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16115,7 +16240,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Wine config.status 1.3.12
+Wine config.status 1.3.18
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -16258,6 +16383,7 @@ do
     "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;;
     "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;;
     "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;;
+    "dlls/gdi32/dibdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/dibdrv" ;;
     "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;;
     "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;;
     "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;;
@@ -16895,6 +17021,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "include/stamp-h":C) echo timestamp > include/stamp-h ;;
+    "dlls/gdi32/dibdrv":C) test -d "dlls/gdi32/dibdrv" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/dibdrv" >&5
+$as_echo "$as_me: creating dlls/gdi32/dibdrv" >&6;}; as_dir="dlls/gdi32/dibdrv"; as_fn_mkdir_p; } ;;
     "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/enhmfdrv" >&5
 $as_echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;}; as_dir="dlls/gdi32/enhmfdrv"; as_fn_mkdir_p; } ;;
     "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating dlls/gdi32/mfdrv" >&5