--- configure.orig	Wed May 19 14:22:51 2004
+++ configure	Tue Jul  6 16:45:02 2004
@@ -9366,7 +9366,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-liconv  $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 9372 "configure"
 #include "confdefs.h"
@@ -9397,7 +9397,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  _ICONV_LIBS="$_ICONV_LIBS -liconv"
+  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
@@ -9407,7 +9407,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-liconv  $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 9413 "configure"
 #include "confdefs.h"
@@ -9438,7 +9438,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  _ICONV_LIBS="$_ICONV_LIBS -liconv"
+  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -12467,9 +12467,9 @@
 
 
 
-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
 
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks sql"
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks sql"
 
 # Check whether --enable-extensions or --disable-extensions was given.
 if test "${enable_extensions+set}" = set; then