Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Test whether to use curl or wget for src_ext in ./configure

  • Loading branch information...
commit 6264fc73a628a758dd5e275a222927b1eb811c7b 1 parent 2651e76
@samoht samoht authored
Showing with 13 additions and 2 deletions.
  1. +2 −1  Makefile.config.in
  2. +10 −0 configure.ac
  3. +1 −1  src_ext/Makefile
View
3  Makefile.config.in
@@ -1,4 +1,5 @@
datarootdir = @datarootdir@
prefix=@prefix@
mandir=@mandir@
-version=@PACKAGE_VERSION@
+version=@PACKAGE_VERSION@
+FETCH=@fetch@
View
10 configure.ac
@@ -20,6 +20,16 @@ if test "$VERSION_CHECK" = "yes" ; then
AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported]))
fi
+AC_CHECK_PROGS(FETCH,[curl wget],no)
+
+if test x"$FETCH" = x"curl" ; then
+ AC_SUBST(fetch, "curl -OL")
+elif test x"$FETCH" = x"wget" ; then
+ AC_SUBST(fetch, "wget")
+else
+ AC_MSG_ERROR([You must have either curl or wget installed.])
+fi
+
AC_CONFIG_FILES(
Makefile.config
src/core/opamVersion.ml
View
2  src_ext/Makefile
@@ -1,4 +1,4 @@
-FETCH ?= curl -OL
+include ../Makefile.config
all: clone depends.ocp
Please sign in to comment.
Something went wrong with that request. Please try again.