--- configure.orig	Tue Aug 12 03:36:10 2003
+++ configure	Tue Aug 12 10:30:37 2003
@@ -18129,6 +18129,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -20408,12 +20409,12 @@
 
 YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
 
-YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
 
 
 
   case $host in
-  *-linux-gnu | *-irix6*)
+  *-linux-gnu | *-irix6* | *-freebsd*)
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_MAN_WHEREIS 1
 _ACEOF