fix a dependency issue and update some possibly-obsolete package names

Author: John Christopher McAlpine

build/build.ml

@@ -15,9 +15,9 @@ module Intern = struct
   end
 
   let with_package = function
-    | "eliom.ppx.type" -> "pkg_ppx_eliom_types"
-    | "eliom.ppx.client"
-    | "eliom.ppx.server"
+    | "ppx_eliom.ppx.type" -> "pkg_ppx_eliom_types"
+    | "ppx_eliom.ppx.client"
+    | "ppx_eliom.ppx.server"
     | "eliom.syntax.predef"
     | "eliom.client"
     | "eliom.server" -> (* do noting in this case *) "pkg_dummy"

src/lib/client/dune

@@ -5,15 +5,18 @@
   (libraries
     eliom.internal
     eliom.client.internal
-    eliom.server
+    ipaddr
     lwt
     js_of_ocaml
     js_of_ocaml-lwt
     js_of_ocaml-lwt.logger
     js_of_ocaml.tyxml
-    ocsigenserver.cookies
     lwt_log
     lwt_react
+    netstring-pcre
+    ocsigenserver
+    ocsigenserver.cookies
+    ocsigenserver.ext
     react
     reactiveData
     tyxml)

src/ocamlbuild/ocamlbuild_eliom.ml

@@ -69,11 +69,11 @@ module MakeIntern (I : INTERNALS)(Eliom : ELIOM) = struct
 
   let get_eliom_syntax_ppx = function
     | `Client ->
-      "eliom.ppx.client"
+      "ppx_eliom.ppx.client"
     | `Server ->
-      "eliom.ppx.server"
+      "ppx_eliom.ppx.server"
     | `Type ->
-      "eliom.ppx.type"
+      "ppx_eliom.ppx.type"
 
   let get_syntaxes_p4 with_eliom_syntax eliom_syntax src =
     let eliom_syntax = get_eliom_syntax_p4 eliom_syntax in