diff --git a/make/configure.py b/make/configure.py
index 36817f9b9..683cb3d15 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1627,7 +1635,7 @@ try:
     # twice, so extract the info we need here from sys.argv
     arch_gcc = None
     cross    = None
-    xcode_opts = { 'disabled': False, 'config': None }
+    xcode_opts = { 'disabled': True, 'config': None }
     for i in range(len(sys.argv)):
         if re.match( r'^--arch=(.+)$', sys.argv[i] ):
             arch_gcc = sys.argv[i][7:]
@@ -1688,7 +1696,7 @@ try:
         lipo       = ToolProbe( 'LIPO.exe',       'lipo',       'lipo', abort=False )
         pkgconfig  = ToolProbe( 'PKGCONFIG.exe',  'pkgconfig',  'pkg-config', abort=True, minversion=[0,27,0] )
         meson      = ToolProbe( 'MESON.exe',      'meson',      'meson', abort=True, minversion=[0,51,0] )
-        nasm       = ToolProbe( 'NASM.exe',       'asm',        'nasm', abort=True, minversion=[2,13,0] )
+        nasm       = ToolProbe( 'NASM.exe',       'asm',        'nasm', abort=False, minversion=[2,13,0] )
         ninja      = ToolProbe( 'NINJA.exe',      'ninja',      'ninja-build', 'ninja', abort=True )
         cargo      = ToolProbe( 'CARGO.exe',      'cargo',        'cargo', abort=False )
         cargoc     = ToolProbe( 'CARGO-C.exe',    'cargo-cbuild', 'cargo-cbuild', abort=False )
@@ -1701,7 +1709,7 @@ try:
 
     ## find xcconfig values
     xcconfigMode = SelectMode( 'xcconfig', ('none',None), what='' )
-    if build_tuple.match( '*-*-darwin*' ):
+    if (not xcode_opts['disabled'] and build_tuple.match('*-*-darwin*')):
         for xc in glob.glob( os.path.join(cfg.dir, '../macosx/xcconfig/*.xcconfig') ):
             bname = os.path.basename( xc )
             xname = os.path.splitext( bname )
@@ -1736,7 +1744,7 @@ try:
     arch       = ArchAction(); arch.run()
 
     # set whether features can be enabled
-    gtk_supported   = host_tuple.match( '*-*-linux*', '*-*-mingw*', '*-*-*bsd*' )
+    gtk_supported   = host_tuple.match( '*-*-linux*', '*-*-mingw*', '*-*-*bsd*', '*-*-*darwin*' )
     qsv_supported   = host_tuple.match( '*-*-linux*', 'x86_64-w64-mingw32*', '*-*-freebsd*' )
     nvenc_supported = host_tuple.match( '*-*-linux*', 'x86_64-w64-mingw32*' )
     vce_supported   = host_tuple.match( '*-*-linux*', 'x86_64-w64-mingw32*' )