winedump: Add support for dumping SZ_LINK and SPECIAL_FOLDER data blocks.
[wine] / configure
index 51b8f62..39b320a 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.61 for Wine 0.9.47.
+# Generated by GNU Autoconf 2.61 for Wine 0.9.54.
 #
 # Report bugs to <wine-devel@winehq.org>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Wine'
 PACKAGE_TARNAME='wine'
-PACKAGE_VERSION='0.9.47'
-PACKAGE_STRING='Wine 0.9.47'
+PACKAGE_VERSION='0.9.54'
+PACKAGE_STRING='Wine 0.9.54'
 PACKAGE_BUGREPORT='wine-devel@winehq.org'
 
 ac_unique_file="server/atom.c"
@@ -722,6 +722,7 @@ LDD
 DLLTOOL
 DLLWRAP
 MINGWAR
+SECURITYLIB
 COREFOUNDATIONLIB
 IOKITLIB
 LDEXECFLAGS
@@ -755,6 +756,7 @@ ESDLIBS
 ESDINCL
 ALSALIBS
 AUDIOIOLIBS
+FONTCONFIGINCL
 EXTRACFLAGS
 BUILTINFLAG
 LDPATH
@@ -1287,7 +1289,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 0.9.47 to adapt to many kinds of systems.
+\`configure' configures Wine 0.9.54 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1356,7 +1358,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Wine 0.9.47:";;
+     short | recursive ) echo "Configuration of Wine 0.9.54:";;
    esac
   cat <<\_ACEOF
 
@@ -1370,8 +1372,38 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-alsa          do not use the Alsa sound support
+  --without-audioio       do not use the AudioIO sound support
+  --without-capi          do not use CAPI (ISDN support)
+  --without-cms           do not use CMS (color management support)
+  --without-coreaudio     do not use the CoreAudio sound support
+  --without-cups          do not use CUPS
+  --without-curses        do not use (n)curses
+  --without-esd           do not use the EsounD sound support
+  --without-fontconfig    do not use fontconfig
+  --without-gphoto        do not use gphoto (Digital Camera support)
+  --without-hal           do not use HAL (dynamic device support)
+  --without-jack          do not use the Jack sound support
+  --without-jpeg          do not use JPEG
+  --without-ldap          do not use LDAP
+  --without-nas           do not use the NAS sound support
   --without-opengl        do not use OpenGL
-  --with-wine-tools=<dir> use Wine tools from directory <dir>
+  --without-openssl       do not use OpenSSL
+  --without-oss           do not use the OSS sound support
+  --without-png           do not use PNG
+  --without-sane          do not use SANE (scanner support)
+  --without-xcomposite    do not use the Xcomposite extension
+  --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-xml           do not use XML
+  --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-xvidmode      do not use XFree video mode extension
+  --with-wine-tools=DIR   use Wine tools from directory DIR
   --with-x                use the X Window System
 
 Some influential environment variables:
@@ -1451,7 +1483,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Wine configure 0.9.47
+Wine configure 0.9.54
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1465,7 +1497,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 0.9.47, which was
+It was created by Wine $as_me 0.9.54, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
 
 
+# Check whether --with-alsa was given.
+if test "${with_alsa+set}" = set; then
+  withval=$with_alsa; if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi
+fi
+
+
+# Check whether --with-audioio was given.
+if test "${with_audioio+set}" = set; then
+  withval=$with_audioio; if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi
+fi
+
+
+# Check whether --with-capi was given.
+if test "${with_capi+set}" = set; then
+  withval=$with_capi; if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi
+fi
+
+
+# Check whether --with-cms was given.
+if test "${with_cms+set}" = set; then
+  withval=$with_cms; if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi
+fi
+
+
+# Check whether --with-coreaudio was given.
+if test "${with_coreaudio+set}" = set; then
+  withval=$with_coreaudio; if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi
+fi
+
+
+# Check whether --with-cups was given.
+if test "${with_cups+set}" = set; then
+  withval=$with_cups; if test "x$withval" = "xno"; then ac_cv_header_cups_cups_h=no; fi
+fi
+
+
+# Check whether --with-curses was given.
+if test "${with_curses+set}" = set; then
+  withval=$with_curses; if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi
+fi
+
+
+# Check whether --with-esd was given.
+if test "${with_esd+set}" = set; then
+  withval=$with_esd;
+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
+fi
+
+
+# Check whether --with-gphoto was given.
+if test "${with_gphoto+set}" = set; then
+  withval=$with_gphoto;
+fi
+
+
+# Check whether --with-hal was given.
+if test "${with_hal+set}" = set; then
+  withval=$with_hal;
+fi
+
+
+# Check whether --with-jack was given.
+if test "${with_jack+set}" = set; then
+  withval=$with_jack; if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi
+fi
+
+
+# Check whether --with-jpeg was given.
+if test "${with_jpeg+set}" = set; then
+  withval=$with_jpeg; if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi
+fi
+
+
+# Check whether --with-ldap was given.
+if test "${with_ldap+set}" = set; then
+  withval=$with_ldap; if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi
+fi
+
+
+# Check whether --with-nas was given.
+if test "${with_nas+set}" = set; then
+  withval=$with_nas; if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi
+fi
+
+
 # Check whether --with-opengl was given.
 if test "${with_opengl+set}" = set; then
   withval=$with_opengl;
 fi
 
 
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then
+  withval=$with_openssl; if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi
+fi
+
+
+# Check whether --with-oss was given.
+if test "${with_oss+set}" = set; then
+  withval=$with_oss; if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi
+fi
+
+
+# Check whether --with-png was given.
+if test "${with_png+set}" = set; then
+  withval=$with_png; if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi
+fi
+
+
+# Check whether --with-sane was given.
+if test "${with_sane+set}" = set; then
+  withval=$with_sane;
+fi
+
+
+# Check whether --with-xcomposite was given.
+if test "${with_xcomposite+set}" = set; then
+  withval=$with_xcomposite; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi
+fi
+
+
+# Check whether --with-xcursor was given.
+if test "${with_xcursor+set}" = set; then
+  withval=$with_xcursor; if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi
+fi
+
+
+# Check whether --with-xinerama was given.
+if test "${with_xinerama+set}" = set; then
+  withval=$with_xinerama; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi
+fi
+
+
+# Check whether --with-xinput was given.
+if test "${with_xinput+set}" = set; then
+  withval=$with_xinput; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi
+fi
+
+
+# Check whether --with-xml was given.
+if test "${with_xml+set}" = set; then
+  withval=$with_xml;
+fi
+
+
+# Check whether --with-xrandr was given.
+if test "${with_xrandr+set}" = set; then
+  withval=$with_xrandr; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi
+fi
+
+
+# Check whether --with-xrender was given.
+if test "${with_xrender+set}" = set; then
+  withval=$with_xrender; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi
+fi
+
+
+# Check whether --with-xshape was given.
+if test "${with_xshape+set}" = set; then
+  withval=$with_xshape; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi
+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;
+fi
+
+
+# Check whether --with-xvidmode was given.
+if test "${with_xvidmode+set}" = set; then
+  withval=$with_xvidmode; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi
+fi
+
+
+
 # Check whether --with-wine-tools was given.
 if test "${with_wine_tools+set}" = set; then
   withval=$with_wine_tools;
@@ -7165,6 +7378,12 @@ cat >>conftest.$ac_ext <<_ACEOF
      #if HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
      #endif
+     #if HAVE_SYS_SOCKETVAR_H
+     # include <sys/socketvar.h>
+     #endif
+     #if HAVE_NETINET_IN_H
+     # include <netinet/in.h>
+     #endif
 
 #include <$ac_header>
 _ACEOF
@@ -7207,9 +7426,6 @@ fi
 
 done
 
-     #if HAVE_SYS_SOCKETVAR_H
-     # include <sys/socketvar.h>
-     #endif
 
 
 for ac_header in netinet/tcp_var.h
@@ -8089,7 +8305,9 @@ fi
     LDSHARED="\$(CC) -dynamiclib"
     STRIP="$STRIP -x"
     LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
-        COREFOUNDATIONLIB="-framework CoreFoundation"
+        SECURITYLIB="-framework Security -framework CoreFoundation"
+
+    COREFOUNDATIONLIB="-framework CoreFoundation"
 
     IOKITLIB="-framework IOKit -framework CoreFoundation"
 
@@ -8873,7 +9091,7 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; }
 
     if test "$cross_compiling" = "no"
     then
-      for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc
+      for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8916,7 +9134,7 @@ fi
 done
 test -n "$CROSSCC" || CROSSCC="false"
 
-      for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool
+      for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8959,7 +9177,7 @@ fi
 done
 test -n "$DLLTOOL" || DLLTOOL="false"
 
-      for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres
+      for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -9002,7 +9220,7 @@ fi
 done
 test -n "$CROSSWINDRES" || CROSSWINDRES="false"
 
-      for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar
+      for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -9468,6 +9686,18 @@ _ACEOF
 fi
 
         fi
+        if test "x$ac_cv_lib_soname_Xcursor" = "x"; then
+  case "x$with_xcursor" in
+  x)   wine_notices="$wine_notices|libxcursor development files not found, the Xcursor extension won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxcursor development files not found, the Xcursor extension won't be supported.
+This is an error since --with-xcursor was requested." >&5
+echo "$as_me: error: libxcursor development files not found, the Xcursor extension won't be supported.
+This is an error since --with-xcursor was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+fi
+
 
                 if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
         then
@@ -9550,6 +9780,18 @@ _ACEOF
 fi
 
         fi
+        if test "x$ac_cv_lib_soname_Xi" = "x"; then
+  case "x$with_xinput" in
+  x)   wine_notices="$wine_notices|libxi development files not found, the Xinput extension won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxi development files not found, the Xinput extension won't be supported.
+This is an error since --with-xinput was requested." >&5
+echo "$as_me: error: libxi development files not found, the Xinput extension won't be supported.
+This is an error since --with-xinput was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+fi
+
 
                 if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
         then
@@ -9624,8 +9866,15 @@ fi
 
         fi
         if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then
-  wine_notices="$wine_notices|XShm development files not found.
-Wine will be built without XShm support. (winex11.drv)"
+  case "x$with_xshm" in
+  x)   wine_notices="$wine_notices|XShm development files not found, X Shared Memory won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: XShm development files not found, X Shared Memory won't be supported.
+This is an error since --with-xshm was requested." >&5
+echo "$as_me: error: XShm development files not found, X Shared Memory won't be supported.
+This is an error since --with-xshm was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -9702,8 +9951,15 @@ fi
 
         fi
         if test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"; then
-  wine_notices="$wine_notices|XShape development files not found.
-Wine will be built without XShape support. (winex11.drv)"
+  case "x$with_xshape" in
+  x)   wine_notices="$wine_notices|XShape development files not found, XShape won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: XShape development files not found, XShape won't be supported.
+This is an error since --with-xshape was requested." >&5
+echo "$as_me: error: XShape development files not found, XShape won't be supported.
+This is an error since --with-xshape was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -9782,8 +10038,15 @@ fi
 
         fi
         if test "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" != "yes"; then
-  wine_notices="$wine_notices|Xxf86vm development files not found.
-Wine will be built without XF86 Vidmode support. (winex11.drv)"
+  case "x$with_xvidmode" in
+  x)   wine_notices="$wine_notices|libxxf86vm development files not found, XFree86 Vidmode won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxxf86vm development files not found, XFree86 Vidmode won't be supported.
+This is an error since --with-xvidmode was requested." >&5
+echo "$as_me: error: libxxf86vm development files not found, XFree86 Vidmode won't be supported.
+This is an error since --with-xvidmode was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -9938,8 +10201,15 @@ fi
 
         fi
         if test "x$ac_cv_lib_soname_Xrender" = "x"; then
-  wine_notices="$wine_notices|XRender development files not found.
-Wine will be built without XRender support. (winex11.drv)"
+  case "x$with_xrender" in
+  x)   wine_notices="$wine_notices|libxrender development files not found, XRender won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxrender development files not found, XRender won't be supported.
+This is an error since --with-xrender was requested." >&5
+echo "$as_me: error: libxrender development files not found, XRender won't be supported.
+This is an error since --with-xrender was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
         if test "x$ac_cv_lib_soname_Xrandr" = "x"; then
-  wine_notices="$wine_notices|XRandr development files not found.
-Wine will be built without XRandr support. (winex11.drv)"
+  case "x$with_xrandr" in
+  x)   wine_notices="$wine_notices|libxrandr development files not found, XRandr won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxrandr development files not found, XRandr won't be supported.
+This is an error since --with-xrandr was requested." >&5
+echo "$as_me: error: libxrandr development files not found, XRandr won't be supported.
+This is an error since --with-xrandr was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
         if test "x$ac_cv_lib_soname_Xinerama" = "x"; then
-  wine_notices="$wine_notices|Xinerama development files not found.
-Wine will be built without Xinerama support. (winex11.drv)"
+  case "x$with_xinerama" in
+  x)   wine_notices="$wine_notices|libxinerama development files not found, multi-monitor setups won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxinerama development files not found, multi-monitor setups won't be supported.
+This is an error since --with-xinerama was requested." >&5
+echo "$as_me: error: libxinerama development files not found, multi-monitor setups won't be supported.
+This is an error since --with-xinerama was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 
         fi
         if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then
-  wine_notices="$wine_notices|XComposite development files not found.
-Wine will be built without XComposite support. (winex11.drv)"
+  case "x$with_xcomposite" in
+  x)   wine_notices="$wine_notices|libxcomposite development files not found, Xcomposite won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxcomposite development files not found, Xcomposite won't be supported.
+This is an error since --with-xcomposite was requested." >&5
+echo "$as_me: error: libxcomposite development files not found, Xcomposite won't be supported.
+This is an error since --with-xcomposite was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 
-        if test "x$with_opengl" != "xno"
+        opengl_msg=""
+    if test "x$with_opengl" != "xno"
     then
 
 
@@ -10463,6 +10755,72 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LIBS=$ac_check_soname_save_LIBS
+fi
+if test "x$ac_cv_lib_soname_GL" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+       { echo "$as_me:$LINENO: checking for -lGL" >&5
+echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
+if test "${ac_cv_lib_soname_GL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_soname_save_LIBS=$LIBS
+LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 glXCreateContext ();
+int
+main ()
+{
+return glXCreateContext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  case "$LIBEXT" in
+    dll) ;;
+    dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^       ]*\).*$/\1/"';2,$d'` ;;
+  esac
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -10473,13 +10831,29 @@ if test "x$ac_cv_lib_soname_GL" = "x"; then
   { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
        if test -f /usr/X11R6/lib/libGL.a
-                              then
-                                  wine_warnings="$wine_warnings|/usr/X11R6/lib/libGL.a is present on your system.
+                                   then
+                                       opengl_msg="/usr/X11R6/lib/libGL.a is present on your system.
 This probably prevents linking to OpenGL. Try deleting the file and restarting configure."
-                              else
-                                  wine_warnings="$wine_warnings|No OpenGL library found on this system.
-Wine will be build without OpenGL or Direct3D support."
-                              fi
+                                   else
+                                       opengl_msg="No OpenGL library found on this system."
+                                   fi
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
+echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBGL "$ac_cv_lib_soname_GL"
+_ACEOF
+
+       OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"
+                                   OPENGLFILES='$(OPENGLFILES)'
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_OPENGL 1
+_ACEOF
+
+fi
+
 else
   { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
@@ -10566,14 +10940,27 @@ if test $ac_cv_lib_GLU_gluLookAt = yes; then
 fi
 
              else
-                 wine_warnings="$wine_warnings|Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).
-Wine will be build without OpenGL or Direct3D support."
+                 opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries."
             fi
          else
-             wine_warnings="$wine_warnings|OpenGL development headers not found.
-Wine will be build without OpenGL or Direct3D support."
+             opengl_msg="OpenGL development headers not found."
         fi
     fi
+    if test -n "$opengl_msg"; then
+  case "x$with_opengl" in
+  x)   wine_warnings="$wine_warnings|$opengl_msg
+OpenGL and Direct3D won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: $opengl_msg
+OpenGL and Direct3D won't be supported.
+This is an error since --with-opengl was requested." >&5
+echo "$as_me: error: $opengl_msg
+OpenGL and Direct3D won't be supported.
+This is an error since --with-opengl was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+fi
+
 
         NASLIBS=""
 
@@ -10923,12 +11310,27 @@ else
     XLIB=""
     X_CFLAGS=""
     X_LIBS=""
-    wine_warnings="$wine_warnings|X development files not found. Wine will be built
+fi
+if test "x$XLIB" = "x"; then
+  case "x$with_x" in
+  x)   wine_warnings="$wine_warnings|X development files not found. Wine will be built
+without X support, which probably isn't what you want. You will need to install
+development packages of Xlib/Xfree86 at the very least." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: X development files not found. Wine will be built
 without X support, which probably isn't what you want. You will need to install
-development packages of Xlib/Xfree86 at the very least."
+development packages of Xlib/Xfree86 at the very least.
+This is an error since --with-x was requested." >&5
+echo "$as_me: error: X development files not found. Wine will be built
+without X support, which probably isn't what you want. You will need to install
+development packages of Xlib/Xfree86 at the very least.
+This is an error since --with-x was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
+
 XML2LIBS=""
 
 XML2INCL=""
@@ -10937,16 +11339,18 @@ XSLTLIBS=""
 
 XSLTINCL=""
 
-ac_save_CPPFLAGS="$CPPFLAGS"
-if test "$PKG_CONFIG" != "false"
+if test "x$with_xml" != "xno"
 then
-    ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
-    ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
-else
-    ac_xml_libs="`xml2-config --libs 2>/dev/null`"
-    ac_xml_cflags="`xml2-config --cflags  2>/dev/null`"
-fi
-CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
+        ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
+    else
+        ac_xml_libs="`xml2-config --libs 2>/dev/null`"
+        ac_xml_cflags="`xml2-config --cflags  2>/dev/null`"
+    fi
+    CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
 
 for ac_header in libxml/parser.h
 do
@@ -11154,11 +11558,11 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBXML2 1
 _ACEOF
 
-             XML2LIBS="$ac_xml_libs"
-             XML2INCL="$ac_xml_cflags"
+                 XML2LIBS="$ac_xml_libs"
+                 XML2INCL="$ac_xml_cflags"
 fi
 
-         { echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
+             { echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
 echo $ECHO_N "checking for xmlReadMemory in -lxml2... $ECHO_C" >&6; }
 if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11227,7 +11631,7 @@ _ACEOF
 
 fi
 
-         { echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
+             { echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
 echo $ECHO_N "checking for xmlNewDocPI in -lxml2... $ECHO_C" >&6; }
 if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 
 done
 
-CPPFLAGS="$ac_save_CPPFLAGS"
+    CPPFLAGS="$ac_save_CPPFLAGS"
+fi
 if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then
-  wine_notices="$wine_notices|libxml2 development files not found.
-Wine will be built without XML support. (msxml.dll)"
+  case "x$with_xml" in
+  x)   wine_notices="$wine_notices|libxml2 development files not found, XML won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxml2 development files not found, XML won't be supported.
+This is an error since --with-xml was requested." >&5
+echo "$as_me: error: libxml2 development files not found, XML won't be supported.
+This is an error since --with-xml was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
-if test "$PKG_CONFIG" != "false"
+if test "x$with_xslt" != "xno"
 then
-    ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
-    ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
-else
-    ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
-    ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
-fi
-CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
+        ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
+    else
+        ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
+        ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
+    fi
+    CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
 
 
 for ac_header in libxslt/pattern.h libxslt/transform.h
@@ -11440,8 +11854,8 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBXSLT 1
 _ACEOF
 
-             XSLTLIBS="$ac_xslt_libs"
-             XSLTINCL="$ac_xslt_cflags"
+                 XSLTLIBS="$ac_xslt_libs"
+                 XSLTINCL="$ac_xslt_cflags"
 fi
 
 
 
 done
 
-CPPFLAGS="$ac_save_CPPFLAGS"
+    CPPFLAGS="$ac_save_CPPFLAGS"
+fi
 if test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"; then
-  wine_notices="$wine_notices|libxslt development files not found.
-Wine will be built without xslt support. (msxml.dll)"
+  case "x$with_xslt" in
+  x)   wine_notices="$wine_notices|libxslt development files not found, xslt won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libxslt development files not found, xslt won't be supported.
+This is an error since --with-xslt was requested." >&5
+echo "$as_me: error: libxslt development files not found, xslt won't be supported.
+This is an error since --with-xslt was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 HALINCL=""
 
-if test "$PKG_CONFIG" != "false"
+if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
     ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
 if test "x$ac_cv_lib_soname_hal" = "x"; then
-  wine_notices="$wine_notices|libhal development files not found.
-Wine will be built without dynamic device support. (explorer.exe)"
+  case "x$with_hal" in
+  x)   wine_notices="$wine_notices|libhal development files not found, no dynamic device support." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libhal development files not found, no dynamic device support.
+This is an error since --with-hal was requested." >&5
+echo "$as_me: error: libhal development files not found, no dynamic device support.
+This is an error since --with-hal was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -12023,8 +12452,15 @@ done
 
 LIBS="$ac_save_LIBS"
 if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then
-  wine_notices="$wine_notices|lib(n)curses development files not found.
-Wine will be built without (n)curses support. (wineconsole.exe)"
+  case "x$with_curses" in
+  x)   wine_notices="$wine_notices|lib(n)curses development files not found, curses won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: lib(n)curses development files not found, curses won't be supported.
+This is an error since --with-curses was requested." >&5
+echo "$as_me: error: lib(n)curses development files not found, curses won't be supported.
+This is an error since --with-curses was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -12066,7 +12502,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-if test "$sane_devel" != "no"
+if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
 then
     ac_sane_incl="`$sane_devel --cflags`"
     ac_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
 if test "x$ac_cv_lib_soname_sane" = "x"; then
-  wine_notices="$wine_notices|libsane development files not found.
-Wine will be built without scanner support. (sane.ds/twain_32.dll)"
+  case "x$with_sane" in
+  x)   wine_notices="$wine_notices|libsane development files not found, scanners won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libsane development files not found, scanners won't be supported.
+This is an error since --with-sane was requested." >&5
+echo "$as_me: error: libsane development files not found, scanners won't be supported.
+This is an error since --with-sane was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -12368,7 +12811,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no"
+if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no" -a "x$with_gphoto" != "xno"
 then
     ac_gphoto2_incl="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`"
     ac_gphoto2_libs=""
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
 if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then
-  wine_notices="$wine_notices|libgphoto2 development files not found.
-Wine will be built without Digital Camera support. (gphoto2.ds/twain_32.dll)"
+  case "x$with_gphoto" in
+  x)   wine_notices="$wine_notices|libgphoto2 development files not found, digital cameras won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libgphoto2 development files not found, digital cameras won't be supported.
+This is an error since --with-gphoto was requested." >&5
+echo "$as_me: error: libgphoto2 development files not found, digital cameras won't be supported.
+This is an error since --with-gphoto was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 
 fi
 if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then
-  wine_notices="$wine_notices|liblcms development files not found.
-Wine will be built without Color Management support. (mscms.dll)"
+  case "x$with_cms" in
+  x)   wine_notices="$wine_notices|liblcms development files not found, Color Management won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: liblcms development files not found, Color Management won't be supported.
+This is an error since --with-cms was requested." >&5
+echo "$as_me: error: liblcms development files not found, Color Management won't be supported.
+This is an error since --with-cms was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -12898,11 +13355,19 @@ LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
 
 
 
+
+
+
+
 for ac_func in \
        ldap_count_references \
        ldap_first_reference \
        ldap_next_reference \
-       ldap_parse_reference
+       ldap_parse_reference \
+       ldap_parse_sort_control \
+       ldap_parse_sortresponse_control \
+       ldap_parse_vlv_control \
+       ldap_parse_vlvresponse_control
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -12998,8 +13463,15 @@ done
 LIBS="$ac_wine_check_funcs_save_LIBS"
 fi
 if test "x$LDAPLIBS" = "x"; then
-  wine_notices="$wine_notices|libldap (OpenLDAP) development files not found.
-Wine will be built without LDAP support. (wldap32.dll)"
+  case "x$with_ldap" in
+  x)   wine_notices="$wine_notices|libldap (OpenLDAP) development files not found, LDAP won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libldap (OpenLDAP) development files not found, LDAP won't be supported.
+This is an error since --with-ldap was requested." >&5
+echo "$as_me: error: libldap (OpenLDAP) development files not found, LDAP won't be supported.
+This is an error since --with-ldap was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -13957,7 +14429,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-if test x$ESDCONFIG != x -a x$ESDCONFIG != x'"$ESDCONFIG"';
+if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"';
 then
     ESD_CFLAGS=""
     for i in `$ESDCONFIG --cflags`
 
 fi
 if test "x$ac_cv_lib_soname_capi20" = "x"; then
-  wine_notices="$wine_notices|libcapi20 development files not found.
-Wine will be built without ISDN support. (capi2032.dll)"
+  case "x$with_capi" in
+  x)   wine_notices="$wine_notices|libcapi20 development files not found, ISDN won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libcapi20 development files not found, ISDN won't be supported.
+This is an error since --with-capi was requested." >&5
+echo "$as_me: error: libcapi20 development files not found, ISDN won't be supported.
+This is an error since --with-capi was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 
 fi
 if test "x$ac_cv_lib_soname_cups" = "x"; then
-  wine_notices="$wine_notices|libcups development files not found.
-Wine will be built without CUPS support."
+  case "x$with_cups" in
+  x)   wine_notices="$wine_notices|libcups development files not found, CUPS won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libcups development files not found, CUPS won't be supported.
+This is an error since --with-cups was requested." >&5
+echo "$as_me: error: libcups development files not found, CUPS won't be supported.
+This is an error since --with-cups was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
@@ -14578,11 +15064,252 @@ _ACEOF
 
 fi
 
-fi
-if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
-  wine_notices="$wine_notices|fontconfig development files not found.
-Wine will be built without fontconfig support."
-fi
+elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno"
+then
+        ac_save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    $as_unset ac_cv_header_fontconfig_fontconfig_h
+
+for ac_header in fontconfig/fontconfig.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to wine-devel@winehq.org ##
+## ------------------------------------ ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
+    then
+        FONTCONFIGINCL="$X_CFLAGS"
+
+        { echo "$as_me:$LINENO: checking for -lfontconfig" >&5
+echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; }
+if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_soname_save_LIBS=$LIBS
+LIBS="-lfontconfig $X_LIBS $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 FcInit ();
+int
+main ()
+{
+return FcInit ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  case "$LIBEXT" in
+    dll) ;;
+    dylib) ac_cv_lib_soname_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfontconfig\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*\(libfontconfig\.$LIBEXT[^       ]*\).*$/\1/"';2,$d'` ;;
+  esac
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LIBS=$ac_check_soname_save_LIBS
+fi
+if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
+echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig"
+_ACEOF
+
+
+fi
+
+    fi
+fi
+if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
+  case "x$with_fontconfig" in
+  x)   wine_notices="$wine_notices|fontconfig development files not found, fontconfig won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: fontconfig development files not found, fontconfig won't be supported.
+This is an error since --with-fontconfig was requested." >&5
+echo "$as_me: error: fontconfig development files not found, fontconfig won't be supported.
+This is an error since --with-fontconfig was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+fi
 
 
 if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes"
 
 fi
 if test "x$ac_cv_lib_soname_ssl" = "x"; then
-  wine_notices="$wine_notices|OpenSSL development files not found.
-Wine will be built without SSL support. (wininet.dll)"
+  case "x$with_openssl" in
+  x)   wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: OpenSSL development files not found, SSL won't be supported.
+This is an error since --with-openssl was requested." >&5
+echo "$as_me: error: OpenSSL development files not found, SSL won't be supported.
+This is an error since --with-openssl was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 
 fi
 if test "x$ac_cv_lib_soname_jpeg" = "x"; then
-  wine_notices="$wine_notices|libjpeg development files not found.
-Wine will be built without JPEG support. (oleaut32.dll)"
+  case "x$with_jpeg" in
+  x)   wine_notices="$wine_notices|libjpeg development files not found, JPEG won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libjpeg development files not found, JPEG won't be supported.
+This is an error since --with-jpeg was requested." >&5
+echo "$as_me: error: libjpeg development files not found, JPEG won't be supported.
+This is an error since --with-jpeg was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
 
 fi
 if test "x$ac_cv_lib_soname_png" = "x"; then
-  wine_notices="$wine_notices|libpng development files not found.
-Wine will be built without PNG support. (oleaut32.dll)"
+  case "x$with_png" in
+  x)   wine_notices="$wine_notices|libpng development files not found, PNG won't be supported." ;;
+  xno) ;;
+  *)   { { echo "$as_me:$LINENO: error: libpng development files not found, PNG won't be supported.
+This is an error since --with-png was requested." >&5
+echo "$as_me: error: libpng development files not found, PNG won't be supported.
+This is an error since --with-png was requested." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 fi
 
 
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
-                 "$ac_cv_header_sys_soundcard_h" != "yes" -a \
-                 "$ac_cv_header_machine_soundcard_h" != "yes" -a \
-                 "$ac_cv_header_soundcard_h" != "yes"; then
-  wine_warnings="$wine_warnings|No sound system was found. Windows applications will be silent."
+{ echo "$as_me:$LINENO: checking for -lodbc" >&5
+echo $ECHO_N "checking for -lodbc... $ECHO_C" >&6; }
+if test "${ac_cv_lib_soname_odbc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_soname_save_LIBS=$LIBS
+LIBS="-lodbc  $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 SQLConnect ();
+int
+main ()
+{
+return SQLConnect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  case "$LIBEXT" in
+    dll) ;;
+    dylib) ac_cv_lib_soname_odbc=`otool -L conftest$ac_exeext | grep "libodbc\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libodbc\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_odbc=`$ac_cv_path_LDD conftest$ac_exeext | grep "libodbc\\.$LIBEXT" | sed -e "s/^.*\(libodbc\.$LIBEXT[^         ]*\).*$/\1/"';2,$d'` ;;
+  esac
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LIBS=$ac_check_soname_save_LIBS
+fi
+if test "x$ac_cv_lib_soname_odbc" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+       cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBODBC "libodbc.$LIBEXT"
+_ACEOF
+
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_odbc" >&5
+echo "${ECHO_T}$ac_cv_lib_soname_odbc" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBODBC "$ac_cv_lib_soname_odbc"
+_ACEOF
+
+
 fi
 
 
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
+        "$ac_cv_header_sys_soundcard_h" != "yes" -a \
+        "$ac_cv_header_machine_soundcard_h" != "yes" -a \
+        "$ac_cv_header_soundcard_h" != "yes" -a \
+        "x$with_alsa$with_audioio$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnonononononono
+then
+    wine_warnings="$wine_warnings|No sound system was found. Windows applications will be silent."
+fi
+
 
 EXTRACFLAGS=""
 
@@ -15699,6 +16530,9 @@ esac
 
 
 
+
+
+
 
 
 
@@ -15708,6 +16542,7 @@ for ac_func in \
        _popen \
        _snprintf \
        _spawnvp \
+       _strdup \
        _stricmp \
        _strnicmp \
        _vsnprintf \
@@ -15747,6 +16582,7 @@ for ac_func in \
        rfork \
        sched_yield \
        select \
+       setproctitle \
        setrlimit \
        settimeofday \
        sigaltstack \
@@ -15756,6 +16592,7 @@ for ac_func in \
        statfs \
        statvfs \
        strcasecmp \
+       strdup \
        strerror \
        strncasecmp \
        strtold \
@@ -17444,13 +18281,13 @@ int
 main ()
 {
 
-    char *name=NULL;
+    char *name=0;
     struct hostent he;
     struct hostent *result;
-    char *buf=NULL;
+    char *buf=0;
     int bufsize=0;
     int res,errnr;
-    char *addr=NULL;
+    char *addr=0;
     int addrlen=0;
     int addrtype=0;
     res=gethostbyname_r(name,&he,buf,bufsize,&result,&errnr);
@@ -20274,6 +21111,8 @@ ac_config_files="$ac_config_files dlls/acledit/Makefile"
 
 ac_config_files="$ac_config_files dlls/activeds/Makefile"
 
+ac_config_files="$ac_config_files dlls/actxprxy/Makefile"
+
 ac_config_files="$ac_config_files dlls/advapi32/Makefile"
 
 ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile"
@@ -20322,6 +21161,8 @@ ac_config_files="$ac_config_files dlls/compstui/Makefile"
 
 ac_config_files="$ac_config_files dlls/credui/Makefile"
 
+ac_config_files="$ac_config_files dlls/credui/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/crtdll/Makefile"
 
 ac_config_files="$ac_config_files dlls/crypt32/Makefile"
@@ -20332,6 +21173,10 @@ ac_config_files="$ac_config_files dlls/cryptdll/Makefile"
 
 ac_config_files="$ac_config_files dlls/cryptnet/Makefile"
 
+ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile"
+
+ac_config_files="$ac_config_files dlls/ctapi32/Makefile"
+
 ac_config_files="$ac_config_files dlls/ctl3d32/Makefile"
 
 ac_config_files="$ac_config_files dlls/d3d10/Makefile"
@@ -20352,6 +21197,10 @@ ac_config_files="$ac_config_files dlls/d3drm/tests/Makefile"
 
 ac_config_files="$ac_config_files dlls/d3dx8/Makefile"
 
+ac_config_files="$ac_config_files dlls/d3dx8/tests/Makefile"
+
+ac_config_files="$ac_config_files dlls/d3dx9_36/Makefile"
+
 ac_config_files="$ac_config_files dlls/d3dxof/Makefile"
 
 ac_config_files="$ac_config_files dlls/dbghelp/Makefile"
@@ -20462,6 +21311,12 @@ ac_config_files="$ac_config_files dlls/imagehlp/Makefile"
 
 ac_config_files="$ac_config_files dlls/imm32/Makefile"
 
+ac_config_files="$ac_config_files dlls/imm32/tests/Makefile"
+
+ac_config_files="$ac_config_files dlls/inetcomm/Makefile"
+
+ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/infosoft/Makefile"
 
 ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile"
@@ -20516,6 +21371,8 @@ ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile"
 
 ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile"
 
+ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
+
 ac_config_files="$ac_config_files dlls/mpr/Makefile"
 
 ac_config_files="$ac_config_files dlls/mprapi/Makefile"
@@ -20528,6 +21385,8 @@ ac_config_files="$ac_config_files dlls/msacm32/tests/Makefile"
 
 ac_config_files="$ac_config_files dlls/msadp32.acm/Makefile"
 
+ac_config_files="$ac_config_files dlls/mscat32/Makefile"
+
 ac_config_files="$ac_config_files dlls/mscms/Makefile"
 
 ac_config_files="$ac_config_files dlls/mscms/tests/Makefile"
@@ -20562,6 +21421,8 @@ ac_config_files="$ac_config_files dlls/msrle32/Makefile"
 
 ac_config_files="$ac_config_files dlls/msvcirt/Makefile"
 
+ac_config_files="$ac_config_files dlls/msvcr71/Makefile"
+
 ac_config_files="$ac_config_files dlls/msvcrt/Makefile"
 
 ac_config_files="$ac_config_files dlls/msvcrt/tests/Makefile"
@@ -20598,6 +21459,8 @@ ac_config_files="$ac_config_files dlls/ntdll/tests/Makefile"
 
 ac_config_files="$ac_config_files dlls/ntdsapi/Makefile"
 
+ac_config_files="$ac_config_files dlls/ntdsapi/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile"
 
 ac_config_files="$ac_config_files dlls/ntprint/Makefile"
@@ -20644,6 +21507,8 @@ ac_config_files="$ac_config_files dlls/powrprof/Makefile"
 
 ac_config_files="$ac_config_files dlls/printui/Makefile"
 
+ac_config_files="$ac_config_files dlls/propsys/Makefile"
+
 ac_config_files="$ac_config_files dlls/psapi/Makefile"
 
 ac_config_files="$ac_config_files dlls/psapi/tests/Makefile"
@@ -20654,6 +21519,8 @@ ac_config_files="$ac_config_files dlls/qcap/Makefile"
 
 ac_config_files="$ac_config_files dlls/qmgr/Makefile"
 
+ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile"
+
 ac_config_files="$ac_config_files dlls/quartz/Makefile"
 
 ac_config_files="$ac_config_files dlls/quartz/tests/Makefile"
@@ -20670,6 +21537,8 @@ ac_config_files="$ac_config_files dlls/riched20/tests/Makefile"
 
 ac_config_files="$ac_config_files dlls/riched32/Makefile"
 
+ac_config_files="$ac_config_files dlls/riched32/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/rpcrt4/Makefile"
 
 ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile"
@@ -20850,6 +21719,8 @@ ac_config_files="$ac_config_files dlls/wintrust/tests/Makefile"
 
 ac_config_files="$ac_config_files dlls/wldap32/Makefile"
 
+ac_config_files="$ac_config_files dlls/wmi/Makefile"
+
 ac_config_files="$ac_config_files dlls/wnaspi32/Makefile"
 
 ac_config_files="$ac_config_files dlls/wow32/Makefile"
@@ -20922,6 +21793,8 @@ ac_config_files="$ac_config_files programs/spoolsv/Makefile"
 
 ac_config_files="$ac_config_files programs/start/Makefile"
 
+ac_config_files="$ac_config_files programs/svchost/Makefile"
+
 ac_config_files="$ac_config_files programs/taskmgr/Makefile"
 
 ac_config_files="$ac_config_files programs/uninstaller/Makefile"
@@ -21375,7 +22248,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Wine $as_me 0.9.47, which was
+This file was extended by Wine $as_me 0.9.54, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21428,7 +22301,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Wine config.status 0.9.47
+Wine config.status 0.9.54
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -21553,6 +22426,7 @@ do
     "dlls/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/Makefile" ;;
     "dlls/acledit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/acledit/Makefile" ;;
     "dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;;
+    "dlls/actxprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/actxprxy/Makefile" ;;
     "dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;;
     "dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;;
     "dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;;
     "dlls/comdlg32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/tests/Makefile" ;;
     "dlls/compstui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compstui/Makefile" ;;
     "dlls/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;;
+    "dlls/credui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/tests/Makefile" ;;
     "dlls/crtdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crtdll/Makefile" ;;
     "dlls/crypt32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/Makefile" ;;
     "dlls/crypt32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/tests/Makefile" ;;
     "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;;
     "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;;
+    "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;;
+    "dlls/ctapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctapi32/Makefile" ;;
     "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;;
     "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;;
     "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;;
@@ -21592,6 +22469,8 @@ do
     "dlls/d3drm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/Makefile" ;;
     "dlls/d3drm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/tests/Makefile" ;;
     "dlls/d3dx8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/Makefile" ;;
+    "dlls/d3dx8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/tests/Makefile" ;;
+    "dlls/d3dx9_36/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_36/Makefile" ;;
     "dlls/d3dxof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dxof/Makefile" ;;
     "dlls/dbghelp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dbghelp/Makefile" ;;
     "dlls/dciman32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dciman32/Makefile" ;;
@@ -21647,6 +22526,9 @@ do
     "dlls/imaadp32.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imaadp32.acm/Makefile" ;;
     "dlls/imagehlp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imagehlp/Makefile" ;;
     "dlls/imm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;;
+    "dlls/imm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/tests/Makefile" ;;
+    "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;;
+    "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;;
     "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;;
     "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;;
     "dlls/inkobj/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inkobj/Makefile" ;;
     "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;;
     "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;;
     "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;;
+    "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;;
     "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;;
     "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;;
     "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;;
     "dlls/msacm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;;
     "dlls/msacm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;;
     "dlls/msadp32.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msadp32.acm/Makefile" ;;
+    "dlls/mscat32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscat32/Makefile" ;;
     "dlls/mscms/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscms/Makefile" ;;
     "dlls/mscms/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscms/tests/Makefile" ;;
     "dlls/mscoree/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscoree/Makefile" ;;
@@ -21697,6 +22581,7 @@ do
     "dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;;
     "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;;
     "dlls/msvcirt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcirt/Makefile" ;;
+    "dlls/msvcr71/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcr71/Makefile" ;;
     "dlls/msvcrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/Makefile" ;;
     "dlls/msvcrt/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/tests/Makefile" ;;
     "dlls/msvcrt20/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt20/Makefile" ;;
@@ -21715,6 +22600,7 @@ do
     "dlls/ntdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdll/Makefile" ;;
     "dlls/ntdll/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdll/tests/Makefile" ;;
     "dlls/ntdsapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdsapi/Makefile" ;;
+    "dlls/ntdsapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdsapi/tests/Makefile" ;;
     "dlls/ntoskrnl.exe/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntoskrnl.exe/Makefile" ;;
     "dlls/ntprint/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/Makefile" ;;
     "dlls/ntprint/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/tests/Makefile" ;;
     "dlls/pdh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/tests/Makefile" ;;
     "dlls/powrprof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/powrprof/Makefile" ;;
     "dlls/printui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/printui/Makefile" ;;
+    "dlls/propsys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/propsys/Makefile" ;;
     "dlls/psapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/Makefile" ;;
     "dlls/psapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/tests/Makefile" ;;
     "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;;
     "dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;;
     "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;;
+    "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;;
     "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;;
     "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;;
     "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;;
@@ -21751,6 +22639,7 @@ do
     "dlls/riched20/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/Makefile" ;;
     "dlls/riched20/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/tests/Makefile" ;;
     "dlls/riched32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched32/Makefile" ;;
+    "dlls/riched32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched32/tests/Makefile" ;;
     "dlls/rpcrt4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/Makefile" ;;
     "dlls/rpcrt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/tests/Makefile" ;;
     "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;;
@@ -21841,6 +22730,7 @@ do
     "dlls/wintrust/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/Makefile" ;;
     "dlls/wintrust/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/tests/Makefile" ;;
     "dlls/wldap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/Makefile" ;;
+    "dlls/wmi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmi/Makefile" ;;
     "dlls/wnaspi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wnaspi32/Makefile" ;;
     "dlls/wow32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wow32/Makefile" ;;
     "dlls/ws2_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/Makefile" ;;
@@ -21877,6 +22767,7 @@ do
     "programs/rundll32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rundll32/Makefile" ;;
     "programs/spoolsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/spoolsv/Makefile" ;;
     "programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;;
+    "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;;
     "programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;;
     "programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;;
     "programs/view/Makefile") CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;;
@@ -22140,6 +23031,7 @@ LDD!$LDD$ac_delim
 DLLTOOL!$DLLTOOL$ac_delim
 DLLWRAP!$DLLWRAP$ac_delim
 MINGWAR!$MINGWAR$ac_delim
+SECURITYLIB!$SECURITYLIB$ac_delim
 COREFOUNDATIONLIB!$COREFOUNDATIONLIB$ac_delim
 IOKITLIB!$IOKITLIB$ac_delim
 LDEXECFLAGS!$LDEXECFLAGS$ac_delim
@@ -22173,6 +23065,7 @@ ESDLIBS!$ESDLIBS$ac_delim
 ESDINCL!$ESDINCL$ac_delim
 ALSALIBS!$ALSALIBS$ac_delim
 AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim
+FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim
 EXTRACFLAGS!$EXTRACFLAGS$ac_delim
 BUILTINFLAG!$BUILTINFLAG$ac_delim
 LDPATH!$LDPATH$ac_delim
@@ -22187,7 +23080,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 
 ac_save_IFS="$IFS"
 IFS="|"
-if test "$verbose" = "yes"; then
+if test "x$wine_notices != "x; then
+    echo >&6
     for msg in $wine_notices; do
         if test -n "$msg"; then
-            echo >&2
             { echo "$as_me:$LINENO: $msg" >&5
 echo "$as_me: $msg" >&6;}
         fi
@@ -22661,7 +23554,7 @@ echo "$as_me: WARNING: $msg" >&2;}
 done
 IFS="$ac_save_IFS"
 
-echo
-echo "Configure finished.  Do '${ac_make} depend && ${ac_make}' to compile Wine."
-echo
+echo "
+$as_me: Finished.  Do '${ac_make} depend && ${ac_make}' to compile Wine.
+" >&6