--- Merging r15137 into '.':

U    packages/libgd/src/gd.pas
--- Merging r15140 into '.':
U    installer/install.dat

git-svn-id: branches/fixes_2_4@15248 -

installer/install.dat

@@ -85,6 +85,8 @@ package=ulibgddos.zip[ulgddos.zip],GD library interface unit
 package=usymbolicdos.zip[usymbdos.zip],Symbolic (unit for parsing and evaluating expressions)
 # Dos 29
 package=ufcl-resdos.zip[ufcledos.zip],Free Component Library (FCL)-resources
+# Dos 30
+package=ubzip2dos.zip[ubz2dos.zip],Units for bzip2 decompression
 
 #
 # Win32 packages
@@ -204,6 +206,8 @@ package=units-libgd.i386-win32.zip,GD library interface unit
 package=units-symbolic.i386-win32.zip,Symbolic (unit for parsing and evaluating expressions)
 # Win32-2 28
 package=units-fcl-res.i386-win32.zip,Free Component Library (FCL)-resources
+# Win32-2 29
+package=units-bzip2.i386-win32.zip,Units for bzip2 decompression
 
 
 #
@@ -310,6 +314,9 @@ package=ulibgdos2.zip[ulgdos2.zip],GD library interface unit
 package=usymbolicos2.zip[usymbos2.zip],Symbolic (unit for parsing and evaluating expressions)
 # OS/2-2 23
 package=ufcl-resos2.zip[ufcleos2.zip],Free Component Library (FCL)-resources
+# OS/2-2 24
+package=ubzip2os2.zip[ubz2os2.zip],Units for bzip2 decompression
+
 
 
 
@@ -417,6 +424,8 @@ package=ulibgdemx.zip[ulgdemx.zip],GD library interface unit
 package=usymbolicemx.zip[usymbemx.zip],Symbolic (unit for parsing and evaluating expressions)
 # EMX-2 23
 package=ufcl-resemx.zip[ufcleemx.zip],Free Component Library (FCL)-resources
+# EMX-2 24
+package=ubzip2emx.zip[ubz2emx.zip],Units for bzip2 decompression
 
 
 #
@@ -527,6 +536,8 @@ package=units-libgd.source.zip[ulgdsrc.zip],GD library interface unit
 package=units-symbolic.source.zip[usymbsrc.zip],Symbolic (unit for parsing and evaluating expressions)
 # Source-2 24
 package=units-fcl-res.source.zip[ufclesrc.zip],Free Component Library (FCL)-resources
+# Source-2 25
+package=units-bzip2.source.zip[ubz2src.zip],Units for bzip2 decompression
 
 
 #

packages/libgd/src/gd.pas

@@ -26,6 +26,9 @@ uses
 {$ENDIF FPC_TARGET_SUPPORTS_DYNLIBS}
   ctypes;
 
+(* cdecl as default unless defined differently below *)
+{$DEFINE EXTDECL := cdecl}
+
 {$IFDEF UNIX}
   {$DEFINE EXTDECL := cdecl}
   const
@@ -46,6 +49,13 @@ uses
     {$linklib c}
    {$UNDEF LOAD_DYNAMICALLY}
 {$ENDIF GO32V2}
+{$IFDEF OS2}
+(* Force static linking under OS/2 for now to avoid     *)
+(* dependency on dll for a one particular libc version. *)
+  {$UNDEF LOAD_DYNAMICALLY}
+  {$DEFINE gdlib := }
+  {$DEFINE clib := }
+{$ENDIF OS2}
 
 {$IFNDEF LOAD_DYNAMICALLY}
   {$IFDEF darwin}