msxml3: Merge obsolete interfaces tests in a single file.
[wine] / configure
index b4da40f..51321db 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.11.
+# Generated by GNU Autoconf 2.67 for Wine 1.3.15.
 #
 # 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.11'
-PACKAGE_STRING='Wine 1.3.11'
+PACKAGE_VERSION='1.3.15'
+PACKAGE_STRING='Wine 1.3.15'
 PACKAGE_BUGREPORT='wine-devel@winehq.org'
 PACKAGE_URL='http://www.winehq.org'
 
@@ -653,13 +653,13 @@ CROSSCC
 CROSSTEST_DISABLE
 PRELINK
 CARBONLIB
+QUICKTIMELIB
 LIBOPENCL
 FRAMEWORK_OPENAL
 COREAUDIO
 DISKARBITRATIONLIB
 LDEXECFLAGS
 APPLICATIONSERVICESLIB
-QUICKTIMELIB
 IOKITLIB
 COREFOUNDATIONLIB
 SECURITYLIB
@@ -813,6 +813,7 @@ with_xshape
 with_xshm
 with_xslt
 with_xxf86vm
+with_zlib
 with_wine_tools
 with_wine64
 enable_largefile
@@ -1373,7 +1374,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.11 to adapt to many kinds of systems.
+\`configure' configures Wine 1.3.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1442,7 +1443,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Wine 1.3.11:";;
+     short | recursive ) echo "Configuration of Wine 1.3.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1503,6 +1504,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 +1589,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Wine configure 1.3.11
+Wine configure 1.3.15
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2105,7 +2107,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.11, which was
+It was created by Wine $as_me 1.3.15, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2762,6 +2764,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 :
@@ -5764,6 +5772,7 @@ for ac_header in \
        ApplicationServices/ApplicationServices.h \
        AudioToolbox/AudioConverter.h \
        AudioUnit/AudioUnit.h \
+       AudioUnit/AudioComponent.h \
        CL/cl.h \
        Carbon/Carbon.h \
        CoreAudio/CoreAudio.h \
@@ -5772,6 +5781,7 @@ for ac_header in \
        IOKit/hid/IOHIDLib.h \
        OpenAL/al.h \
        OpenCL/opencl.h \
+       QuickTime/ImageCompression.h \
        alias.h \
        alsa/asoundlib.h \
        arpa/inet.h \
@@ -5848,6 +5858,7 @@ for ac_header in \
        strings.h \
        stropts.h \
        sys/asoundlib.h \
+       sys/attr.h \
        sys/cdio.h \
        sys/elf32.h \
        sys/epoll.h \
@@ -6513,8 +6524,6 @@ fi
 
     IOKITLIB="-framework IOKit -framework CoreFoundation"
 
-    QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
-
     APPLICATIONSERVICESLIB="-framework ApplicationServices"
 
     LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
@@ -6526,8 +6535,28 @@ fi
     fi
     if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
     then
-                COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
+        if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"
+        then
+            COREAUDIO="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
+
+        else
+                        COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
+
+        fi
+                ac_save_LIBS="$LIBS"
+        LIBS="$LIBS $COREAUDIO"
+        for ac_func in AUGraphAddNode
+do :
+  ac_fn_c_check_func "$LINENO" "AUGraphAddNode" "ac_cv_func_AUGraphAddNode"
+if test "x$ac_cv_func_AUGraphAddNode" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AUGRAPHADDNODE 1
+_ACEOF
+
+fi
+done
 
+        LIBS="$ac_save_LIBS"
     fi
     if test "$ac_cv_header_OpenAL_al_h" = "yes"
     then
@@ -6563,11 +6592,18 @@ done
 
         LIBS="$ac_save_LIBS"
     fi
-    enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
     case $host_cpu in
       *powerpc*)
         LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning"          ;;
     esac
+    if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
+    then
+        QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
+
+        enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
+    else
+        as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported."
+    fi
         if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
     then
         CARBONLIB="-framework Carbon"
@@ -9143,14 +9179,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
@@ -9190,11 +9234,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
@@ -9236,7 +9280,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
@@ -9278,7 +9322,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
@@ -9320,7 +9364,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
@@ -9362,7 +9406,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
@@ -9404,7 +9448,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 :
 
@@ -9412,18 +9456,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
@@ -10585,6 +10625,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
@@ -10865,7 +10913,7 @@ fi
     fi
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then :
+if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then :
   case "x$with_gstreamer" in
   x)   as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;;
   xno) ;;
@@ -10879,9 +10927,9 @@ ALSALIBS=""
 
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_hw_params_get_access in -lasound" >&5
-$as_echo_n "checking for snd_pcm_hw_params_get_access in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access+set}" = set; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_hw_params_get_access_mask in -lasound" >&5
+$as_echo_n "checking for snd_pcm_hw_params_get_access_mask in -lasound... " >&6; }
+if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10895,27 +10943,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char snd_pcm_hw_params_get_access ();
+char snd_pcm_hw_params_get_access_mask ();
 int
 main ()
 {
-return snd_pcm_hw_params_get_access ();
+return snd_pcm_hw_params_get_access_mask ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_asound_snd_pcm_hw_params_get_access=yes
+  ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask=yes
 else
-  ac_cv_lib_asound_snd_pcm_hw_params_get_access=no
+  ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" = x""yes; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef HAVE_ALSA_ASOUNDLIB_H
@@ -10926,7 +10974,7 @@ if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
 int
 main ()
 {
-int ret = snd_pcm_hw_params_get_access(NULL, NULL)
+int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)
   ;
   return 0;
 }
@@ -12749,6 +12797,7 @@ for ac_func in \
        ftruncate \
        futimes \
        futimesat \
+       getattrlist \
        getdirentries \
        getopt_long \
        getpagesize \
@@ -12769,7 +12818,6 @@ for ac_func in \
        pwrite \
        readdir \
        readlink \
-       sched_setaffinity \
        sched_yield \
        select \
        setproctitle \
@@ -13268,6 +13316,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; }
@@ -14523,11 +14605,20 @@ install-lib:: $ac_dir/Makefile __builddeps__
 uninstall manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
        @cd $ac_dir && \$(MAKE) \$@"
 
-        if test "x$enable_maintainer_mode" = xyes && wine_fn_has_flag po $ac_flags
+        if test "x$enable_maintainer_mode" = xyes
         then
-            wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot
-            wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+            if wine_fn_has_flag mc $ac_flags
+            then
+                wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot
+                wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"$ac_dir/msg.pot: $ac_dir"
+            fi
+            if wine_fn_has_flag po $ac_flags
+            then
+                wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot
+                wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$ac_dir/rsrc.pot: $ac_dir"
+            fi
         fi
 fi
 
@@ -14604,11 +14695,20 @@ else
 $ac_dir: $ac_dir/Makefile __builddeps__ dummy
        @cd $ac_dir && \$(MAKE)"
 
-    if test "x$enable_maintainer_mode" = xyes && wine_fn_has_flag po $ac_flags
+    if test "x$enable_maintainer_mode" = xyes
     then
-        wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot
-        wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+        if wine_fn_has_flag mc $ac_flags
+        then
+            wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot
+            wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"$ac_dir/msg.pot: $ac_dir"
+        fi
+        if wine_fn_has_flag po $ac_flags
+        then
+            wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot
+            wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$ac_dir/rsrc.pot: $ac_dir"
+        fi
     fi
 
     wine_fn_has_flag install $ac_flags || return
@@ -14797,17 +14897,17 @@ wine_fn_config_dll advpack enable_advpack implib
 wine_fn_config_test dlls/advpack/tests advpack_test
 wine_fn_config_dll amstream enable_amstream
 wine_fn_config_test dlls/amstream/tests amstream_test
-wine_fn_config_dll appwiz.cpl enable_appwiz_cpl
+wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po
 wine_fn_config_dll atl enable_atl implib
 wine_fn_config_test dlls/atl/tests atl_test
 wine_fn_config_dll authz enable_authz
 wine_fn_config_dll avicap32 enable_avicap32 implib
-wine_fn_config_dll avifil32 enable_avifil32 implib
+wine_fn_config_dll avifil32 enable_avifil32 po,implib
 wine_fn_config_test dlls/avifil32/tests avifil32_test
 wine_fn_config_dll avifile.dll16 enable_win16
 wine_fn_config_dll avrt enable_avrt implib
 wine_fn_config_dll bcrypt enable_bcrypt
-wine_fn_config_dll browseui enable_browseui
+wine_fn_config_dll browseui enable_browseui po
 wine_fn_config_test dlls/browseui/tests browseui_test
 wine_fn_config_dll cabinet enable_cabinet implib
 wine_fn_config_test dlls/cabinet/tests cabinet_test
@@ -14817,15 +14917,15 @@ wine_fn_config_dll cfgmgr32 enable_cfgmgr32 implib
 wine_fn_config_dll clusapi enable_clusapi implib
 wine_fn_config_dll comcat enable_comcat
 wine_fn_config_test dlls/comcat/tests comcat_test
-wine_fn_config_dll comctl32 enable_comctl32 implib
+wine_fn_config_dll comctl32 enable_comctl32 po,implib
 wine_fn_config_test dlls/comctl32/tests comctl32_test
-wine_fn_config_dll comdlg32 enable_comdlg32 implib
+wine_fn_config_dll comdlg32 enable_comdlg32 po,implib
 wine_fn_config_test dlls/comdlg32/tests comdlg32_test
 wine_fn_config_dll comm.drv16 enable_win16
 wine_fn_config_dll commdlg.dll16 enable_win16
 wine_fn_config_dll compobj.dll16 enable_win16
 wine_fn_config_dll compstui enable_compstui implib
-wine_fn_config_dll credui enable_credui implib
+wine_fn_config_dll credui enable_credui po,implib
 wine_fn_config_test dlls/credui/tests credui_test
 wine_fn_config_dll crtdll enable_crtdll implib
 wine_fn_config_dll crypt32 enable_crypt32 po,implib
@@ -14834,7 +14934,7 @@ wine_fn_config_dll cryptdlg enable_cryptdlg po
 wine_fn_config_dll cryptdll enable_cryptdll implib
 wine_fn_config_dll cryptnet enable_cryptnet implib
 wine_fn_config_test dlls/cryptnet/tests cryptnet_test
-wine_fn_config_dll cryptui enable_cryptui implib
+wine_fn_config_dll cryptui enable_cryptui po,implib
 wine_fn_config_test dlls/cryptui/tests cryptui_test
 wine_fn_config_dll ctapi32 enable_ctapi32
 wine_fn_config_dll ctl3d.dll16 enable_win16
@@ -14983,7 +15083,7 @@ wine_fn_config_dll imm32 enable_imm32 implib
 wine_fn_config_test dlls/imm32/tests imm32_test
 wine_fn_config_dll inetcomm enable_inetcomm implib
 wine_fn_config_test dlls/inetcomm/tests inetcomm_test
-wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl
+wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl po
 wine_fn_config_dll inetmib1 enable_inetmib1
 wine_fn_config_test dlls/inetmib1/tests inetmib1_test
 wine_fn_config_dll infosoft enable_infosoft
@@ -14998,7 +15098,7 @@ wine_fn_config_dll itss enable_itss
 wine_fn_config_test dlls/itss/tests itss_test
 wine_fn_config_dll jscript enable_jscript po
 wine_fn_config_test dlls/jscript/tests jscript_test
-wine_fn_config_dll kernel32 enable_kernel32 implib
+wine_fn_config_dll kernel32 enable_kernel32 mc,implib
 wine_fn_config_test dlls/kernel32/tests kernel32_test
 wine_fn_config_dll keyboard.drv16 enable_win16
 wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel
@@ -15006,7 +15106,7 @@ wine_fn_config_dll ktmw32 enable_ktmw32
 wine_fn_config_dll loadperf enable_loadperf implib
 wine_fn_config_dll localspl enable_localspl po
 wine_fn_config_test dlls/localspl/tests localspl_test
-wine_fn_config_dll localui enable_localui
+wine_fn_config_dll localui enable_localui po
 wine_fn_config_test dlls/localui/tests localui_test
 wine_fn_config_dll lz32 enable_lz32 implib
 wine_fn_config_test dlls/lz32/tests lz32_test
@@ -15029,7 +15129,7 @@ wine_fn_config_dll mmsystem.dll16 enable_win16
 wine_fn_config_dll monodebg.vxd enable_win16
 wine_fn_config_dll mountmgr.sys enable_mountmgr_sys
 wine_fn_config_dll mouse.drv16 enable_win16
-wine_fn_config_dll mpr enable_mpr implib
+wine_fn_config_dll mpr enable_mpr po,implib
 wine_fn_config_dll mprapi enable_mprapi implib
 wine_fn_config_dll msacm.dll16 enable_win16
 wine_fn_config_dll msacm32.drv enable_msacm32_drv
@@ -15049,7 +15149,7 @@ wine_fn_config_dll msftedit enable_msftedit
 wine_fn_config_dll msg711.acm enable_msg711_acm
 wine_fn_config_dll msgsm32.acm enable_msgsm32_acm
 wine_fn_config_dll mshtml.tlb enable_mshtml_tlb
-wine_fn_config_dll mshtml enable_mshtml implib
+wine_fn_config_dll mshtml enable_mshtml po,implib
 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
@@ -15079,7 +15179,7 @@ wine_fn_config_dll msvcrt20 enable_msvcrt20 implib
 wine_fn_config_dll msvcrt40 enable_msvcrt40 implib
 wine_fn_config_dll msvcrtd enable_msvcrtd implib
 wine_fn_config_test dlls/msvcrtd/tests msvcrtd_test
-wine_fn_config_dll msvfw32 enable_msvfw32 implib
+wine_fn_config_dll msvfw32 enable_msvfw32 po,implib
 wine_fn_config_test dlls/msvfw32/tests msvfw32_test
 wine_fn_config_dll msvidc32 enable_msvidc32 po
 wine_fn_config_dll msvideo.dll16 enable_win16
@@ -15115,7 +15215,7 @@ wine_fn_config_dll ole2prox.dll16 enable_win16
 wine_fn_config_dll ole2thk.dll16 enable_win16
 wine_fn_config_dll ole32 enable_ole32 implib
 wine_fn_config_test dlls/ole32/tests ole32_test
-wine_fn_config_dll oleacc enable_oleacc implib
+wine_fn_config_dll oleacc enable_oleacc po,implib
 wine_fn_config_test dlls/oleacc/tests oleacc_test
 wine_fn_config_dll oleaut32 enable_oleaut32 po,implib
 wine_fn_config_test dlls/oleaut32/tests oleaut32_test
@@ -15123,7 +15223,7 @@ wine_fn_config_dll olecli.dll16 enable_win16
 wine_fn_config_dll olecli32 enable_olecli32 implib
 wine_fn_config_dll oledb32 enable_oledb32
 wine_fn_config_test dlls/oledb32/tests oledb32_test
-wine_fn_config_dll oledlg enable_oledlg implib
+wine_fn_config_dll oledlg enable_oledlg po,implib
 wine_fn_config_dll olepro32 enable_olepro32 implib
 wine_fn_config_dll olesvr.dll16 enable_win16
 wine_fn_config_dll olesvr32 enable_olesvr32 implib
@@ -15168,7 +15268,7 @@ wine_fn_config_test dlls/rsaenh/tests rsaenh_test
 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
+wine_fn_config_dll sane.ds enable_sane_ds po
 wine_fn_config_dll sccbase enable_sccbase
 wine_fn_config_dll schannel enable_schannel
 wine_fn_config_test dlls/schannel/tests schannel_test
@@ -15178,19 +15278,19 @@ wine_fn_config_dll security enable_security
 wine_fn_config_dll sensapi enable_sensapi implib
 wine_fn_config_dll serialui enable_serialui implib
 wine_fn_config_test dlls/serialui/tests serialui_test
-wine_fn_config_dll setupapi enable_setupapi implib
+wine_fn_config_dll setupapi enable_setupapi po,implib
 wine_fn_config_test dlls/setupapi/tests setupapi_test
 wine_fn_config_dll setupx.dll16 enable_win16
 wine_fn_config_dll sfc enable_sfc implib
 wine_fn_config_dll sfc_os enable_sfc_os implib
 wine_fn_config_dll shdoclc enable_shdoclc po
-wine_fn_config_dll shdocvw enable_shdocvw implib
+wine_fn_config_dll shdocvw enable_shdocvw po,implib
 wine_fn_config_test dlls/shdocvw/tests shdocvw_test
 wine_fn_config_dll shell.dll16 enable_win16
-wine_fn_config_dll shell32 enable_shell32 implib
+wine_fn_config_dll shell32 enable_shell32 po,implib
 wine_fn_config_test dlls/shell32/tests shell32_test
 wine_fn_config_dll shfolder enable_shfolder implib
-wine_fn_config_dll shlwapi enable_shlwapi implib
+wine_fn_config_dll shlwapi enable_shlwapi po,implib
 wine_fn_config_test dlls/shlwapi/tests shlwapi_test
 wine_fn_config_dll slbcsp enable_slbcsp
 wine_fn_config_dll slc enable_slc implib
@@ -15226,7 +15326,7 @@ wine_fn_config_dll urlmon enable_urlmon implib
 wine_fn_config_test dlls/urlmon/tests urlmon_test
 wine_fn_config_dll usbd.sys enable_usbd_sys implib
 wine_fn_config_dll user.exe16 enable_win16
-wine_fn_config_dll user32 enable_user32 implib
+wine_fn_config_dll user32 enable_user32 po,implib
 wine_fn_config_test dlls/user32/tests user32_test
 wine_fn_config_dll userenv enable_userenv implib
 wine_fn_config_test dlls/userenv/tests userenv_test
@@ -15278,7 +15378,7 @@ wine_fn_config_dll wing.dll16 enable_win16
 wine_fn_config_dll wing32 enable_wing32
 wine_fn_config_dll winhttp enable_winhttp implib
 wine_fn_config_test dlls/winhttp/tests winhttp_test
-wine_fn_config_dll wininet enable_wininet implib
+wine_fn_config_dll wininet enable_wininet po,implib
 wine_fn_config_test dlls/wininet/tests wininet_test
 wine_fn_config_dll winmm enable_winmm po,implib
 wine_fn_config_test dlls/winmm/tests winmm_test
@@ -15286,7 +15386,7 @@ wine_fn_config_dll winnls.dll16 enable_win16
 wine_fn_config_dll winnls32 enable_winnls32 implib
 wine_fn_config_dll winscard enable_winscard implib
 wine_fn_config_dll winsock.dll16 enable_win16
-wine_fn_config_dll winspool.drv enable_winspool_drv implib winspool
+wine_fn_config_dll winspool.drv enable_winspool_drv po,implib winspool
 wine_fn_config_test dlls/winspool.drv/tests winspool.drv_test
 wine_fn_config_dll wintab.dll16 enable_win16
 wine_fn_config_dll wintab32 enable_wintab32 implib
@@ -15323,6 +15423,7 @@ wine_fn_config_makefile libs/wpp enable_libs_wpp
 wine_fn_config_makefile loader enable_loader
 wine_fn_config_program aspnet_regiis enable_aspnet_regiis install
 wine_fn_config_program attrib enable_attrib install
+wine_fn_config_program cabarc enable_cabarc install
 wine_fn_config_program cacls enable_cacls install
 wine_fn_config_program clock enable_clock po,install
 wine_fn_config_program cmd enable_cmd po,install
@@ -15346,11 +15447,12 @@ wine_fn_config_program net enable_net po,install
 wine_fn_config_program netsh enable_netsh install
 wine_fn_config_program ngen enable_ngen install
 wine_fn_config_program notepad enable_notepad po,install,installbin
-wine_fn_config_program oleview enable_oleview install
+wine_fn_config_program oleview enable_oleview po,install
 wine_fn_config_program ping enable_ping install
+wine_fn_config_program plugplay enable_plugplay install
 wine_fn_config_program progman enable_progman po,install
 wine_fn_config_program reg enable_reg po,install
-wine_fn_config_program regedit enable_regedit install,installbin
+wine_fn_config_program regedit enable_regedit po,install,installbin
 wine_fn_config_test programs/regedit/tests regedit.exe_test
 wine_fn_config_program regsvcs enable_regsvcs install
 wine_fn_config_program regsvr32 enable_regsvr32 install,installbin
@@ -15372,13 +15474,14 @@ wine_fn_config_program unlodctr enable_unlodctr install
 wine_fn_config_program view enable_view po
 wine_fn_config_program wineboot enable_wineboot install,installbin
 wine_fn_config_program winebrowser enable_winebrowser install
-wine_fn_config_program winecfg enable_winecfg install,installbin
+wine_fn_config_program winecfg enable_winecfg po,install,installbin
 wine_fn_config_program wineconsole enable_wineconsole po,install,installbin
 wine_fn_config_program winedbg enable_winedbg po,install,installbin
 wine_fn_config_program winedevice enable_winedevice install
 wine_fn_config_program winefile enable_winefile po,install,installbin
 wine_fn_config_program winemenubuilder enable_winemenubuilder install
 wine_fn_config_program winemine enable_winemine po,install,installbin
+wine_fn_config_program winemsibuilder enable_winemsibuilder install
 wine_fn_config_program winepath enable_winepath install,installbin
 wine_fn_config_program winetest enable_winetest
 wine_fn_config_program winevdm enable_win16 install
@@ -15387,9 +15490,10 @@ wine_fn_config_program winhlp32 enable_winhlp32 po,install
 wine_fn_config_program winoldap.mod16 enable_win16 install
 wine_fn_config_program winver enable_winver install
 wine_fn_config_program wmic enable_wmic install
-wine_fn_config_program wordpad enable_wordpad 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
@@ -15403,6 +15507,7 @@ wine_fn_config_tool tools/wrc
 LINGUAS="\
 ar \
 bg \
+ca \
 cs \
 da \
 de \
@@ -15466,7 +15571,7 @@ then
 ALL_POT_FILES =$ALL_POT_FILES
 all: \$(ALL_PO_FILES)
 \$(ALL_PO_FILES): \$(srcdir)/po/wine.pot
-       msgmerge -U -q --backup=none \$@ \$(srcdir)/po/wine.pot && touch \$@
+       msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
        msgcat -o \$@ \$(ALL_POT_FILES)"
 fi
@@ -15993,7 +16098,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.11, which was
+This file was extended by Wine $as_me 1.3.15, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16064,7 +16169,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.11
+Wine config.status 1.3.15
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"