netapi32: Remove unneeded shadow variables.
[wine] / configure
index 7dd8070..bb49fe2 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.68 for Wine 1.3.27.
+# Generated by GNU Autoconf 2.68 for Wine 1.5.2.
 #
 # Report bugs to <wine-devel@winehq.org>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Wine'
 PACKAGE_TARNAME='wine'
-PACKAGE_VERSION='1.3.27'
-PACKAGE_STRING='Wine 1.3.27'
+PACKAGE_VERSION='1.5.2'
+PACKAGE_STRING='Wine 1.5.2'
 PACKAGE_BUGREPORT='wine-devel@winehq.org'
 PACKAGE_URL='http://www.winehq.org'
 
@@ -604,6 +604,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+PORCFLAGS
 LINGUAS
 ALL_TEST_RESOURCES
 LDAPLIBS
@@ -643,6 +644,7 @@ SANEINCL
 sane_devel
 GNUTLSINCL
 HALINCL
+DBUSINCL
 XSLTINCL
 XML2INCL
 XML2LIBS
@@ -664,6 +666,7 @@ COREAUDIO
 SECURITYLIB
 DISKARBITRATIONLIB
 LDEXECFLAGS
+CORESERVICESLIB
 APPLICATIONSERVICESLIB
 IOKITLIB
 COREFOUNDATIONLIB
@@ -682,6 +685,7 @@ CPP
 OPENGL_LIBS
 XLIB
 MAINTAINER_MODE
+MSGFMT
 ICOTOOL
 CONVERT
 RSVG
@@ -780,8 +784,10 @@ with_cms
 with_coreaudio
 with_cups
 with_curses
+with_dbus
 with_fontconfig
 with_freetype
+with_gettext
 with_gettextpo
 with_gphoto
 with_glu
@@ -811,7 +817,6 @@ with_xml
 with_xrandr
 with_xrender
 with_xshape
-with_xshm
 with_xslt
 with_xxf86vm
 with_zlib
@@ -1375,7 +1380,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.27 to adapt to many kinds of systems.
+\`configure' configures Wine 1.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1444,7 +1449,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Wine 1.3.27:";;
+     short | recursive ) echo "Configuration of Wine 1.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1469,9 +1474,11 @@ Optional Packages:
   --without-coreaudio     do not use the CoreAudio sound support
   --without-cups          do not use CUPS
   --without-curses        do not use (n)curses
+  --without-dbus          do not use DBus (dynamic device support)
   --without-fontconfig    do not use fontconfig
   --without-freetype      do not use the FreeType library
-  --without-gettextpo     do not use the GetTextPO library
+  --without-gettext       do not use gettext
+  --with-gettextpo        use the GetTextPO library to rebuild po files
   --without-gphoto        do not use gphoto (Digital Camera support)
   --without-glu           do not use the GLU library
   --without-gnutls        do not use GnuTLS (schannel support)
@@ -1500,7 +1507,6 @@ Optional Packages:
   --without-xrandr        do not use Xrandr (resolution changes)
   --without-xrender       do not use the Xrender extension
   --without-xshape        do not use the Xshape extension
-  --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)
@@ -1588,7 +1594,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Wine configure 1.3.27
+Wine configure 1.5.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2106,7 +2112,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.27, which was
+It was created by Wine $as_me 1.5.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2547,9 +2553,15 @@ if test "${with_curses+set}" = set; then :
 fi
 
 
+# Check whether --with-dbus was given.
+if test "${with_dbus+set}" = set; then :
+  withval=$with_dbus;
+fi
+
+
 # Check whether --with-fontconfig was given.
 if test "${with_fontconfig+set}" = set; then :
-  withval=$with_fontconfig; if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi
+  withval=$with_fontconfig;
 fi
 
 
@@ -2559,6 +2571,12 @@ if test "${with_freetype+set}" = set; then :
 fi
 
 
+# Check whether --with-gettext was given.
+if test "${with_gettext+set}" = set; then :
+  withval=$with_gettext;
+fi
+
+
 # Check whether --with-gettextpo was given.
 if test "${with_gettextpo+set}" = set; then :
   withval=$with_gettextpo; if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi
@@ -2733,12 +2751,6 @@ if test "${with_xshape+set}" = set; then :
 fi
 
 
-# Check whether --with-xshm was given.
-if test "${with_xshm+set}" = set; then :
-  withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi
-fi
-
-
 # Check whether --with-xslt was given.
 if test "${with_xslt+set}" = set; then :
   withval=$with_xslt;
@@ -4033,8 +4045,6 @@ case $host in
     then
       CC="$CC -m64"
       CXX="$CXX -m64"
-      LD="${LD:-ld} -arch x86_64"
-      AS="${AS:-as} -arch x86_64"
       host_cpu="x86_64"
       notice_platform="64-bit "
       TARGETFLAGS="-m64"
@@ -4042,14 +4052,13 @@ case $host in
     else
       CC="$CC -m32"
       CXX="$CXX -m32"
-      LD="${LD:-ld} -arch i386"
-      AS="${AS:-as} -arch i386"
       host_cpu="i386"
       notice_platform="32-bit "
       TARGETFLAGS="-m32"
 
       enable_win16=${enable_win16:-yes}
     fi
+    with_fontconfig=${with_fontconfig:-no}
     ;;
   x86_64*)
     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
@@ -4080,8 +4089,6 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      LD="${LD:-ld} -m elf_i386"
-      AS="${AS:-as} --32"
       host_cpu="i386"
       notice_platform="32-bit "
       TARGETFLAGS="-m32"
@@ -4817,7 +4824,6 @@ then
   fi
 
 
-
 for ac_prog in fontforge
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5033,6 +5039,49 @@ fi
 done
 test -n "$ICOTOOL" || ICOTOOL="false"
 
+for ac_prog in msgfmt
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MSGFMT"; then
+  ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MSGFMT="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MSGFMT=$ac_cv_prog_MSGFMT
+if test -n "$MSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MSGFMT" && break
+done
+test -n "$MSGFMT" || MSGFMT="false"
+
 
 if test "x$enable_maintainer_mode" != "xyes"
 then
@@ -5097,6 +5146,39 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; }
     fi
   fi
 
+    with_gettext=yes
+  with_gettextpo=yes
+  { ac_cv_header_gettext_po_h=; unset ac_cv_header_gettext_po_h;}
+fi
+
+test "x$with_gettext" != xno || MSGFMT=false
+if test "$MSGFMT" != "false"
+then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5
+$as_echo_n "checking whether msgfmt supports contexts... " >&6; }
+  cat >conftest.po <<EOF
+# comment
+msgctxt "ctxt"
+msgid "id"
+msgstr "str"
+EOF
+  if $MSGFMT -o /dev/null conftest.po 2>&5
+  then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    MSGFMT=false
+  fi
+fi
+if test "$MSGFMT" = false; then :
+  case "x$with_gettext" in
+  x)   as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;;
+  xno) ;;
+  *)   as_fn_error $? "gettext tools not found (or too old), translations won't be built.
+This is an error since --with-gettext was requested." "$LINENO" 5 ;;
+esac
 fi
 
 
@@ -5197,6 +5279,8 @@ OPENGL_LIBS=""
 
 
 
+test "x$with_fontconfig" != "xno" || ac_cv_header_fontconfig_fontconfig_h=no
+
 # Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then :
   enableval=$enable_largefile;
@@ -5672,6 +5756,7 @@ for ac_header in \
        CL/cl.h \
        Carbon/Carbon.h \
        CoreAudio/CoreAudio.h \
+       CoreServices/CoreServices.h \
        DiskArbitration/DiskArbitration.h \
        IOKit/IOKitLib.h \
        IOKit/hid/IOHIDLib.h \
@@ -5742,7 +5827,6 @@ for ac_header in \
        process.h \
        pthread.h \
        pwd.h \
-       regex.h \
        sched.h \
        scsi/scsi.h \
        scsi/scsi_ioctl.h \
@@ -5756,7 +5840,6 @@ for ac_header in \
        sys/cdio.h \
        sys/elf32.h \
        sys/epoll.h \
-       sys/errno.h \
        sys/event.h \
        sys/exec_elf.h \
        sys/filio.h \
@@ -6417,6 +6500,8 @@ fi
 
     APPLICATIONSERVICESLIB="-framework ApplicationServices"
 
+    CORESERVICESLIB="-framework CoreServices"
+
     case $host_os in
       darwin11*)
         LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
@@ -6434,6 +6519,20 @@ fi
     then
         SECURITYLIB="-framework Security -framework CoreFoundation"
 
+                ac_save_LIBS="$LIBS"
+        LIBS="$LIBS $SECURITYLIB"
+        for ac_func in SSLCopyPeerCertificates
+do :
+  ac_fn_c_check_func "$LINENO" "SSLCopyPeerCertificates" "ac_cv_func_SSLCopyPeerCertificates"
+if test "x$ac_cv_func_SSLCopyPeerCertificates" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SSLCOPYPEERCERTIFICATES 1
+_ACEOF
+
+fi
+done
+
+        LIBS="$ac_save_LIBS"
         with_gnutls=${with_gnutls:-no}
     fi
     if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
@@ -7934,7 +8033,6 @@ fi
                       X11/extensions/shape.h \
                       X11/extensions/XInput.h \
                       X11/extensions/XInput2.h \
-                      X11/extensions/XShm.h \
                       X11/extensions/Xcomposite.h \
                       X11/extensions/Xinerama.h \
                       X11/extensions/Xrandr.h \
@@ -8142,60 +8240,6 @@ 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
-$as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; }
-if ${ac_cv_lib_Xext_XShmQueryExtension+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XShmQueryExtension ();
-int
-main ()
-{
-return XShmQueryExtension ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xext_XShmQueryExtension=yes
-else
-  ac_cv_lib_Xext_XShmQueryExtension=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_Xext_XShmQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xext_XShmQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xext_XShmQueryExtension" = xyes; then :
-
-$as_echo "#define HAVE_LIBXXSHM 1" >>confdefs.h
-
-fi
-
-        fi
-        if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then :
-  case "x$with_xshm" in
-  x)   as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;;
-  xno) ;;
-  *)   as_fn_error $? "XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
-This is an error since --with-xshm was requested." "$LINENO" 5 ;;
-esac
-fi
-
                 if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
         then
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
@@ -8402,6 +8446,48 @@ if test "x$ac_cv_lib_Xrender_XRenderSetPictureTransform" = xyes; then :
 
 $as_echo "#define HAVE_XRENDERSETPICTURETRANSFORM 1" >>confdefs.h
 
+fi
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderCreateLinearGradient in -lXrender" >&5
+$as_echo_n "checking for XRenderCreateLinearGradient in -lXrender... " >&6; }
+if ${ac_cv_lib_Xrender_XRenderCreateLinearGradient+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XRenderCreateLinearGradient ();
+int
+main ()
+{
+return XRenderCreateLinearGradient ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xrender_XRenderCreateLinearGradient=yes
+else
+  ac_cv_lib_Xrender_XRenderCreateLinearGradient=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_Xrender_XRenderCreateLinearGradient" >&5
+$as_echo "$ac_cv_lib_Xrender_XRenderCreateLinearGradient" >&6; }
+if test "x$ac_cv_lib_Xrender_XRenderCreateLinearGradient" = xyes; then :
+
+$as_echo "#define HAVE_XRENDERCREATELINEARGRADIENT 1" >>confdefs.h
+
 fi
 
 fi
@@ -9376,40 +9462,25 @@ This is an error since --with-xslt was requested." "$LINENO" 5 ;;
 esac
 fi
 
-HALINCL=""
-
-if test "x$with_hal" != "xno"
+if test "x$with_dbus" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
     if test "$PKG_CONFIG" != "false"
     then
-        ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
-        ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
-        CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
+        ac_dbus_libs="`$PKG_CONFIG --libs dbus-1 2>/dev/null`"
+        ac_dbus_cflags="`$PKG_CONFIG --cflags dbus-1 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_dbus_cflags"
     fi
-    for ac_header in dbus/dbus.h hal/libhal.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
-    then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_connection_close in -ldbus-1" >&5
-$as_echo_n "checking for dbus_connection_close in -ldbus-1... " >&6; }
-if ${ac_cv_lib_dbus_1_dbus_connection_close+:} false; then :
+    ac_fn_c_check_header_mongrel "$LINENO" "dbus/dbus.h" "ac_cv_header_dbus_dbus_h" "$ac_includes_default"
+if test "x$ac_cv_header_dbus_dbus_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ldbus-1" >&5
+$as_echo_n "checking for -ldbus-1... " >&6; }
+if ${ac_cv_lib_soname_dbus_1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldbus-1 $ac_hal_libs $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_check_soname_save_LIBS=$LIBS
+LIBS="-ldbus-1 $ac_dbus_libs $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9428,17 +9499,57 @@ return dbus_connection_close ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dbus_1_dbus_connection_close=yes
-else
-  ac_cv_lib_dbus_1_dbus_connection_close=no
+  case "$LIBEXT" in
+    dll) ac_cv_lib_soname_dbus_1=`$ac_cv_path_LDD conftest.exe | grep "dbus-1" | sed -e "s/dll.*/dll/"';2,$d'` ;;
+    dylib) ac_cv_lib_soname_dbus_1=`otool -L conftest$ac_exeext | grep "libdbus-1\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libdbus-1\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_dbus_1=`$ac_cv_path_LDD conftest$ac_exeext | grep "libdbus-1\\.$LIBEXT" | sed -e "s/^.*\(libdbus-1\.$LIBEXT[^   ]*\).*$/\1/"';2,$d'` ;;
+  esac
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+  LIBS=$ac_check_soname_save_LIBS
+fi
+if test "x$ac_cv_lib_soname_dbus_1" = "x"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_dbus_1" >&5
+$as_echo "$ac_cv_lib_soname_dbus_1" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBDBUS_1 "$ac_cv_lib_soname_dbus_1"
+_ACEOF
+
+       DBUSINCL="$ac_dbus_cflags"
+
+fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5
-$as_echo "$ac_cv_lib_dbus_1_dbus_connection_close" >&6; }
-if test "x$ac_cv_lib_dbus_1_dbus_connection_close" = xyes; then :
+
+
+    CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+if test "x$ac_cv_lib_soname_dbus_1" = "x" -a \
+                            "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then :
+  case "x$with_dbus" in
+  x)   as_fn_append wine_notices "|libdbus ${notice_platform}development files not found, no dynamic device support." ;;
+  xno) ;;
+  *)   as_fn_error $? "libdbus ${notice_platform}development files not found, no dynamic device support.
+This is an error since --with-dbus was requested." "$LINENO" 5 ;;
+esac
+fi
+
+if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x
+then
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
+        ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
+    fi
+    ac_fn_c_check_header_mongrel "$LINENO" "hal/libhal.h" "ac_cv_header_hal_libhal_h" "$ac_includes_default"
+if test "x$ac_cv_header_hal_libhal_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lhal" >&5
 $as_echo_n "checking for -lhal... " >&6; }
 if ${ac_cv_lib_soname_hal+:} false; then :
@@ -9488,20 +9599,22 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
        HALINCL="$ac_hal_cflags"
+
 fi
 fi
 
-    fi
+
     CPPFLAGS="$ac_save_CPPFLAGS"
-fi
-if test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then :
+    if test "x$ac_cv_lib_soname_hal" = "x" -a \
+                               "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then :
   case "x$with_hal" in
-  x)   as_fn_append wine_notices "|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;;
+  x)   as_fn_append wine_notices "|libhal ${notice_platform}development files not found, no legacy dynamic device support." ;;
   xno) ;;
-  *)   as_fn_error $? "libhal/libdbus ${notice_platform}development files not found, no dynamic device support.
+  *)   as_fn_error $? "libhal ${notice_platform}development files not found, no legacy dynamic device support.
 This is an error since --with-hal was requested." "$LINENO" 5 ;;
 esac
 fi
+fi
 
 if test "x$with_gnutls" != "xno"
 then
 
 if test "x$with_freetype" != "xno"
 then
-    for ac_prog in freetype-config freetype2-config
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`"
+        ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`"
+    else
+        for ac_prog in freetype-config freetype2-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 done
 test -n "$ft_devel" || ft_devel="no"
 
-    if test "$ft_devel" != "no"
-    then
-        ac_freetype_incl=`$ft_devel --cflags`
-        ac_freetype_libs=`$ft_devel --libs`
+        if test "$ft_devel" != "no"
+        then
+            ac_freetype_incl=`$ft_devel --cflags`
+            ac_freetype_libs=`$ft_devel --libs`
+        fi
     fi
     ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5
@@ -10262,8 +10381,7 @@ fi
                          freetype/ftoutln.h \
                          freetype/ftwinfnt.h \
                          freetype/ftmodapi.h \
-                         freetype/ftlcdfil.h \
-                         freetype/internal/sfnt.h
+                         freetype/ftlcdfil.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H
@@ -10304,21 +10422,6 @@ _ACEOF
 
 fi
 
-        ac_save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $ac_freetype_libs"
-        for ac_func in FT_Load_Sfnt_Table
-do :
-  ac_fn_c_check_func "$LINENO" "FT_Load_Sfnt_Table" "ac_cv_func_FT_Load_Sfnt_Table"
-if test "x$ac_cv_func_FT_Load_Sfnt_Table" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FT_LOAD_SFNT_TABLE 1
-_ACEOF
-
-fi
-done
-
-        CFLAGS="$ac_save_CFLAGS"
-       CPPFLAGS="$ac_save_CPPFLAGS"
                if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
        then
 
@@ -10500,11 +10603,11 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h
 fi
 
     fi
-    if test "x$LIBGETTEXTPO" = "x"; then :
+    test "x$with_gettextpo" != xyes || if test "x$LIBGETTEXTPO" = "x"; then :
   case "x$with_gettextpo" in
-  x)   as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;;
+  x)   as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;;
   xno) ;;
-  *)   as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.
+  *)   as_fn_error $? "GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.
 This is an error since --with-gettextpo was requested." "$LINENO" 5 ;;
 esac
 fi
 $as_echo "$ac_cv_cflags__Wempty_body" >&6; }
 if test $ac_cv_cflags__Wempty_body = yes; then :
   EXTRACFLAGS="$EXTRACFLAGS -Wempty-body"
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wignored-qualifiers" >&5
+$as_echo_n "checking whether the compiler supports -Wignored-qualifiers... " >&6; }
+if ${ac_cv_cflags__Wignored_qualifiers+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -Wignored-qualifiers"
+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__Wignored_qualifiers=yes
+else
+  ac_cv_cflags__Wignored_qualifiers=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__Wignored_qualifiers" >&5
+$as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; }
+if test $ac_cv_cflags__Wignored_qualifiers = yes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers"
 fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5
 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; }
@@ -12030,6 +12158,62 @@ if test $ac_cv_cflags__Wwrite_strings = yes; then :
   EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
 fi
 
+    case $host_cpu in
+    *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5
+$as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; }
+if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+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__fno_omit_frame_pointer=yes
+else
+  ac_cv_cflags__fno_omit_frame_pointer=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__fno_omit_frame_pointer" >&5
+$as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; }
+if test $ac_cv_cflags__fno_omit_frame_pointer = yes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer"
+fi ;;
+  esac
+
+    case $host in
+    x86_64-*mingw32*|x86_64-*cygwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5
+$as_echo_n "checking whether the compiler supports -Wno-format... " >&6; }
+if ${ac_cv_cflags__Wno_format+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -Wno-format"
+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__Wno_format=yes
+else
+  ac_cv_cflags__Wno_format=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__Wno_format" >&5
+$as_echo "$ac_cv_cflags__Wno_format" >&6; }
+if test $ac_cv_cflags__Wno_format = yes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -Wno-format"
+fi ;;
+  esac
+
     saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wpointer-arith -Werror"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5
@@ -14037,6 +14221,32 @@ $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 ;;
+  *sparc64*)        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc64__" >&5
+$as_echo_n "checking whether we need to define __sparc64__... " >&6; }
+if ${ac_cv_cpp_def___sparc64__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __sparc64__
+yes
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  ac_cv_cpp_def___sparc64__=yes
+else
+  ac_cv_cpp_def___sparc64__=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___sparc64__" >&5
+$as_echo "$ac_cv_cpp_def___sparc64__" >&6; }
+if test $ac_cv_cpp_def___sparc64__ = yes; then :
+  CFLAGS="$CFLAGS -D__sparc64__"
+  LINTFLAGS="$LINTFLAGS -D__sparc64__"
 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; }
@@ -14063,6 +14273,32 @@ $as_echo "$ac_cv_cpp_def___sparc__" >&6; }
 if test $ac_cv_cpp_def___sparc__ = yes; then :
   CFLAGS="$CFLAGS -D__sparc__"
   LINTFLAGS="$LINTFLAGS -D__sparc__"
+fi ;;
+  *powerpc64*)      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc64__" >&5
+$as_echo_n "checking whether we need to define __powerpc64__... " >&6; }
+if ${ac_cv_cpp_def___powerpc64__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __powerpc64__
+yes
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  ac_cv_cpp_def___powerpc64__=yes
+else
+  ac_cv_cpp_def___powerpc64__=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___powerpc64__" >&5
+$as_echo "$ac_cv_cpp_def___powerpc64__" >&6; }
+if test $ac_cv_cpp_def___powerpc64__ = yes; then :
+  CFLAGS="$CFLAGS -D__powerpc64__"
+  LINTFLAGS="$LINTFLAGS -D__powerpc64__"
 fi ;;
   *powerpc*)        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc__" >&5
 $as_echo_n "checking whether we need to define __powerpc__... " >&6; }
@@ -14212,6 +14448,31 @@ $ac_dir/__depend__: $ac_makedep dummy
        @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend"
 }
 
+wine_fn_pot_rules ()
+{
+    ac_dir=$1
+    ac_flags=$2
+
+    test "x$with_gettextpo" = xyes || return
+
+    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/Makefile dummy
+       @cd $ac_dir && \$(MAKE) msg.pot
+$ac_dir/msg.pot: tools/wmc include"
+    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/Makefile dummy
+       @cd $ac_dir && \$(MAKE) rsrc.pot
+$ac_dir/rsrc.pot: tools/wrc include"
+    fi
+}
+
 wine_fn_config_makefile ()
 {
     ac_dir=$1
@@ -14336,21 +14597,7 @@ $ac_dir/__uninstall__::
             fi
         fi
 
-        if test "x$enable_maintainer_mode" = xyes
-        then
-            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_pot_rules $ac_dir $ac_flags
 fi
 
     if wine_fn_has_flag staticimplib $ac_flags
@@ -14450,21 +14697,7 @@ else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$ac_dir: __builddeps__"
 
-    if test "x$enable_maintainer_mode" = xyes
-    then
-        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_pot_rules $ac_dir $ac_flags
 
     wine_fn_has_flag install $ac_flags || return
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
@@ -14607,6 +14840,8 @@ if test "x$enable_fonts" != xno; then
 ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf"
 test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf
 fi
+ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS"
+test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS
 if test "x$enable_tools" != xno; then
 ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls"
 test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls
@@ -14665,9 +14900,11 @@ 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 apphelp enable_apphelp
 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 atl80 enable_atl80
 wine_fn_config_dll authz enable_authz
 wine_fn_config_dll avicap32 enable_avicap32 implib
 wine_fn_config_dll avifil32 enable_avifil32 implib,po
@@ -14774,7 +15011,9 @@ wine_fn_config_test dlls/ddraw/tests ddraw_test
 wine_fn_config_dll ddrawex enable_ddrawex
 wine_fn_config_test dlls/ddrawex/tests ddrawex_test
 wine_fn_config_dll devenum enable_devenum po
-wine_fn_config_dll dinput enable_dinput implib,staticimplib
+wine_fn_config_test dlls/devenum/tests devenum_test
+wine_fn_config_dll dhcpcsvc enable_dhcpcsvc
+wine_fn_config_dll dinput enable_dinput implib,po,staticimplib
 wine_fn_config_test dlls/dinput/tests dinput_test
 wine_fn_config_dll dinput8 enable_dinput8 implib
 wine_fn_config_test dlls/dinput8/tests dinput8_test
@@ -14783,6 +15022,7 @@ wine_fn_config_dll dispex enable_dispex
 wine_fn_config_test dlls/dispex/tests dispex_test
 wine_fn_config_dll display.drv16 enable_win16
 wine_fn_config_dll dmband enable_dmband
+wine_fn_config_test dlls/dmband/tests dmband_test
 wine_fn_config_dll dmcompos enable_dmcompos
 wine_fn_config_dll dmime enable_dmime
 wine_fn_config_test dlls/dmime/tests dmime_test
@@ -14791,7 +15031,9 @@ wine_fn_config_test dlls/dmloader/tests dmloader_test
 wine_fn_config_dll dmscript enable_dmscript
 wine_fn_config_dll dmstyle enable_dmstyle
 wine_fn_config_dll dmsynth enable_dmsynth
+wine_fn_config_test dlls/dmsynth/tests dmsynth_test
 wine_fn_config_dll dmusic enable_dmusic
+wine_fn_config_test dlls/dmusic/tests dmusic_test
 wine_fn_config_dll dmusic32 enable_dmusic32 implib
 wine_fn_config_dll dnsapi enable_dnsapi implib
 wine_fn_config_test dlls/dnsapi/tests dnsapi_test
@@ -14800,6 +15042,7 @@ wine_fn_config_dll dplayx enable_dplayx implib
 wine_fn_config_test dlls/dplayx/tests dplayx_test
 wine_fn_config_dll dpnaddr enable_dpnaddr
 wine_fn_config_dll dpnet enable_dpnet implib
+wine_fn_config_test dlls/dpnet/tests dpnet_test
 wine_fn_config_dll dpnhpast enable_dpnhpast
 wine_fn_config_dll dpnlobby enable_dpnlobby
 wine_fn_config_dll dpwsockx enable_dpwsockx
@@ -14827,12 +15070,12 @@ wine_fn_config_dll fwpuclnt enable_fwpuclnt
 wine_fn_config_dll gameux enable_gameux
 wine_fn_config_test dlls/gameux/tests gameux_test
 wine_fn_config_dll gdi.exe16 enable_win16
-wine_fn_config_dll gdi32 enable_gdi32 implib
+wine_fn_config_dll gdi32 enable_gdi32 implib,po
 wine_fn_config_test dlls/gdi32/tests gdi32_test
 wine_fn_config_dll gdiplus enable_gdiplus implib
 wine_fn_config_test dlls/gdiplus/tests gdiplus_test
 wine_fn_config_dll glu32 enable_glu32 implib
-wine_fn_config_dll gphoto2.ds enable_gphoto2_ds
+wine_fn_config_dll gphoto2.ds enable_gphoto2_ds po
 wine_fn_config_dll gpkcsp enable_gpkcsp
 wine_fn_config_dll hal enable_hal
 wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx po
@@ -14890,9 +15133,11 @@ wine_fn_config_dll mcicda enable_mcicda
 wine_fn_config_dll mciqtz32 enable_mciqtz32
 wine_fn_config_dll mciseq enable_mciseq
 wine_fn_config_dll mciwave enable_mciwave
+wine_fn_config_dll mgmtapi enable_mgmtapi
 wine_fn_config_dll midimap enable_midimap
 wine_fn_config_dll mlang enable_mlang implib
 wine_fn_config_test dlls/mlang/tests mlang_test
+wine_fn_config_dll mmcndmgr enable_mmcndmgr
 wine_fn_config_dll mmdevapi enable_mmdevapi
 wine_fn_config_test dlls/mmdevapi/tests mmdevapi_test
 wine_fn_config_dll mmdevldr.vxd enable_win16
@@ -14904,7 +15149,7 @@ wine_fn_config_dll mpr enable_mpr implib,po
 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
-wine_fn_config_dll msacm32 enable_msacm32 implib
+wine_fn_config_dll msacm32 enable_msacm32 implib,po
 wine_fn_config_test dlls/msacm32/tests msacm32_test
 wine_fn_config_dll msadp32.acm enable_msadp32_acm
 wine_fn_config_dll mscat32 enable_mscat32
@@ -14924,6 +15169,7 @@ wine_fn_config_dll mshtml enable_mshtml implib,po
 wine_fn_config_test dlls/mshtml/tests mshtml_test
 wine_fn_config_dll msi enable_msi implib,po
 wine_fn_config_test dlls/msi/tests msi_test
+wine_fn_config_dll msident enable_msident
 wine_fn_config_dll msimg32 enable_msimg32 implib
 wine_fn_config_dll msimsg enable_msimsg
 wine_fn_config_dll msimtf enable_msimtf
@@ -15011,6 +15257,7 @@ wine_fn_config_dll opengl32 enable_opengl32 implib
 wine_fn_config_test dlls/opengl32/tests opengl32_test
 wine_fn_config_dll pdh enable_pdh implib
 wine_fn_config_test dlls/pdh/tests pdh_test
+wine_fn_config_dll photometadatahandler enable_photometadatahandler
 wine_fn_config_dll pidgen enable_pidgen
 wine_fn_config_dll powrprof enable_powrprof implib
 wine_fn_config_dll printui enable_printui
@@ -15051,11 +15298,13 @@ 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
+wine_fn_config_dll scrrun enable_scrrun
+wine_fn_config_test dlls/scrrun/tests scrrun_test
 wine_fn_config_dll secur32 enable_secur32 implib
 wine_fn_config_test dlls/secur32/tests secur32_test
 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_dll serialui enable_serialui implib,po
 wine_fn_config_test dlls/serialui/tests serialui_test
 wine_fn_config_dll setupapi enable_setupapi implib,po
 wine_fn_config_test dlls/setupapi/tests setupapi_test
@@ -15088,7 +15337,8 @@ wine_fn_config_dll stress.dll16 enable_win16
 wine_fn_config_lib strmbase
 wine_fn_config_lib strmiids
 wine_fn_config_dll svrapi enable_svrapi
-wine_fn_config_dll sxs enable_sxs
+wine_fn_config_dll sxs enable_sxs implib
+wine_fn_config_test dlls/sxs/tests sxs_test
 wine_fn_config_dll system.drv16 enable_win16
 wine_fn_config_dll t2embed enable_t2embed
 wine_fn_config_dll tapi32 enable_tapi32 implib
@@ -15117,6 +15367,7 @@ wine_fn_config_test dlls/uxtheme/tests uxtheme_test
 wine_fn_config_dll vbscript enable_vbscript
 wine_fn_config_test dlls/vbscript/tests vbscript_test
 wine_fn_config_dll vcomp enable_vcomp
+wine_fn_config_dll vcomp100 enable_vcomp100
 wine_fn_config_dll vdhcp.vxd enable_win16
 wine_fn_config_dll vdmdbg enable_vdmdbg implib
 wine_fn_config_dll ver.dll16 enable_win16
@@ -15132,6 +15383,7 @@ wine_fn_config_dll w32sys.dll16 enable_win16
 wine_fn_config_dll wbemprox enable_wbemprox
 wine_fn_config_dll wer enable_wer implib
 wine_fn_config_test dlls/wer/tests wer_test
+wine_fn_config_dll wevtapi enable_wevtapi
 wine_fn_config_dll wiaservc enable_wiaservc
 wine_fn_config_dll win32s16.dll16 enable_win16
 wine_fn_config_dll win87em.dll16 enable_win16
@@ -15148,7 +15400,7 @@ wine_fn_config_dll winejoystick.drv enable_winejoystick_drv
 wine_fn_config_dll winemapi enable_winemapi
 wine_fn_config_dll winemp3.acm enable_winemp3_acm
 wine_fn_config_dll wineoss.drv enable_wineoss_drv
-wine_fn_config_dll wineps.drv enable_wineps_drv install-lib
+wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po
 wine_fn_config_dll wineps16.drv16 enable_win16
 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
 wine_fn_config_dll winequartz.drv enable_winequartz_drv
@@ -15183,6 +15435,7 @@ wine_fn_config_dll wow32 enable_win16 implib
 wine_fn_config_dll ws2_32 enable_ws2_32 implib
 wine_fn_config_test dlls/ws2_32/tests ws2_32_test
 wine_fn_config_dll wshom.ocx enable_wshom_ocx
+wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test
 wine_fn_config_dll wsock32 enable_wsock32 implib
 wine_fn_config_dll wtsapi32 enable_wtsapi32 implib
 wine_fn_config_dll wuapi enable_wuapi
@@ -15195,6 +15448,8 @@ wine_fn_config_test dlls/xinput1_3/tests xinput1_3_test
 wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0
 wine_fn_config_dll xmllite enable_xmllite
 wine_fn_config_test dlls/xmllite/tests xmllite_test
+wine_fn_config_dll xolehlp enable_xolehlp
+wine_fn_config_dll xpsprint enable_xpsprint
 wine_fn_config_makefile documentation enable_documentation
 wine_fn_config_makefile fonts enable_fonts install-lib
 wine_fn_config_makefile include enable_include install-dev
@@ -15203,14 +15458,14 @@ wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib
 wine_fn_config_makefile libs/wpp enable_libs_wpp
 wine_fn_config_makefile loader enable_loader install-lib,manpage
 wine_fn_config_program aspnet_regiis enable_aspnet_regiis install
-wine_fn_config_program attrib enable_attrib install
+wine_fn_config_program attrib enable_attrib install,po
 wine_fn_config_program cabarc enable_cabarc install
 wine_fn_config_program cacls enable_cacls install
 wine_fn_config_program clock enable_clock install,po
 wine_fn_config_program cmd enable_cmd install,po
 wine_fn_config_test programs/cmd/tests cmd.exe_test
-wine_fn_config_program cmdlgtst enable_cmdlgtst
 wine_fn_config_program control enable_control install
+wine_fn_config_program cscript enable_cscript install
 wine_fn_config_program dxdiag enable_dxdiag install,po
 wine_fn_config_program eject enable_eject install
 wine_fn_config_program expand enable_expand install
@@ -15255,8 +15510,8 @@ wine_fn_config_program taskmgr enable_taskmgr install,po
 wine_fn_config_program termsv enable_termsv install
 wine_fn_config_program uninstaller enable_uninstaller install,po
 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,manpage
+wine_fn_config_program view enable_view install,po
+wine_fn_config_program wineboot enable_wineboot install,installbin,manpage,po
 wine_fn_config_program winebrowser enable_winebrowser install
 wine_fn_config_program winecfg enable_winecfg install,installbin,manpage,po
 wine_fn_config_program wineconsole enable_wineconsole install,installbin,manpage,po
@@ -15278,6 +15533,7 @@ wine_fn_config_program wordpad enable_wordpad install,po
 wine_fn_config_program write enable_write install,po
 wine_fn_config_program wscript enable_wscript install
 wine_fn_config_test programs/wscript/tests wscript.exe_test
+wine_fn_config_program wusa enable_wusa install
 wine_fn_config_program xcopy enable_xcopy install,po
 wine_fn_config_makefile server enable_server install-lib,manpage
 wine_fn_config_tool tools install-dev,install-lib,manpage
@@ -15350,16 +15606,28 @@ then
 \$(srcdir)/include/config.h.in: include/stamp-h.in
 \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
        cd \$(srcdir) && autoheader --warnings=all
-       @echo timestamp > \$@
+       @echo timestamp > \$@"
+fi
 
-ALL_POT_FILES =$ALL_POT_FILES
-all: \$(ALL_PO_FILES)
-\$(ALL_PO_FILES): \$(srcdir)/po/wine.pot
-       msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
+if test "x$with_gettextpo" = xyes
+then
+    test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "ALL_POT_FILES =$ALL_POT_FILES
+\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot
+       msgmerge --previous -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
 
+if test "$MSGFMT" != false
+then
+    PORCFLAGS="--po-dir=\$(top_builddir)/po"
+
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: \$(ALL_MO_FILES)"
+else
+    LINGUAS=
+fi
+
 if test "x$enable_tools" != xno
 then
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(MAKEDEP): tools/Makefile
@@ -15898,7 +16166,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.27, which was
+This file was extended by Wine $as_me 1.5.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15969,7 +16237,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.27
+Wine config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -16110,6 +16378,7 @@ do
     "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;;
     "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;;
     "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;;
+    "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;;
     "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;;
     "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;;
     "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;;