From 41fc34d79c054016ded96963e6e69dced6e89f1c Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 26 Jan 2005 22:43:14 +0000 Subject: [project @ 2005-01-26 22:43:14 by jmb] Check for presence of !Unicode resource if Iconv module is found on system svn path=/import/netsurf/; revision=1469 --- !NetSurf/!Run,feb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to '!NetSurf') 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 "" = "1" AND "" = "" 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 "" = "1" Then NetSurfRMLoad System:Modules.Iconv +Unset NetSurf$LoadIconv | No longer need this alias Unset Alias$NetSurfRMLoad -- cgit v1.2.3