summaryrefslogtreecommitdiff
path: root/!NetSurf
diff options
context:
space:
mode:
Diffstat (limited to '!NetSurf')
-rw-r--r--!NetSurf/!Run,feb14
1 files changed, 11 insertions, 3 deletions
diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index acf33fe35..b7ab97e0a 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -1,4 +1,4 @@
-| Run file for NetSurf. ( $Revision: 1.33 $ )
+| Run file for NetSurf. ( $Revision: 1.34 $ )
|
| This file ensures that the system resources required by NetSurf are
| present. Additionally, it forces setting of system variables related
@@ -59,9 +59,17 @@ RMEnsure Tinct 0.09 NetSurfRMLoad System:Modules.Tinct
RMEnsure Tinct 0.09 Error NetSurf requires Tinct 0.09 or later. This can be downloaded from http://www.tinct.net
| Ensure Iconv
-| http://moose.mine.nu:6888/iconv002.zip
+| http://moose.mine.nu:6888/iconv_latest.zip
+|
+| If Iconv is present, then ensure that the !Unicode resource has been
+| seen before loading Iconv. If it isn't present, don't bother checking
+| as we don't care.
| Not an error if not present - there'll be no charset conversion.
-RMEnsure Iconv 0.02 NetSurfRMLoad System:Modules.Iconv
+Set NetSurf$LoadIconv 0
+RMEnsure Iconv 0.02 IfThere System:Modules.Iconv Then Set NetSurf$LoadIconv 1
+If "<NetSurf$LoadIconv>" = "1" AND "<Unicode$Path>" = "" Then Error NetSurf requires the !Unicode resource. This can be found, along with the Iconv module, at http://moose.mine.nu:6888/iconv_latest.zip
+If "<NetSurf$LoadIconv>" = "1" Then NetSurfRMLoad System:Modules.Iconv
+Unset NetSurf$LoadIconv
| No longer need this alias
Unset Alias$NetSurfRMLoad