--- configure.orig	Thu Apr 18 18:52:49 2002
+++ configure	Fri Apr 19 12:40:56 2002
@@ -8849,6 +8849,7 @@
 fi
 STRIP_DUMMY=
 
+if [ x"$BUILD_CANVAS" != x"no" ]; then
 # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo "$as_me:8854: checking for $ac_word" >&5
@@ -8878,6 +8879,10 @@
 esac
 fi
 GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
+else
+GNOME_CONFIG="no"
+fi
+
 
 if test -n "$GNOME_CONFIG"; then
   echo "$as_me:8883: result: $GNOME_CONFIG" >&5
@@ -8994,8 +8999,8 @@
 #define USE_GMODULE 1
 EOF
 
-   GMODULE_LIBS="`glib-config --libs gmodule`"
-   GMODULE_FLAGS="`glib-config --cflags gmodule`"
+   GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`"
+   GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`"
 
    echo "$as_me:9000: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -10104,7 +10109,7 @@
 fi;
 
 if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gnome/html'
+  HTML_DIR='${datadir}/html'
 else
   HTML_DIR=$with_html_dir
 fi