paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-07 00:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* make aspell use dynamic runtime linking again

Browse Source 
* default to latest aspell version, enable override

git-svn-id: trunk@9214 -
This commit is contained in:
Almindor 2007-11-12 10:48:49 +00:00
parent c0b5e9ad07
commit 20b147f8ac
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/extra/aspell/aspell.pp
View File

@ -15,13 +15,13 @@ uses
cTypes, DynLibs;
{$IFDEF Linux}
{$DEFINE Static}
const aspelllib='aspell';
{$DEFINE Dynamic}
const aspelllib='/usr/lib/libaspell.so.15';
{$ENDIF}
{$IFDEF FreeBSD}
{$DEFINE Static}
const aspelllib='aspell';
const aspelllib='/usr/local/lib/libaspell.so.15';
{$ENDIF}
{$IFDEF darwin}
@ -96,7 +96,7 @@ var aspellpresent:longbool;
delete_aspell_speller:procedure (ths:aspellspeller); cdecl;
{$ENDIF}
procedure aspell_init;
procedure aspell_init(const libn: ansistring);
procedure aspell_done;
{$IFDEF Static}
@ -149,7 +149,7 @@ var addr:pointer;
end;
{$ENDIF}
procedure aspell_init;
procedure aspell_init(const libn: ansistring);
var
mylib:string;
{$ifdef windows}
@ -161,13 +161,14 @@ var
aspellpresent:=true;
{$ELSE}
aspellpresent:=false;
mylib:=aspelllib;
mylib:=libn;
{$IFDEF windows}
bversion:=RegistryQueryValue (regLocalMachine,'SOFTWARE\Aspell','AspellVersion');
move (bversion[1],version,4);
path:=RegistryQueryValue (regLocalMachine,'SOFTWARE\Aspell','Path');
mylib:=path + PathDelim + StringReplace(aspelllib, '%s', IntToStr(Version), [rfReplaceAll]);
// will work if they passed %s, won't bork if they passed absolute
mylib:=path + PathDelim + StringReplace(libn, '%s', IntToStr(Version), [rfReplaceAll]);
{$ENDIF}
alib := LoadLibrary(mylib);
@ -207,7 +208,7 @@ procedure aspell_done;
end;
initialization
aspell_init;
aspell_init(aspelllib);
finalization
aspell_done;