Skip to content
Snippets Groups Projects
Commit f0abf9d4 authored by Danny Auble's avatar Danny Auble
Browse files

Changes to configure to handle new version of glib where the gthreads api

changed
parent 9dad3951
No related branches found
No related tags found
No related merge requests found
...@@ -238,22 +238,26 @@ if test -d "/opt/gnome/lib64/pkgconfig"; then ...@@ -238,22 +238,26 @@ if test -d "/opt/gnome/lib64/pkgconfig"; then
PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
fi fi
AM_PATH_GTK_2_0([2.7.1], [ac_have_gtk="yes"], [ac_have_gtk="no"], [gthread]) AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
AM_CONDITIONAL(HAVE_GTK, test "x$ac_have_gtk" = "xyes") AM_CONDITIONAL(BUILD_SVIEW, test "x$ac_glib_test" = "xyes")
if test ${gtk_config_minor_version=0} -gt 10 ; then 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
AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
if test ${gtk_config_minor_version=0} -ge 10 ; then
AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher]) AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher])
fi fi
if test ${gtk_config_minor_version=0} -gt 12 ; then if test ${gtk_config_minor_version=0} -ge 12 ; then
AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher]) AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher])
fi fi
if test ${gtk_config_minor_version=0} -gt 14 ; then if test ${gtk_config_minor_version=0} -ge 14 ; then
AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher]) AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
fi fi
X_AC_DATABASES X_AC_DATABASES
dnl Cray ALPS/Basil support depends on mySQL dnl Cray ALPS/Basil support depends on mySQL
...@@ -390,12 +394,6 @@ if test "x$ac_have_some_curses" = "xyes" ; then ...@@ -390,12 +394,6 @@ if test "x$ac_have_some_curses" = "xyes" ; then
fi fi
AM_CONDITIONAL(BUILD_SMAP, test "x$ac_build_smap" = "xyes") AM_CONDITIONAL(BUILD_SMAP, test "x$ac_build_smap" = "xyes")
ac_build_sview="no"
if test "x$ac_have_gtk" = "xyes" ; then
ac_build_sview="yes"
fi
AM_CONDITIONAL(BUILD_SVIEW, test "x$ac_build_sview" = "xyes")
dnl All slurm Makefiles: dnl All slurm Makefiles:
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment