configure.ac | 39 --------------------------------------- doc/man/man1/Makefile.am | 8 -------- src/Makefile.am | 3 +-- 3 files changed, 1 insertion(+), 49 deletions(-) diff --git a/configure.ac b/configure.ac index 2f177ec..ff4d69b 100644 --- a/configure.ac +++ b/configure.ac @@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES) PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes") -# -# Tests for GTK+ -# - -# use the correct libs if running on 64bit -if test -d "/usr/lib64/pkgconfig"; then - PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH" -fi - -if test -d "/opt/gnome/lib64/pkgconfig"; then - PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH" -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 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]) -fi - -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]) -fi - -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]) -fi - -if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then - AC_MSG_WARN([cannot build sview without gtk library]); -fi - -AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"]) - dnl Cray ALPS/Basil support depends on mySQL X_AC_CRAY @@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile - src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am index 246f16d..ba39af2 100644 --- a/doc/man/man1/Makefile.am +++ b/doc/man/man1/Makefile.am @@ -29,10 +29,6 @@ if WITH_BLCR man1_MANS += srun_cr.1 endif -if BUILD_SVIEW -man1_MANS += sview.1 -endif - EXTRA_DIST = $(man1_MANS) if HAVE_MAN2HTML @@ -65,10 +61,6 @@ if WITH_BLCR html_DATA += srun_cr.html endif -if BUILD_SVIEW -html_DATA += sview.html -endif - MOSTLYCLEANFILES = ${html_DATA} EXTRA_DIST += $(html_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index bcd5aa7..a8cbf17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,5 +28,4 @@ SUBDIRS = \ srun_cr \ sshare \ sstat \ - strigger \ - sview + strigger