diff -uNpar mldonkey/config/configure.in mldonkey.site-lib/config/configure.in
--- mldonkey/config/configure.in	2007-04-01 17:11:52 +0400
+++ mldonkey.site-lib/config/configure.in	2007-04-22 19:27:58 +0400
@@ -1161,6 +1161,7 @@ echo "     Checking activated networks f
 echo "-----------------------------------------------"
 
 OCAMLLIB=`$OCAMLC -where`
+OCAMLSITELIB="$OCAMLLIB/site-lib"
 
 if test -f $OCAMLLIB/lablgl.cma; then
   LABLGL_CMA=lablgl.cma
@@ -1225,15 +1226,15 @@ if test "$GTK_CONFIG" = "no"; then
      LABLGTK_CONFIG=no
 else
   AC_MSG_CHECKING(for native code $LABLGTK_NAME)
-  if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
+  if test -f $OCAMLSITELIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
      if test "$GUI" = "newgui2"; then
-       if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
+       if test -f $OCAMLSITELIB/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
          AC_MSG_RESULT(yes)
          LABLGTK_CONFIG=yes
        else
          AC_MSG_RESULT(no)
          LABLGTK_CONFIG=no
-         if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablrsvg.cma; then
+         if test -f $OCAMLSITELIB/$LABLGTK_NAME/lablrsvg.cma; then
            echo "---------------------------------------------------------"
            echo "lablrsvg is not installed properly. See the INSTALL.txt"
            echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
@@ -1254,7 +1255,7 @@ else
   else
      AC_MSG_RESULT(no)
      LABLGTK_CONFIG=no
-     if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablgtk.cma; then
+     if test -f OCAMLSITELIB/$LABLGTK_NAME/lablgtk.cma; then
        echo "-------------------------------------------------------------"
        echo "$LABLGTK_NAME is not installed properly. See the INSTALL.txt"
        echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
@@ -1299,7 +1300,7 @@ else
           rm -rf lablgtk-"$REQUIRED_LABLGTK"
          )
          cd $CONFIG_DIR
-         if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
+         if test -f OCAMLSITELIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
             LABLGTK_CONFIG=yes
          else
             echo "Installation of $LABLGTK_NAME failed"
@@ -1326,7 +1327,7 @@ if test "$LABLGTK_CONFIG" = "no"; then
 else
   MORE_TARGETS="$MORE_TARGETS $GUIS"
   AC_MSG_CHECKING(GToolbox.popup_menu args)
-  OCAML_LIB_DIR="`$OCAMLC -where`"
+  OCAML_LIB_DIR="$OCAMLSITELIB"
   GTOOLBOX="$OCAML_LIB_DIR/$LABLGTK_NAME/gToolbox.mli"
   grep popup $GTOOLBOX | grep -i button 2> /dev/null && GTOOLBOX_ARGS=new
   if test "$GTOOLBOX_ARGS" = "new"; then
@@ -1359,6 +1360,7 @@ AC_SUBST(FIX_BROKEN_CPP)
 AC_SUBST(CONFIG_INCLUDES)
 AC_SUBST(OCAMLC)
 AC_SUBST(OCAMLLIB)
+AC_SUBST(OCAMLSITELIB)
 AC_SUBST(OCAMLOPT)
 AC_SUBST(OCAMLLEX)
 AC_SUBST(OCAMLYACC)
diff -uNpar mldonkey/config/Makefile.config.in mldonkey.site-lib/config/Makefile.config.in
--- mldonkey/config/Makefile.config.in	2006-10-23 16:18:27 +0400
+++ mldonkey.site-lib/config/Makefile.config.in	2007-04-22 19:27:58 +0400
@@ -11,6 +11,7 @@ CONFIG_INCLUDES=@CONFIG_INCLUDES@
 
 OCAMLC=@OCAMLC@
 OCAMLLIB=@OCAMLLIB@
+OCAMLSITELIB=@OCAMLSITELIB@
 OCAMLOPT=@OCAMLOPT@ -inline 10
 OCAMLLEX=@OCAMLLEX@
 OCAMLDEP=@OCAMLDEP@ @OCAMLDEP_OPTIONS@
diff -uNpar mldonkey/config/Makefile.in mldonkey.site-lib/config/Makefile.in
--- mldonkey/config/Makefile.in	2007-03-25 16:37:09 +0400
+++ mldonkey.site-lib/config/Makefile.in	2007-04-22 19:57:54 +0400
@@ -89,11 +89,11 @@ SRC_DIRECTCONNECT=src/networks/direct_co
 SRC_FILETP=src/networks/fileTP
 
 SUBDIRS=$(CDK) $(LIB) $(RSS) $(XML) $(NET) tools \
-   $(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES)
+   $(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES) $(OCAMLSITELIB)
 
 INCLUDES += $(foreach file, $(SUBDIRS), -I $(file))
 
-CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS)
+CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS) "-I$(OCAMLSITELIB)"
 
 TARGETS= mlnet$(EXE) 
 
@@ -770,10 +770,10 @@ install:: opt 
 
 ifneq ("$(GUI)" , "no")
   ifeq ("$(GUI)", "newgui2")
-    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2
-    GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma
-    GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
-    GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
+    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +site-lib/lablgtk2
+    GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +site-lib/lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma
+    GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +site-lib/lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
+    GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +site-lib/lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
   else
     SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) +lablgtk $(SRC_PROGRESS)
     GTK_LIBS_byte=-I +lablgtk $(LABLGL_CMA) lablgtk.cma
@@ -1641,9 +1641,9 @@ resfile.o:
 
 depend:   $(RESFILE) \
 	$(PA_ZOG) $(LIB)/http_lexer.ml $(TMPSOURCES)
-	$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) *.ml *.mli > .depend
+	$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +site-lib/labl$(GTK),,$(INCLUDES)) *.ml *.mli > .depend
 	(for i in $(SUBDIRS); do \
-		$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli  >> .depend; \
+		$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +site-lib/labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli  >> .depend; \
 		$(OCAMLPP) $$i/*.mlt  >> .depend; \
 	done)
 	if test "$(GUI)" = "newgui2"; then \
@@ -1960,7 +1960,7 @@ rpm: sourcedist
 	$(OCAMLC) -verbose -ccopt "-I $(OCAML_SRC)/byterun -o $*.o" -ccopt "$(CFLAGS)" $(LIBS_flags) -c $<
 
 .cc.o :
-	$(CXX) $(CXXFLAGS) $(CRYPTOPPFLAGS) -o $*.o "-I$(OCAMLLIB)" -c $<
+	$(CXX) $(CXXFLAGS) $(CRYPTOPPFLAGS) -o $*.o "-I$(OCAMLLIB)" "-I$(OCAMLSITELIB)" -c $<
 
 .cmo.byte:
 	$(OCAMLC) -o $*.byte $(LIBS) $<
@@ -1970,7 +1970,7 @@ rpm: sourcedist
 
 
 .plugindep:
-	echo toto
+	echo TODO
 
 src/utils/lib/sha1_c.o: src/utils/lib/sha1_c.h \
   src/utils/lib/os_stubs.h