Mesa (master): scons: s/HAVE_NO_AUTOCONF/HAVE_SCONS/

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c314ba2c26a52900fb8ffd8b16f3dbd31d216d08
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c314ba2c26a52900fb8ffd8b16f3dbd31d216d08

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Sun Jun 30 00:17:50 2019 +0100

scons: s/HAVE_NO_AUTOCONF/HAVE_SCONS/

Back when autotools and scons were the two build systems, it kinda made
sense to call scons "not autoconf", but autoconf's been gone for a while
now and other build systems have been added (android.mk and meson), so
the name really doesn't make any sense anymore.

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 include/c99_compat.h | 7 +++----
 scons/gallium.py     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/c99_compat.h b/include/c99_compat.h
index b681725b2b0..d704baf12b9 100644
--- a/include/c99_compat.h
+++ b/include/c99_compat.h
@@ -135,9 +135,8 @@ test_c99_compat_h(const void * restrict a,
 #endif
 
 
-/* Fallback definitions, for build systems other than autoconfig which don't
- * auto-detect these things. */
-#ifdef HAVE_NO_AUTOCONF
+/* Fallback definitions, for scons which doesn't auto-detect these things. */
+#ifdef HAVE_SCONS
 
 #  ifndef _WIN32
 #    define HAVE_PTHREAD
@@ -178,7 +177,7 @@ test_c99_compat_h(const void * restrict a,
 
 #  endif /* __GNUC__ */
 
-#endif /* !HAVE_AUTOCONF */
+#endif /* HAVE_SCONS */
 
 
 #endif /* _C99_COMPAT_H_ */
diff --git a/scons/gallium.py b/scons/gallium.py
index c2713992b36..27727612d14 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -330,7 +330,7 @@ def generate(env):
         '__STDC_CONSTANT_MACROS',
         '__STDC_FORMAT_MACROS',
         '__STDC_LIMIT_MACROS',
-        'HAVE_NO_AUTOCONF',
+        'HAVE_SCONS',
     ]
     if env['build'] in ('debug', 'checked'):
         cppdefines += ['DEBUG']