* fix for 12225

git-svn-id: trunk@10827 -

packages/mysql/src/mysql.inc

@@ -23,21 +23,21 @@ interface
 
 uses
 {$IFDEF LinkDynamically}
-     Dynlibs, sysutils,
+      sysutils,
 {$ENDIF}
-     ctypes;
+     dynlibs,ctypes;
 
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    mysqllib = 'libmysqlclient.so';
+    mysqllib = 'libmysqlclient.'+sharedsuffix;
 
   {$IF DEFINED(mysql50)}
-    mysqlvlib = 'libmysqlclient.so.15';
+    mysqlvlib = 'libmysqlclient.'+sharedsuffix+'.15';
   {$ELSEIF DEFINED(mysql41)}
-    mysqlvlib = 'libmysqlclient.so.14';
+    mysqlvlib = 'libmysqlclient.'+sharedsuffix+'.14';
   {$ELSE}
-    mysqlvlib = 'libmysqlclient.so.12';
+    mysqlvlib = 'libmysqlclient.'+sharedsuffix+'.12';
   {$ENDIF}
 
 {$ENDIF}

packages/mysql/src/mysql3_comdyn.pp

@@ -20,7 +20,7 @@ uses dynlibs, sysutils;
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    Mysqllib = 'libmysqlclient.so';
+    Mysqllib = 'libmysqlclient.'+sharedsuffix;
 {$ENDIF}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}

packages/mysql/src/mysql3dyn.pp

@@ -20,7 +20,7 @@ uses dynlibs, classes, sysutils, mysql3_comdyn;
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    Mysqllib = 'libmysqlclient.so';
+    Mysqllib = 'libmysqlclient.'+sharedsuffix;
 {$ENDIF}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}

packages/mysql/src/mysql4.pp

@@ -1,7 +1,7 @@
 unit mysql4;
 interface
 
-uses ctypes,my4_sys,mysql4_com;
+uses ctypes,my4_sys,mysql4_com,dynlibs;
 
 {
   Automatically converted by H2Pas 0.99.15 from mysql.ph
@@ -37,7 +37,7 @@ uses ctypes,my4_sys,mysql4_com;
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    External_library = 'libmysqlclient.so';
+    External_library = 'libmysqlclient.'+sharedsuffix;
 {$ENDIF}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}

packages/mysql/src/mysql4_com.pp

@@ -6,12 +6,12 @@ unit mysql4_com;
 interface
 
 uses
-  ctypes;
+  ctypes,dynlibs;
 
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    External_library = 'libmysqlclient.so';
+    External_library = 'libmysqlclient.'+sharedsuffix;
 {$ENDIF}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}

packages/mysql/src/mysql4_comdyn.pp

@@ -16,7 +16,7 @@ uses ctypes,my4_sys,dynlibs, sysutils;
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    Mysqllib = 'libmysqlclient.so';
+    Mysqllib = 'libmysqlclient.'+sharedsuffix;
 {$ENDIF}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}

packages/mysql/src/mysql4dyn.pp

@@ -45,7 +45,7 @@ uses ctypes,dynlibs, classes, sysutils, my4_sys, mysql4_comdyn;
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   const
-    Mysqllib = 'libmysqlclient.so';
+    Mysqllib = 'libmysqlclient.'+sharedsuffix;
 {$ENDIF}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}