Commit 18a7468a authored by Giuseppe Castagna's avatar Giuseppe Castagna

Changed configuration files so that it now autodetects

for cgi the package netcgi1
parent 3cc04d15
...@@ -207,7 +207,7 @@ endif ...@@ -207,7 +207,7 @@ endif
ifeq ($(PXP),true) ifeq ($(PXP),true)
ifeq ($(CGI),true) ifeq ($(CGI),true)
OBJECTS += runtime/cduce_pxp.cmo OBJECTS += runtime/cduce_pxp.cmo
PACKAGES += $(PXP_PACK) cgi PACKAGES += $(PXP_PACK) netcgi1
ALL_TARGET += dtd2cduce ALL_TARGET += dtd2cduce
INSTALL_BINARIES += dtd2cduce INSTALL_BINARIES += dtd2cduce
endif endif
...@@ -261,7 +261,7 @@ cduce_lib.$(EXTENSION_LIB): $(OBJECTS:.cmo=.$(EXTENSION)) ...@@ -261,7 +261,7 @@ cduce_lib.$(EXTENSION_LIB): $(OBJECTS:.cmo=.$(EXTENSION))
dtd2cduce: tools/dtd2cduce.ml dtd2cduce: tools/dtd2cduce.ml
@echo "Build $@" @echo "Build $@"
$(HIDE)$(OCAMLFIND) $(CAML) -o $@ -package "$(PXP_PACK) cgi" -linkpkg $^ $(HIDE)$(OCAMLFIND) $(CAML) -o $@ -package "$(PXP_PACK) netcgi1" -linkpkg $^
.PHONY: compute_depend .PHONY: compute_depend
compute_depend: $(DEPEND_OCAMLDEP) compute_depend: $(DEPEND_OCAMLDEP)
......
...@@ -211,7 +211,7 @@ let pxp = check_feature "pxp" (check_pkg "pxp") ...@@ -211,7 +211,7 @@ let pxp = check_feature "pxp" (check_pkg "pxp")
let expat = check_feature "expat" (check_pkg "expat") let expat = check_feature "expat" (check_pkg "expat")
let curl = check_feature "curl" (check_pkg "curl") let curl = check_feature "curl" (check_pkg "curl")
let netclient = check_feature "netclient" (check_pkg "netclient") let netclient = check_feature "netclient" (check_pkg "netclient")
let cgi = check_feature "cgi" (check_pkg "cgi") let cgi = check_feature "cgi" (check_pkg "netcgi1")
let pxp_wlex = check_feature "pxp_wlex" (check_pkg "pxp-wlex-utf8") let pxp_wlex = check_feature "pxp_wlex" (check_pkg "pxp-wlex-utf8")
let prefix = dir "prefix" let prefix = dir "prefix"
let bindir = dir ~def:(prefix^"/bin") "bindir" let bindir = dir ~def:(prefix^"/bin") "bindir"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment