[glib] configure.ac: join the cargo-cult of _cv_
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] configure.ac: join the cargo-cult of _cv_
- Date: Wed, 19 Oct 2011 14:16:34 +0000 (UTC)
commit 3fd412549fa50e06f92fb279d54a5d5b668600bc
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Oct 19 10:11:54 2011 -0400
configure.ac: join the cargo-cult of _cv_
For some reason, the setting of g_atomic_lock_free wasn't making it down
to the lower part of the configure script where glibconfig.h was being
generated when building using mingw32-configure.
If we prefix glib_cv_ to the start of the variable name (like everyone
else is doing) then it magically starts working.
I love you, automake.
configure.ac | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 33e7005..f1fd5ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2433,11 +2433,11 @@ dnl We may add other compilers here in the future...
AC_MSG_CHECKING([for lock-free atomic intrinsics])
AC_TRY_COMPILE([],
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4;],
- [g_atomic_lock_free=yes],
- [g_atomic_lock_free=no])
-AC_MSG_RESULT($g_atomic_lock_free)
+ [glib_cv_g_atomic_lock_free=yes],
+ [glib_cv_g_atomic_lock_free=no])
+AC_MSG_RESULT($glib_cv_g_atomic_lock_free)
-if test "$g_atomic_lock_free" = "no"; then
+if test "$glib_cv_g_atomic_lock_free" = "no"; then
SAVE_CFLAGS="${CFLAGS}"
CFLAGS="-march=i486"
AC_TRY_COMPILE([],
@@ -3479,6 +3479,7 @@ g_threads_impl_def=$g_threads_impl
g_system_thread_sizeof="$glib_cv_sizeof_system_thread"
+g_atomic_lock_free="$glib_cv_g_atomic_lock_free"
g_memory_barrier_needed="$glib_memory_barrier_needed"
g_gcc_atomic_ops="$glib_cv_gcc_has_builtin_atomic_operations"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]