* lisp/package-get.el (package-get-have-curl): Autoload it and set
its value via requiring ffi-curl instead of a featurep test.
Signed-off-by: Steve Youngs <steve@sxemacs.org>
(list :tag "Remote" host-name directory url-scheme)))
:group 'package-get)
(list :tag "Remote" host-name directory url-scheme)))
:group 'package-get)
-(defvar package-get-have-curl (featurep 'ffi-curl)
+;;;###autoload
+(defvar package-get-have-curl (ignore-errors (require 'ffi-curl))
"Non-nil when FFI and curl is available.")
;;;###autoload
(defcustom package-get-download-sites
"Non-nil when FFI and curl is available.")
;;;###autoload
(defcustom package-get-download-sites
- `(,@(when package-get-have-curl
+ `(,@(when package-get-have-curl
'(("SXEmacs XE pkg mirror"
"downloads.sxemacs.org" "xemacs-pkgs/packages" "http")))
("US (Main XEmacs Site)"
'(("SXEmacs XE pkg mirror"
"downloads.sxemacs.org" "xemacs-pkgs/packages" "http")))
("US (Main XEmacs Site)"
;;;###autoload
(defcustom package-get-pre-release-download-sites
;;;###autoload
(defcustom package-get-pre-release-download-sites
- `(,@(when package-get-have-curl
+ `(,@(when package-get-have-curl
'(("SXEmacs XE pkg Pre-Releases" "downloads.sxemacs.org"
"xemacs-pkgs/beta/experimental/packages" "http")))
("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org"
'(("SXEmacs XE pkg Pre-Releases" "downloads.sxemacs.org"
"xemacs-pkgs/beta/experimental/packages" "http")))
("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org"
(require 'package-ui)
(load "cl-macs"))
(require 'package-ui)
(load "cl-macs"))
-;;;###autoload (condition-case nil (require 'ffi-curl) (error nil))
-
;;; package-get.el ends here
;;; package-get.el ends here