$FreeBSD$

--- configure.orig	Fri Oct 26 01:10:31 2001
+++ configure	Fri Oct 26 11:00:48 2001
@@ -3435,6 +3435,7 @@
 
 
 
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -3465,6 +3466,10 @@
 esac
 fi
 GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG"
+else
+GNOME_CONFIG="no"
+fi
+
 if test -n "$GNOME_CONFIG"; then
   echo "$ac_t""$GNOME_CONFIG" 1>&6
 else
@@ -3571,8 +3576,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 "$ac_t""yes" 1>&6
@@ -4448,7 +4453,7 @@
 
 
 if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gnome/html'
+  HTML_DIR='${datadir}/html'
 else
   HTML_DIR=$with_html_dir
 fi