From d9d36a338d4dbc9b5eaf47f7f06df1ea26a87f0b Mon Sep 17 00:00:00 2001 From: Danny Auble <da@schedmd.com> Date: Wed, 1 Jun 2016 14:45:05 -0700 Subject: [PATCH] Add check for glib 2.12 to configure, primarily checking for pthread_getname_np(). --- config.h.in | 3 +++ configure | 6 ++++++ configure.ac | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/config.h.in b/config.h.in index edabe6eba40..714b011468e 100644 --- a/config.h.in +++ b/config.h.in @@ -24,6 +24,9 @@ /* Define to 1 if using glib-2.32.0 or higher */ #undef GLIB_NEW_THREADS +/* Define to 1 if using glib-2.12.0 or higher */ +#undef GLIB_PTHREAD_GETNAME + /* Define to 1 if licensed under terms of the GNU General Public License. */ #undef GPL_LICENSED diff --git a/configure b/configure index b26eb02380f..4c1110f199b 100755 --- a/configure +++ b/configure @@ -22760,6 +22760,12 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f conf.glibtest +if test ${glib_config_minor_version=0} -ge 12 ; then + +$as_echo "#define GLIB_PTHREAD_GETNAME 1" >>confdefs.h + +fi + if test ${glib_config_minor_version=0} -ge 32 ; then $as_echo "#define GLIB_NEW_THREADS 1" >>confdefs.h diff --git a/configure.ac b/configure.ac index 1f2f901b7af..a6f09fdc456 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,10 @@ fi AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread]) +if test ${glib_config_minor_version=0} -ge 12 ; then + AC_DEFINE([GLIB_PTHREAD_GETNAME], 1, [Define to 1 if using glib-2.12.0 or higher]) +fi + if test ${glib_config_minor_version=0} -ge 32 ; then AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher]) fi -- GitLab