wininet/tests: Fix failures when connecting through proxy.
[wine] / configure
index e3761cf..c68b1d6 100755 (executable)
--- a/configure
+++ b/configure
@@ -653,13 +653,13 @@ CROSSCC
 CROSSTEST_DISABLE
 PRELINK
 CARBONLIB
+QUICKTIMELIB
 LIBOPENCL
 FRAMEWORK_OPENAL
 COREAUDIO
 DISKARBITRATIONLIB
 LDEXECFLAGS
 APPLICATIONSERVICESLIB
-QUICKTIMELIB
 IOKITLIB
 COREFOUNDATIONLIB
 SECURITYLIB
@@ -5772,6 +5772,7 @@ for ac_header in \
        IOKit/hid/IOHIDLib.h \
        OpenAL/al.h \
        OpenCL/opencl.h \
+       QuickTime/ImageCompression.h \
        alias.h \
        alsa/asoundlib.h \
        arpa/inet.h \
@@ -6513,8 +6514,6 @@ fi
 
     IOKITLIB="-framework IOKit -framework CoreFoundation"
 
-    QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
-
     APPLICATIONSERVICESLIB="-framework ApplicationServices"
 
     LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
@@ -6563,11 +6562,18 @@ done
 
         LIBS="$ac_save_LIBS"
     fi
-    enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
     case $host_cpu in
       *powerpc*)
         LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning"          ;;
     esac
+    if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
+    then
+        QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
+
+        enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
+    else
+        as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported."
+    fi
         if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
     then
         CARBONLIB="-framework Carbon"
@@ -10865,7 +10871,7 @@ fi
     fi
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then :
+if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then :
   case "x$with_gstreamer" in
   x)   as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;;
   xno) ;;
@@ -10879,9 +10885,9 @@ ALSALIBS=""
 
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_hw_params_get_access in -lasound" >&5
-$as_echo_n "checking for snd_pcm_hw_params_get_access in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access+set}" = set; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_hw_params_get_access_mask in -lasound" >&5
+$as_echo_n "checking for snd_pcm_hw_params_get_access_mask in -lasound... " >&6; }
+if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10895,27 +10901,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char snd_pcm_hw_params_get_access ();
+char snd_pcm_hw_params_get_access_mask ();
 int
 main ()
 {
-return snd_pcm_hw_params_get_access ();
+return snd_pcm_hw_params_get_access_mask ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_asound_snd_pcm_hw_params_get_access=yes
+  ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask=yes
 else
-  ac_cv_lib_asound_snd_pcm_hw_params_get_access=no
+  ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" = x""yes; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef HAVE_ALSA_ASOUNDLIB_H
@@ -10926,7 +10932,7 @@ if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
 int
 main ()
 {
-int ret = snd_pcm_hw_params_get_access(NULL, NULL)
+int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)
   ;
   return 0;
 }
@@ -14797,12 +14803,12 @@ wine_fn_config_dll advpack enable_advpack implib
 wine_fn_config_test dlls/advpack/tests advpack_test
 wine_fn_config_dll amstream enable_amstream
 wine_fn_config_test dlls/amstream/tests amstream_test
-wine_fn_config_dll appwiz.cpl enable_appwiz_cpl
+wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po
 wine_fn_config_dll atl enable_atl implib
 wine_fn_config_test dlls/atl/tests atl_test
 wine_fn_config_dll authz enable_authz
 wine_fn_config_dll avicap32 enable_avicap32 implib
-wine_fn_config_dll avifil32 enable_avifil32 implib
+wine_fn_config_dll avifil32 enable_avifil32 po,implib
 wine_fn_config_test dlls/avifil32/tests avifil32_test
 wine_fn_config_dll avifile.dll16 enable_win16
 wine_fn_config_dll avrt enable_avrt implib
@@ -14819,7 +14825,7 @@ wine_fn_config_dll comcat enable_comcat
 wine_fn_config_test dlls/comcat/tests comcat_test
 wine_fn_config_dll comctl32 enable_comctl32 po,implib
 wine_fn_config_test dlls/comctl32/tests comctl32_test
-wine_fn_config_dll comdlg32 enable_comdlg32 implib
+wine_fn_config_dll comdlg32 enable_comdlg32 po,implib
 wine_fn_config_test dlls/comdlg32/tests comdlg32_test
 wine_fn_config_dll comm.drv16 enable_win16
 wine_fn_config_dll commdlg.dll16 enable_win16
@@ -15115,7 +15121,7 @@ wine_fn_config_dll ole2prox.dll16 enable_win16
 wine_fn_config_dll ole2thk.dll16 enable_win16
 wine_fn_config_dll ole32 enable_ole32 implib
 wine_fn_config_test dlls/ole32/tests ole32_test
-wine_fn_config_dll oleacc enable_oleacc implib
+wine_fn_config_dll oleacc enable_oleacc po,implib
 wine_fn_config_test dlls/oleacc/tests oleacc_test
 wine_fn_config_dll oleaut32 enable_oleaut32 po,implib
 wine_fn_config_test dlls/oleaut32/tests oleaut32_test
@@ -15123,7 +15129,7 @@ wine_fn_config_dll olecli.dll16 enable_win16
 wine_fn_config_dll olecli32 enable_olecli32 implib
 wine_fn_config_dll oledb32 enable_oledb32
 wine_fn_config_test dlls/oledb32/tests oledb32_test
-wine_fn_config_dll oledlg enable_oledlg implib
+wine_fn_config_dll oledlg enable_oledlg po,implib
 wine_fn_config_dll olepro32 enable_olepro32 implib
 wine_fn_config_dll olesvr.dll16 enable_win16
 wine_fn_config_dll olesvr32 enable_olesvr32 implib
@@ -15168,7 +15174,7 @@ wine_fn_config_test dlls/rsaenh/tests rsaenh_test
 wine_fn_config_dll rstrtmgr enable_rstrtmgr
 wine_fn_config_dll rtutils enable_rtutils implib
 wine_fn_config_dll samlib enable_samlib
-wine_fn_config_dll sane.ds enable_sane_ds
+wine_fn_config_dll sane.ds enable_sane_ds po
 wine_fn_config_dll sccbase enable_sccbase
 wine_fn_config_dll schannel enable_schannel
 wine_fn_config_test dlls/schannel/tests schannel_test
@@ -15178,19 +15184,19 @@ wine_fn_config_dll security enable_security
 wine_fn_config_dll sensapi enable_sensapi implib
 wine_fn_config_dll serialui enable_serialui implib
 wine_fn_config_test dlls/serialui/tests serialui_test
-wine_fn_config_dll setupapi enable_setupapi implib
+wine_fn_config_dll setupapi enable_setupapi po,implib
 wine_fn_config_test dlls/setupapi/tests setupapi_test
 wine_fn_config_dll setupx.dll16 enable_win16
 wine_fn_config_dll sfc enable_sfc implib
 wine_fn_config_dll sfc_os enable_sfc_os implib
 wine_fn_config_dll shdoclc enable_shdoclc po
-wine_fn_config_dll shdocvw enable_shdocvw implib
+wine_fn_config_dll shdocvw enable_shdocvw po,implib
 wine_fn_config_test dlls/shdocvw/tests shdocvw_test
 wine_fn_config_dll shell.dll16 enable_win16
-wine_fn_config_dll shell32 enable_shell32 implib
+wine_fn_config_dll shell32 enable_shell32 po,implib
 wine_fn_config_test dlls/shell32/tests shell32_test
 wine_fn_config_dll shfolder enable_shfolder implib
-wine_fn_config_dll shlwapi enable_shlwapi implib
+wine_fn_config_dll shlwapi enable_shlwapi po,implib
 wine_fn_config_test dlls/shlwapi/tests shlwapi_test
 wine_fn_config_dll slbcsp enable_slbcsp
 wine_fn_config_dll slc enable_slc implib
@@ -15226,7 +15232,7 @@ wine_fn_config_dll urlmon enable_urlmon implib
 wine_fn_config_test dlls/urlmon/tests urlmon_test
 wine_fn_config_dll usbd.sys enable_usbd_sys implib
 wine_fn_config_dll user.exe16 enable_win16
-wine_fn_config_dll user32 enable_user32 implib
+wine_fn_config_dll user32 enable_user32 po,implib
 wine_fn_config_test dlls/user32/tests user32_test
 wine_fn_config_dll userenv enable_userenv implib
 wine_fn_config_test dlls/userenv/tests userenv_test
@@ -15278,7 +15284,7 @@ wine_fn_config_dll wing.dll16 enable_win16
 wine_fn_config_dll wing32 enable_wing32
 wine_fn_config_dll winhttp enable_winhttp implib
 wine_fn_config_test dlls/winhttp/tests winhttp_test
-wine_fn_config_dll wininet enable_wininet implib
+wine_fn_config_dll wininet enable_wininet po,implib
 wine_fn_config_test dlls/wininet/tests wininet_test
 wine_fn_config_dll winmm enable_winmm po,implib
 wine_fn_config_test dlls/winmm/tests winmm_test
@@ -15286,7 +15292,7 @@ wine_fn_config_dll winnls.dll16 enable_win16
 wine_fn_config_dll winnls32 enable_winnls32 implib
 wine_fn_config_dll winscard enable_winscard implib
 wine_fn_config_dll winsock.dll16 enable_win16
-wine_fn_config_dll winspool.drv enable_winspool_drv implib winspool
+wine_fn_config_dll winspool.drv enable_winspool_drv po,implib winspool
 wine_fn_config_test dlls/winspool.drv/tests winspool.drv_test
 wine_fn_config_dll wintab.dll16 enable_win16
 wine_fn_config_dll wintab32 enable_wintab32 implib
@@ -15346,11 +15352,11 @@ wine_fn_config_program net enable_net po,install
 wine_fn_config_program netsh enable_netsh install
 wine_fn_config_program ngen enable_ngen install
 wine_fn_config_program notepad enable_notepad po,install,installbin
-wine_fn_config_program oleview enable_oleview install
+wine_fn_config_program oleview enable_oleview po,install
 wine_fn_config_program ping enable_ping install
 wine_fn_config_program progman enable_progman po,install
 wine_fn_config_program reg enable_reg po,install
-wine_fn_config_program regedit enable_regedit install,installbin
+wine_fn_config_program regedit enable_regedit po,install,installbin
 wine_fn_config_test programs/regedit/tests regedit.exe_test
 wine_fn_config_program regsvcs enable_regsvcs install
 wine_fn_config_program regsvr32 enable_regsvr32 install,installbin
@@ -15372,7 +15378,7 @@ wine_fn_config_program unlodctr enable_unlodctr install
 wine_fn_config_program view enable_view po
 wine_fn_config_program wineboot enable_wineboot install,installbin
 wine_fn_config_program winebrowser enable_winebrowser install
-wine_fn_config_program winecfg enable_winecfg install,installbin
+wine_fn_config_program winecfg enable_winecfg po,install,installbin
 wine_fn_config_program wineconsole enable_wineconsole po,install,installbin
 wine_fn_config_program winedbg enable_winedbg po,install,installbin
 wine_fn_config_program winedevice enable_winedevice install
@@ -15403,6 +15409,7 @@ wine_fn_config_tool tools/wrc
 LINGUAS="\
 ar \
 bg \
+ca \
 cs \
 da \
 de \