diff --git a/aclocal.m4 b/aclocal.m4
index 1713b167ad0..bd4efe9f1c9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -714,6 +714,8 @@ dnl Usage: WINE_CONFIG_MAKEFILE(file,enable,flags)
 dnl
 AC_DEFUN([WINE_CONFIG_MAKEFILE],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
 AS_VAR_PUSHDEF([ac_enable],m4_default([$2],[enable_]$1))dnl
+m4_append_uniq([_AC_USER_OPTS],ac_enable,[
+])dnl
 wine_fn_config_makefile [$1] ac_enable [$3]dnl
 AS_VAR_POPDEF([ac_enable])])
 
@@ -723,6 +725,8 @@ dnl Usage: WINE_CONFIG_DLL(name,enable,flags,implib)
 dnl
 AC_DEFUN([WINE_CONFIG_DLL],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
 AS_VAR_PUSHDEF([ac_enable],m4_default([$2],[enable_]$1))dnl
+m4_append_uniq([_AC_USER_OPTS],ac_enable,[
+])dnl
 wine_fn_config_dll [$1] ac_enable [$3] [$4]dnl
 AS_VAR_POPDEF([ac_enable])])
 
@@ -732,6 +736,8 @@ dnl Usage: WINE_CONFIG_PROGRAM(name,enable,flags)
 dnl
 AC_DEFUN([WINE_CONFIG_PROGRAM],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
 AS_VAR_PUSHDEF([ac_enable],m4_default([$2],[enable_]$1))dnl
+m4_append_uniq([_AC_USER_OPTS],ac_enable,[
+])dnl
 wine_fn_config_program [$1] ac_enable [$3]dnl
 AS_VAR_POPDEF([ac_enable])])
 
@@ -758,6 +764,8 @@ dnl
 dnl Usage: WINE_CONFIG_TOOL(name,flags)
 dnl
 AC_DEFUN([WINE_CONFIG_TOOL],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
+m4_append_uniq([_AC_USER_OPTS],[enable_tools],[
+])dnl
 wine_fn_config_tool [$1] [$2]])
 
 dnl **** Add a message to the list displayed at the end ****
diff --git a/configure b/configure
index 0ceb931b212..cfaf21f81dd 100755
--- a/configure
+++ b/configure
@@ -861,6 +861,495 @@ with_wine_tools
 with_wine64
 enable_largefile
 with_x
+enable_acledit
+enable_aclui
+enable_activeds
+enable_actxprxy
+enable_advapi32
+enable_advpack
+enable_amstream
+enable_api_ms_win_core_localregistry_l1_1_0
+enable_api_ms_win_core_processthreads_l1_1_0
+enable_api_ms_win_core_winrt_error_l1_1_0
+enable_api_ms_win_core_winrt_string_l1_1_0
+enable_api_ms_win_downlevel_advapi32_l1_1_0
+enable_api_ms_win_downlevel_advapi32_l2_1_0
+enable_api_ms_win_downlevel_normaliz_l1_1_0
+enable_api_ms_win_downlevel_ole32_l1_1_0
+enable_api_ms_win_downlevel_shell32_l1_1_0
+enable_api_ms_win_downlevel_shlwapi_l1_1_0
+enable_api_ms_win_downlevel_shlwapi_l2_1_0
+enable_api_ms_win_downlevel_user32_l1_1_0
+enable_api_ms_win_downlevel_version_l1_1_0
+enable_api_ms_win_security_base_l1_1_0
+enable_apphelp
+enable_appwiz_cpl
+enable_atl
+enable_atl100
+enable_atl110
+enable_atl80
+enable_authz
+enable_avicap32
+enable_avifil32
+enable_avrt
+enable_bcrypt
+enable_browseui
+enable_cabinet
+enable_capi2032
+enable_cards
+enable_cfgmgr32
+enable_clusapi
+enable_comcat
+enable_comctl32
+enable_comdlg32
+enable_compstui
+enable_comsvcs
+enable_credui
+enable_crtdll
+enable_crypt32
+enable_cryptdlg
+enable_cryptdll
+enable_cryptnet
+enable_cryptui
+enable_ctapi32
+enable_ctl3d32
+enable_d3d10
+enable_d3d10core
+enable_d3d11
+enable_d3d8
+enable_d3d9
+enable_d3dcompiler_33
+enable_d3dcompiler_34
+enable_d3dcompiler_35
+enable_d3dcompiler_36
+enable_d3dcompiler_37
+enable_d3dcompiler_38
+enable_d3dcompiler_39
+enable_d3dcompiler_40
+enable_d3dcompiler_41
+enable_d3dcompiler_42
+enable_d3dcompiler_43
+enable_d3dim
+enable_d3drm
+enable_d3dx10_33
+enable_d3dx10_34
+enable_d3dx10_35
+enable_d3dx10_36
+enable_d3dx10_37
+enable_d3dx10_38
+enable_d3dx10_39
+enable_d3dx10_40
+enable_d3dx10_41
+enable_d3dx10_42
+enable_d3dx10_43
+enable_d3dx11_42
+enable_d3dx11_43
+enable_d3dx9_24
+enable_d3dx9_25
+enable_d3dx9_26
+enable_d3dx9_27
+enable_d3dx9_28
+enable_d3dx9_29
+enable_d3dx9_30
+enable_d3dx9_31
+enable_d3dx9_32
+enable_d3dx9_33
+enable_d3dx9_34
+enable_d3dx9_35
+enable_d3dx9_36
+enable_d3dx9_37
+enable_d3dx9_38
+enable_d3dx9_39
+enable_d3dx9_40
+enable_d3dx9_41
+enable_d3dx9_42
+enable_d3dx9_43
+enable_d3dxof
+enable_dbgeng
+enable_dbghelp
+enable_dciman32
+enable_ddraw
+enable_ddrawex
+enable_devenum
+enable_dhcpcsvc
+enable_difxapi
+enable_dinput
+enable_dinput8
+enable_dispex
+enable_dmband
+enable_dmcompos
+enable_dmime
+enable_dmloader
+enable_dmscript
+enable_dmstyle
+enable_dmsynth
+enable_dmusic
+enable_dmusic32
+enable_dnsapi
+enable_dplay
+enable_dplayx
+enable_dpnaddr
+enable_dpnet
+enable_dpnhpast
+enable_dpnlobby
+enable_dpwsockx
+enable_drmclien
+enable_dsound
+enable_dssenh
+enable_dswave
+enable_dwmapi
+enable_dwrite
+enable_dxdiagn
+enable_dxgi
+enable_explorerframe
+enable_faultrep
+enable_fltlib
+enable_fusion
+enable_fwpuclnt
+enable_gameux
+enable_gdi32
+enable_gdiplus
+enable_glu32
+enable_gphoto2_ds
+enable_gpkcsp
+enable_hal
+enable_hhctrl_ocx
+enable_hid
+enable_hlink
+enable_hnetcfg
+enable_httpapi
+enable_iccvid
+enable_icmp
+enable_ieframe
+enable_imaadp32_acm
+enable_imagehlp
+enable_imm32
+enable_inetcomm
+enable_inetcpl_cpl
+enable_inetmib1
+enable_infosoft
+enable_initpki
+enable_inkobj
+enable_inseng
+enable_iphlpapi
+enable_itircl
+enable_itss
+enable_joy_cpl
+enable_jscript
+enable_kernel32
+enable_ktmw32
+enable_loadperf
+enable_localspl
+enable_localui
+enable_lz32
+enable_mapi32
+enable_mapistub
+enable_mciavi32
+enable_mcicda
+enable_mciqtz32
+enable_mciseq
+enable_mciwave
+enable_mgmtapi
+enable_midimap
+enable_mlang
+enable_mmcndmgr
+enable_mmdevapi
+enable_mountmgr_sys
+enable_mpr
+enable_mprapi
+enable_msacm32_drv
+enable_msacm32
+enable_msadp32_acm
+enable_mscat32
+enable_mscms
+enable_mscoree
+enable_msctf
+enable_msdaps
+enable_msdmo
+enable_msftedit
+enable_msg711_acm
+enable_msgsm32_acm
+enable_mshtml_tlb
+enable_mshtml
+enable_msi
+enable_msident
+enable_msimg32
+enable_msimsg
+enable_msimtf
+enable_msisip
+enable_msisys_ocx
+enable_msls31
+enable_msnet32
+enable_mspatcha
+enable_msrle32
+enable_mssign32
+enable_mssip32
+enable_mstask
+enable_msvcirt
+enable_msvcm80
+enable_msvcm90
+enable_msvcp100
+enable_msvcp110
+enable_msvcp60
+enable_msvcp70
+enable_msvcp71
+enable_msvcp80
+enable_msvcp90
+enable_msvcr100
+enable_msvcr110
+enable_msvcr70
+enable_msvcr71
+enable_msvcr80
+enable_msvcr90
+enable_msvcrt
+enable_msvcrt20
+enable_msvcrt40
+enable_msvcrtd
+enable_msvfw32
+enable_msvidc32
+enable_mswsock
+enable_msxml
+enable_msxml2
+enable_msxml3
+enable_msxml4
+enable_msxml6
+enable_nddeapi
+enable_netapi32
+enable_netcfgx
+enable_newdev
+enable_normaliz
+enable_npmshtml
+enable_ntdll
+enable_ntdsapi
+enable_ntoskrnl_exe
+enable_ntprint
+enable_objsel
+enable_odbc32
+enable_odbccp32
+enable_odbccu32
+enable_ole32
+enable_oleacc
+enable_oleaut32
+enable_olecli32
+enable_oledb32
+enable_oledlg
+enable_olepro32
+enable_olesvr32
+enable_olethk32
+enable_openal32
+enable_opencl
+enable_opengl32
+enable_pdh
+enable_photometadatahandler
+enable_pidgen
+enable_powrprof
+enable_printui
+enable_propsys
+enable_psapi
+enable_pstorec
+enable_qcap
+enable_qedit
+enable_qmgr
+enable_qmgrprxy
+enable_quartz
+enable_query
+enable_rasapi32
+enable_rasdlg
+enable_regapi
+enable_resutils
+enable_riched20
+enable_riched32
+enable_rpcrt4
+enable_rsabase
+enable_rsaenh
+enable_rstrtmgr
+enable_rtutils
+enable_samlib
+enable_sane_ds
+enable_scarddlg
+enable_sccbase
+enable_schannel
+enable_scrrun
+enable_scsiport_sys
+enable_secur32
+enable_security
+enable_sensapi
+enable_serialui
+enable_setupapi
+enable_sfc
+enable_sfc_os
+enable_shdoclc
+enable_shdocvw
+enable_shell32
+enable_shfolder
+enable_shlwapi
+enable_slbcsp
+enable_slc
+enable_snmpapi
+enable_softpub
+enable_spoolss
+enable_stdole2_tlb
+enable_stdole32_tlb
+enable_sti
+enable_svrapi
+enable_sxs
+enable_t2embed
+enable_tapi32
+enable_traffic
+enable_twain_32
+enable_unicows
+enable_updspapi
+enable_url
+enable_urlmon
+enable_usbd_sys
+enable_user32
+enable_userenv
+enable_usp10
+enable_uxtheme
+enable_vbscript
+enable_vcomp
+enable_vcomp100
+enable_vcomp90
+enable_vdmdbg
+enable_version
+enable_wbemdisp
+enable_wbemprox
+enable_webservices
+enable_wer
+enable_wevtapi
+enable_wiaservc
+enable_windowscodecs
+enable_windowscodecsext
+enable_winealsa_drv
+enable_winecoreaudio_drv
+enable_wined3d
+enable_winegstreamer
+enable_winejoystick_drv
+enable_winemac_drv
+enable_winemapi
+enable_winemp3_acm
+enable_wineoss_drv
+enable_wineps_drv
+enable_wineqtdecoder
+enable_winex11_drv
+enable_wing32
+enable_winhttp
+enable_wininet
+enable_winmm
+enable_winnls32
+enable_winscard
+enable_winspool_drv
+enable_winsta
+enable_wintab32
+enable_wintrust
+enable_wlanapi
+enable_wldap32
+enable_wmi
+enable_wmiutils
+enable_wmvcore
+enable_wnaspi32
+enable_ws2_32
+enable_wshom_ocx
+enable_wsnmp32
+enable_wsock32
+enable_wtsapi32
+enable_wuapi
+enable_wuaueng
+enable_xapofx1_1
+enable_xinput1_1
+enable_xinput1_2
+enable_xinput1_3
+enable_xinput1_4
+enable_xinput9_1_0
+enable_xmllite
+enable_xolehlp
+enable_xpsprint
+enable_xpssvcs
+enable_documentation
+enable_fonts
+enable_include
+enable_libs_port
+enable_libs_wine
+enable_libs_wpp
+enable_loader
+enable_aspnet_regiis
+enable_attrib
+enable_cabarc
+enable_cacls
+enable_clock
+enable_cmd
+enable_conhost
+enable_control
+enable_cscript
+enable_dxdiag
+enable_eject
+enable_expand
+enable_explorer
+enable_extrac32
+enable_findstr
+enable_hh
+enable_hostname
+enable_icinfo
+enable_iexplore
+enable_ipconfig
+enable_lodctr
+enable_mofcomp
+enable_mshta
+enable_msiexec
+enable_net
+enable_netsh
+enable_netstat
+enable_ngen
+enable_notepad
+enable_oleview
+enable_ping
+enable_plugplay
+enable_presentationfontcache
+enable_progman
+enable_reg
+enable_regasm
+enable_regedit
+enable_regsvcs
+enable_regsvr32
+enable_rpcss
+enable_rundll32
+enable_sc
+enable_schtasks
+enable_secedit
+enable_servicemodelreg
+enable_services
+enable_spoolsv
+enable_start
+enable_svchost
+enable_taskkill
+enable_tasklist
+enable_taskmgr
+enable_termsv
+enable_uninstaller
+enable_unlodctr
+enable_view
+enable_wineboot
+enable_winebrowser
+enable_winecfg
+enable_wineconsole
+enable_winedbg
+enable_winedevice
+enable_winefile
+enable_winemenubuilder
+enable_winemine
+enable_winemsibuilder
+enable_winepath
+enable_winetest
+enable_winhlp32
+enable_winver
+enable_wmic
+enable_wordpad
+enable_write
+enable_wscript
+enable_wusa
+enable_xcopy
+enable_server
+enable_tools
 '
       ac_precious_vars='build_alias
 host_alias