server: Removed the no longer used bare parameter out of get_console_mode request.
[wine] / configure
index 788a57a..4d89bd8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Wine 1.3.3.
+# Generated by GNU Autoconf 2.67 for Wine 1.3.6.
 #
 # Report bugs to <wine-devel@winehq.org>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Wine'
 PACKAGE_TARNAME='wine'
-PACKAGE_VERSION='1.3.3'
-PACKAGE_STRING='Wine 1.3.3'
+PACKAGE_VERSION='1.3.6'
+PACKAGE_STRING='Wine 1.3.6'
 PACKAGE_BUGREPORT='wine-devel@winehq.org'
 PACKAGE_URL='http://www.winehq.org'
 
@@ -618,6 +618,8 @@ FONTCONFIGINCL
 CUPSINCL
 AUDIOIOLIBS
 ALSALIBS
+GSTREAMER_INCL
+GSTREAMER_LIBS
 ESDLIBS
 ESDINCL
 ESDCONFIG
@@ -779,6 +781,7 @@ with_gphoto
 with_glu
 with_gnutls
 with_gsm
+with_gstreamer
 with_hal
 with_icns
 with_jack
@@ -1366,7 +1369,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.3 to adapt to many kinds of systems.
+\`configure' configures Wine 1.3.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1435,7 +1438,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Wine 1.3.3:";;
+     short | recursive ) echo "Configuration of Wine 1.3.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1468,6 +1471,7 @@ Optional Packages:
   --without-glu           do not use the GLU library
   --without-gnutls        do not use GnuTLS (schannel support)
   --without-gsm           do not use libgsm (GSM 06.10 codec support)
+  --without-gstreamer     do not use GStreamer (codecs support)
   --without-hal           do not use HAL (dynamic device support)
   --without-icns          do not use ICNS icon support
   --without-jack          do not use the Jack sound support
@@ -1579,7 +1583,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Wine configure 1.3.3
+Wine configure 1.3.6
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2097,7 +2101,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.3, which was
+It was created by Wine $as_me 1.3.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2586,6 +2590,12 @@ if test "${with_gsm+set}" = set; then :
 fi
 
 
+# Check whether --with-gstreamer was given.
+if test "${with_gstreamer+set}" = set; then :
+  withval=$with_gstreamer;
+fi
+
+
 # Check whether --with-hal was given.
 if test "${with_hal+set}" = set; then :
   withval=$with_hal;
@@ -5798,6 +5808,7 @@ for ac_header in \
        linux/types.h \
        linux/ucdrom.h \
        mach-o/nlist.h \
+       mach-o/loader.h \
        mach/mach.h \
        mach/machine.h \
        machine/cpu.h \
@@ -7017,7 +7028,7 @@ then
   i[3456789]86*)
     ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;;
   x86_64)
-    ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;;
+    ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;;
   *)
     ac_prefix_list="" ;;
 esac
@@ -9189,6 +9200,56 @@ if test "x$ac_cv_lib_xml2_xmlNewDocPI" = x""yes; then :
 
 $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h
 
+fi
+
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5
+$as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; }
+if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2 $ac_xml_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 xmlSchemaSetValidStructuredErrors ();
+int
+main ()
+{
+return xmlSchemaSetValidStructuredErrors ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=yes
+else
+  ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=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_xml2_xmlSchemaSetValidStructuredErrors" >&5
+$as_echo "$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" >&6; }
+if test "x$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" = x""yes; then :
+
+$as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h
+
+fi
+
+             ac_fn_c_check_type "$LINENO" "xmlDocProperties" "ac_cv_type_xmlDocProperties" "#include <libxml/tree.h>
+"
+if test "x$ac_cv_type_xmlDocProperties" = x""yes; then :
+
+$as_echo "#define HAVE_XMLDOC_PROPERTIES 1" >>confdefs.h
+
 fi
 
 
@@ -9977,13 +10038,13 @@ esac
 fi
 
 
-RESOLVLIBS=""
-
 if test "$ac_cv_header_resolv_h" = "yes"
 then
     ac_save_LIBS="$LIBS"
-    LIBS="$LIBS -lresolv"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    for lib in '' -lresolv
+    do
+      LIBS="$lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -9992,7 +10053,7 @@ then
 int
 main ()
 {
-res_init();
+res_query("foo",ns_c_in,0,0,0);
   ;
   return 0;
 }
@@ -10001,10 +10062,15 @@ if ac_fn_c_try_link "$LINENO"; then :
 
 $as_echo "#define HAVE_RESOLV 1" >>confdefs.h
 
-         RESOLVLIBS="-lresolv"
+         RESOLVLIBS="$lib"
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+      if test "${RESOLVLIBS+set}" = set; then
+        break
+      fi
+    done
     LIBS="$ac_save_LIBS"
 fi
 
     CFLAGS="$save_CFLAGS"
 fi
 
+if test "x$with_gstreamer" != "xno"
+then
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    if test "$PKG_CONFIG" != "false"; then
+        ac_gst_incl=""
+        for i in `$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null`
+        do
+            case "$i" in
+                -I*) ac_gst_incl="$ac_gst_incl $i";;
+            esac
+        done
+        ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_gst_incl"
+        ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default"
+if test "x$ac_cv_header_gst_gstpad_h" = x""yes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default"
+if test "x$ac_cv_header_gst_app_gstappsink_h" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_get_caps_reffed in -lgstreamer-0.10" >&5
+$as_echo_n "checking for gst_pad_get_caps_reffed in -lgstreamer-0.10... " >&6; }
+if test "${ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgstreamer-0.10  $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 gst_pad_get_caps_reffed ();
+int
+main ()
+{
+return gst_pad_get_caps_reffed ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed=yes
+else
+  ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed=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_gstreamer_0_10_gst_pad_get_caps_reffed" >&5
+$as_echo "$ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" >&6; }
+if test "x$ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_app_buffer_new in -lgstapp-0.10" >&5
+$as_echo_n "checking for gst_app_buffer_new in -lgstapp-0.10... " >&6; }
+if test "${ac_cv_lib_gstapp_0_10_gst_app_buffer_new+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgstapp-0.10 $ac_gst_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 gst_app_buffer_new ();
+int
+main ()
+{
+return gst_app_buffer_new ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gstapp_0_10_gst_app_buffer_new=yes
+else
+  ac_cv_lib_gstapp_0_10_gst_app_buffer_new=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_gstapp_0_10_gst_app_buffer_new" >&5
+$as_echo "$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&6; }
+if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = x""yes; then :
+  GSTREAMER_LIBS="$ac_gst_libs"
+
+                     GSTREAMER_INCL="$ac_gst_incl"
+
+fi
+
+fi
+
+fi
+
+
+fi
+
+
+    fi
+    CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then :
+  case "x$with_gstreamer" in
+  x)   as_fn_append wine_notices "|gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled" ;;
+  xno) ;;
+  *)   as_fn_error $? "gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled
+This is an error since --with-gstreamer was requested." "$LINENO" 5  ;;
+esac
+fi
+test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
+
 ALSALIBS=""
 
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
@@ -11971,63 +12155,6 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; }
     EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith"
   fi
 
-    saved_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Werror"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unused result warnings" >&5
-$as_echo_n "checking for broken unused result warnings... " >&6; }
-if test "${ac_cv_c_unused_result_warnings+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <unistd.h>
-int
-main ()
-{
-write(2,"a",1)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_unused_result_warnings=no
-else
-  ac_cv_c_unused_result_warnings=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_unused_result_warnings" >&5
-$as_echo "$ac_cv_c_unused_result_warnings" >&6; }
-  CFLAGS="$saved_CFLAGS"
-  if test "$ac_cv_c_unused_result_warnings" = "yes"
-  then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-unused-result" >&5
-$as_echo_n "checking whether the compiler supports -Wno-unused-result... " >&6; }
-if test "${ac_cv_cflags__Wno_unused_result+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -Wno-unused-result"
-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_unused_result=yes
-else
-  ac_cv_cflags__Wno_unused_result=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_unused_result" >&5
-$as_echo "$ac_cv_cflags__Wno_unused_result" >&6; }
-if test $ac_cv_cflags__Wno_unused_result = yes; then :
-  EXTRACFLAGS="$EXTRACFLAGS -Wno-unused-result"
-fi
-  fi
-
     if test "x$enable_maintainer_mode" = "xyes"
   then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5
@@ -12097,6 +12224,39 @@ $as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>con
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the need to disable Fortify" >&5
+$as_echo_n "checking for the need to disable Fortify... " >&6; }
+if test "${ac_cv_c_fortify_enabled+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+int
+main ()
+{
+#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0
+#error Fortify enabled
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_fortify_enabled=no
+else
+  ac_cv_c_fortify_enabled=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_fortify_enabled" >&5
+$as_echo "$ac_cv_c_fortify_enabled" >&6; }
+if test "$ac_cv_c_fortify_enabled" = yes
+then
+    CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether external symbols need an underscore prefix" >&5
 $as_echo_n "checking whether external symbols need an underscore prefix... " >&6; }
 if test "${ac_cv_c_extern_prefix+set}" = set; then :
@@ -14120,19 +14280,32 @@ wine_fn_append_rule ()
 
 wine_fn_all_dir_rules ()
 {
-    wine_fn_append_file ALL_DIRS $1
+    ac_dir=$1
+    ac_alldeps=$2
+    ac_makedep="\$(MAKEDEP)"
+    ac_input=Make.vars.in:$ac_dir/Makefile.in
+    if test $ac_dir != tools
+    then
+                ac_alldeps="$2 $ac_makedep"
+    fi
+    case $2 in
+      *.in) ac_input=$ac_input:$2 ;;
+      *) ac_makedep="$2 $ac_makedep" ;;
+    esac
+
+    wine_fn_append_file ALL_DIRS $ac_dir
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"__clean__: $1/__clean__
-.PHONY: $1/__clean__
-$1/__clean__: $1/Makefile
-       @cd $1 && \$(MAKE) clean
-       \$(RM) $1/Makefile
-$1/Makefile: $1/Makefile.in Make.vars.in config.status $2
-       @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend
-depend: $1/__depend__
-.PHONY: $1/__depend__
-$1/__depend__: $2 dummy
-       @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend"
+"__clean__: $ac_dir/__clean__
+.PHONY: $ac_dir/__clean__
+$ac_dir/__clean__: $ac_dir/Makefile
+       @cd $ac_dir && \$(MAKE) clean
+       \$(RM) $ac_dir/Makefile
+$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps
+       @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend
+depend: $ac_dir/__depend__
+.PHONY: $ac_dir/__depend__
+$ac_dir/__depend__: $ac_makedep dummy
+       @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend"
 }
 
 wine_fn_config_makefile ()
@@ -14143,7 +14316,7 @@ wine_fn_config_makefile ()
   return 0
 fi
 
-    wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
+    wine_fn_all_dir_rules $ac_dir Make.rules
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
@@ -14163,7 +14336,7 @@ wine_fn_config_lib ()
 {
     ac_name=$1
     ac_dir=dlls/$ac_name
-    wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)"
+    wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all __builddeps__: $ac_dir
 $ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@@ -14176,34 +14349,35 @@ uninstall:: $ac_dir/Makefile
 
 wine_fn_config_dll ()
 {
-    ac_dir=$1
+    ac_name=$1
+    ac_dir=dlls/$ac_name
     ac_enable=$2
     ac_implib=$3
     ac_implibsrc=$4
-    ac_file="dlls/$ac_dir/lib$ac_implib"
+    ac_file=$ac_dir/lib$ac_implib
     ac_deps="tools/widl tools/winebuild tools/winegcc include"
     ac_implibflags=""
 
-    case $ac_dir in
+    case $ac_name in
       *16) ac_implibflags=" -m16" ;;
     esac
 
-    wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
+    wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules
 
     if eval test \"x\$"$ac_enable"\" = x"no"; then :
                 test "$ac_enable" != enable_win16 || return 0
 else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: dlls/$ac_dir
-.PHONY: dlls/$ac_dir
-dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy
-       @cd dlls/$ac_dir && \$(MAKE)
-install:: dlls/$ac_dir/Makefile __builddeps__
-       @cd dlls/$ac_dir && \$(MAKE) install
-install-lib:: dlls/$ac_dir/Makefile __builddeps__
-       @cd dlls/$ac_dir && \$(MAKE) install-lib
-uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile
-       @cd dlls/$ac_dir && \$(MAKE) \$@"
+"all: $ac_dir
+.PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile __builddeps__ dummy
+       @cd $ac_dir && \$(MAKE)
+install:: $ac_dir/Makefile __builddeps__
+       @cd $ac_dir && \$(MAKE) install
+install-lib:: $ac_dir/Makefile __builddeps__
+       @cd $ac_dir && \$(MAKE) install-lib
+uninstall manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
+       @cd $ac_dir && \$(MAKE) \$@"
 fi
 
     if test -n "$ac_implibsrc"
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
 $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
-$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
-       @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.def
-$ac_file.$STATIC_IMPLIBEXT: dlls/$ac_dir/Makefile dummy
-       @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
-install-dev:: dlls/$ac_dir/Makefile __builddeps__
-       @cd dlls/$ac_dir && \$(MAKE) install-dev"
+$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
+       @cd $ac_dir && \$(MAKE) lib$ac_implib.def
+$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
+       @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
+install-dev:: $ac_dir/Makefile __builddeps__
+       @cd $ac_dir && \$(MAKE) install-dev"
         if test "x$CROSSTEST_DISABLE" = x
         then
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.cross.a
-$ac_file.cross.a: dlls/$ac_dir/Makefile dummy
-       @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a"
+$ac_file.cross.a: $ac_dir/Makefile dummy
+       @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a"
         fi
 
     elif test -n "$ac_implib"
     then
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.$IMPLIBEXT
-$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
-       \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec
-$ac_file.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
-       \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec
-install-dev:: dlls/$ac_dir/Makefile __builddeps__
-       @cd dlls/$ac_dir && \$(MAKE) install-dev"
+$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
+       \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec
+$ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
+       \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec
+install-dev:: $ac_dir/Makefile __builddeps__
+       @cd $ac_dir && \$(MAKE) install-dev"
         if test "x$CROSSTEST_DISABLE" = x
         then
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.cross.a
-$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
-       \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec"
+$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
+       \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec"
         fi
 
-        if test "$ac_dir" != "$ac_implib"
+        if test "$ac_name" != "$ac_implib"
         then
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
 dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
-       \$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$@
+       \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@
 clean::
        \$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
             if test "x$CROSSTEST_DISABLE" = x
@@ -14256,7 +14430,7 @@ clean::
                 wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: dlls/lib$ac_implib.cross.a
 dlls/lib$ac_implib.cross.a: $ac_file.cross.a
-       \$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$@"
+       \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@"
             fi
         fi
     fi
@@ -14264,33 +14438,34 @@ dlls/lib$ac_implib.cross.a: $ac_file.cross.a
 
 wine_fn_config_program ()
 {
-    ac_dir=$1
+    ac_name=$1
+    ac_dir=programs/$ac_name
     ac_enable=$2
     ac_install=$3
-    wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)"
+    wine_fn_all_dir_rules $ac_dir programs/Makeprog.rules
 
     if eval test \"x\$"$ac_enable"\" = x"no"; then :
 
 else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: programs/$ac_dir
-.PHONY: programs/$ac_dir
-programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
-       @cd programs/$ac_dir && \$(MAKE)"
+"all: $ac_dir
+.PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile __builddeps__ dummy
+       @cd $ac_dir && \$(MAKE)"
 
     test -n "$ac_install" || return
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"install install-lib:: programs/$ac_dir/Makefile __builddeps__
-       @cd programs/$ac_dir && \$(MAKE) install
-uninstall:: programs/$ac_dir/Makefile
-       @cd programs/$ac_dir && \$(MAKE) uninstall"
+"install install-lib:: $ac_dir/Makefile __builddeps__
+       @cd $ac_dir && \$(MAKE) install
+uninstall:: $ac_dir/Makefile
+       @cd $ac_dir && \$(MAKE) uninstall"
     if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno
     then
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "install install-lib:: tools \$(DESTDIR)\$(bindir)
-       \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
+       \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
 uninstall::
-       \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
+       \$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
     fi
 fi
 }
@@ -14306,7 +14481,7 @@ wine_fn_config_test ()
 $ac_name.rc:
        echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 $ac_name.res: $ac_name.rc $ac_name.exe"
-    wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)"
+    wine_fn_all_dir_rules $ac_dir Maketest.rules
 
     if test "x$enable_tests" = x""no; then :
 
 wine_fn_config_tool ()
 {
     ac_dir=$1
-    ac_deps="Make.rules"
-    if test "$ac_dir" != tools
-    then
-                ac_deps="$ac_deps \$(MAKEDEP)"
-    fi
-    wine_fn_all_dir_rules $ac_dir "$ac_deps"
+    wine_fn_all_dir_rules $ac_dir Make.rules
 
     if test "x$enable_tools" = x""no; then :
 
@@ -14618,7 +14788,8 @@ wine_fn_config_test dlls/dxgi/tests dxgi_test
 wine_fn_config_lib dxguid
 wine_fn_config_dll explorerframe enable_explorerframe
 wine_fn_config_test dlls/explorerframe/tests explorerframe_test
-wine_fn_config_dll faultrep enable_faultrep
+wine_fn_config_dll faultrep enable_faultrep faultrep
+wine_fn_config_test dlls/faultrep/tests faultrep_test
 wine_fn_config_dll fltlib enable_fltlib
 wine_fn_config_dll fusion enable_fusion
 wine_fn_config_test dlls/fusion/tests fusion_test
@@ -14670,6 +14841,7 @@ wine_fn_config_dll kernel32 enable_kernel32 kernel32
 wine_fn_config_test dlls/kernel32/tests kernel32_test
 wine_fn_config_dll keyboard.drv16 enable_win16
 wine_fn_config_dll krnl386.exe16 enable_win16 kernel
+wine_fn_config_dll ktmw32 enable_ktmw32
 wine_fn_config_dll loadperf enable_loadperf loadperf
 wine_fn_config_dll localspl enable_localspl
 wine_fn_config_test dlls/localspl/tests localspl_test
@@ -14868,6 +15040,7 @@ wine_fn_config_dll sti enable_sti sti
 wine_fn_config_test dlls/sti/tests sti_test
 wine_fn_config_dll storage.dll16 enable_win16
 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
@@ -14909,7 +15082,8 @@ wine_fn_config_dll vwin32.vxd enable_win16
 wine_fn_config_dll w32skrnl enable_win16
 wine_fn_config_dll w32sys.dll16 enable_win16
 wine_fn_config_dll wbemprox enable_wbemprox
-wine_fn_config_dll wer enable_wer
+wine_fn_config_dll wer enable_wer wer
+wine_fn_config_test dlls/wer/tests wer_test
 wine_fn_config_dll wiaservc enable_wiaservc
 wine_fn_config_dll win32s16.dll16 enable_win16
 wine_fn_config_dll win87em.dll16 enable_win16
@@ -14923,6 +15097,7 @@ wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv
 wine_fn_config_lib winecrt0
 wine_fn_config_dll wined3d enable_wined3d wined3d
 wine_fn_config_dll wineesd.drv enable_wineesd_drv
+wine_fn_config_dll winegstreamer enable_winegstreamer
 wine_fn_config_dll winejack.drv enable_winejack_drv
 wine_fn_config_dll winejoystick.drv enable_winejoystick_drv
 wine_fn_config_dll winemapi enable_winemapi
@@ -14952,6 +15127,7 @@ wine_fn_config_dll wintab32 enable_wintab32 wintab32
 wine_fn_config_test dlls/wintab32/tests wintab32_test
 wine_fn_config_dll wintrust enable_wintrust wintrust
 wine_fn_config_test dlls/wintrust/tests wintrust_test
+wine_fn_config_dll wlanapi enable_wlanapi
 wine_fn_config_dll wldap32 enable_wldap32 wldap32
 wine_fn_config_test dlls/wldap32/tests wldap32_test
 wine_fn_config_dll wmi enable_wmi
@@ -14978,6 +15154,7 @@ wine_fn_config_makefile libs/port enable_libs_port
 wine_fn_config_makefile libs/wine enable_libs_wine
 wine_fn_config_makefile libs/wpp enable_libs_wpp
 wine_fn_config_makefile loader enable_loader
+wine_fn_config_program aspnet_regiis enable_aspnet_regiis install
 wine_fn_config_program attrib enable_attrib install
 wine_fn_config_program cacls enable_cacls install
 wine_fn_config_program clock enable_clock install
@@ -14995,6 +15172,7 @@ wine_fn_config_program icinfo enable_icinfo install
 wine_fn_config_program iexplore enable_iexplore install
 wine_fn_config_program ipconfig enable_ipconfig install
 wine_fn_config_program lodctr enable_lodctr install
+wine_fn_config_program mofcomp enable_mofcomp install
 wine_fn_config_program mshta enable_mshta install
 wine_fn_config_program msiexec enable_msiexec installbin
 wine_fn_config_program net enable_net install
@@ -15578,7 +15756,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.3, which was
+This file was extended by Wine $as_me 1.3.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15649,7 +15827,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.3
+Wine config.status 1.3.6
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"