diff --git a/auxdir/x_ac_gtk.m4 b/auxdir/x_ac_gtk.m4 index 010ed0401855cf11b389ef62bc98ebe38abb501c..a367ccc25db70cb7c15fbcaa39d2be050aae8cd6 100644 --- a/auxdir/x_ac_gtk.m4 +++ b/auxdir/x_ac_gtk.m4 @@ -37,20 +37,10 @@ AC_DEFUN([X_AC_GTK], fi if test x$HAVEPKGCONFIG = xno; then - AC_MSG_WARN([*** pkg-config not found. Cannot probe for libglade-2.0 or gtk+-2.0.]) + AC_MSG_WARN([*** pkg-config not found. Cannot probe for gtk+-2.0.]) ac_have_gtk="no" fi -### Check for libglade package (We don't need this right now so don't add it) -# if test "$ac_have_gtk" == "yes"; then -# $HAVEPKGCONFIG --exists libglade-2.0 -# if ! test $? -eq 0 ; then -# AC_MSG_WARN([*** libbglade-2.0 is not available.]) -# ac_have_gtk="no" -# fi -# fi - - ### Check for min gtk package if test "$ac_have_gtk" == "yes" ; then $HAVEPKGCONFIG --exists gtk+-2.0 @@ -70,13 +60,8 @@ AC_DEFUN([X_AC_GTK], ### Run a test program if test "$ac_have_gtk" == "yes" ; then - # GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0 gthread-2.0` GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags gtk+-2.0 gthread-2.0` -# GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0 gthread-2.0` - GTK2_LIBS=`$HAVEPKGCONFIG --libs gtk+-2.0 gthread-2.0` -# if test ! -z "GLADE_STATIC" ; then -# GTK2_LIBS=`echo $GTK2_LIBS | sed "s/-lglade-2.0/$GLADE_STATIC -lglade-2.0 $BDYNAMIC/g"` -# fi + GTK2_LIBS=`$HAVEPKGCONFIG --libs gtk+-2.0 gthread-2.0` save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$GTK2_CFLAGS $save_CFLAGS" diff --git a/configure b/configure index 2b0e2abd0d93f4e36ac41b1b8ce4691a34cb411b..1086b7892776733a5213b72ca1de1c7c354ed994 100755 --- a/configure +++ b/configure @@ -25969,21 +25969,11 @@ fi fi if test x$HAVEPKGCONFIG = xno; then - { echo "$as_me:$LINENO: WARNING: *** pkg-config not found. Cannot probe for libglade-2.0 or gtk+-2.0." >&5 -echo "$as_me: WARNING: *** pkg-config not found. Cannot probe for libglade-2.0 or gtk+-2.0." >&2;} + { echo "$as_me:$LINENO: WARNING: *** pkg-config not found. Cannot probe for gtk+-2.0." >&5 +echo "$as_me: WARNING: *** pkg-config not found. Cannot probe for gtk+-2.0." >&2;} ac_have_gtk="no" fi -### Check for libglade package (We don't need this right now so don't add it) -# if test "$ac_have_gtk" == "yes"; then -# $HAVEPKGCONFIG --exists libglade-2.0 -# if ! test $? -eq 0 ; then -# AC_MSG_WARN([*** libbglade-2.0 is not available.]) -# ac_have_gtk="no" -# fi -# fi - - ### Check for min gtk package if test "$ac_have_gtk" == "yes" ; then $HAVEPKGCONFIG --exists gtk+-2.0 @@ -26005,13 +25995,8 @@ echo "$as_me: WARNING: *** gtk+-$gtk_config_version available, we need >= gtk+-$ ### Run a test program if test "$ac_have_gtk" == "yes" ; then - # GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0 gthread-2.0` GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags gtk+-2.0 gthread-2.0` -# GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0 gthread-2.0` - GTK2_LIBS=`$HAVEPKGCONFIG --libs gtk+-2.0 gthread-2.0` -# if test ! -z "GLADE_STATIC" ; then -# GTK2_LIBS=`echo $GTK2_LIBS | sed "s/-lglade-2.0/$GLADE_STATIC -lglade-2.0 $BDYNAMIC/g"` -# fi + GTK2_LIBS=`$HAVEPKGCONFIG --libs gtk+-2.0 gthread-2.0` save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$GTK2_CFLAGS $save_CFLAGS" diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml index 588ac7a1163bca222806ffc02a7fe415a36c97e5..89a4c41e18fc269d9183b0b98f1c001c9c79584d 100644 --- a/doc/html/quickstart_admin.shtml +++ b/doc/html/quickstart_admin.shtml @@ -102,8 +102,8 @@ and commands are denoted below. numeric suffix between zero and 15). Finally, the "ptrack" kernel patch is required for process tracking. -<li> <b>sview</b> The sview command will be built only if <i>libglade-2.0</i> - and <i>gtk+-2.0</i> are installed</li> +<li> <b>sview</b> The sview command will be built only if and <i>gtk+-2.0</i> + is installed</li> </ul> Please see the <a href=download.html>Download</a> page for references to required software to build these plugins.</p> @@ -641,6 +641,6 @@ Contents of major releases are also described in the RELEASE_NOTES file. </pre> <p class="footer"><a href="#top">top</a></p> -<p style="text-align:center;">Last modified 7 January 2009</p> +<p style="text-align:center;">Last modified 28 March 2009</p> <!--#include virtual="footer.txt"--> diff --git a/doc/man/man1/sview.1 b/doc/man/man1/sview.1 index 5d9fad1ead45d2270afd47e240857a9be9c1de84..f1b90363a582a27f24facce48ed77d278872522c 100644 --- a/doc/man/man1/sview.1 +++ b/doc/man/man1/sview.1 @@ -1,4 +1,4 @@ -.TH "sview" "1" "SLURM 2.0" "October 2006" "SLURM Commands" +.TH "sview" "1" "SLURM 2.0" "May 2009" "SLURM Commands" .SH "NAME" .LP sview \- graphical user interface to view and modify SLURM state. @@ -41,8 +41,7 @@ unintended changes. Your personal \fBsview\fR initializations. .SH "NOTES" -The sview command can only be build if \fIlibglade\-2.0\fR and -\fIgtk+\-2.0\fR are installed. +The sview command can only be build if \fIgtk+\-2.0\fR is installed. Systems lacking these libraries will have SLURM installed without the sview command.