* fix for 12225

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@10827 3ad0048d-3df7-0310-abae-a5850022a9f2

7 files changed, 14 insertions, 14 deletions

diff --git a/packages/mysql/src/mysql.inc b/packages/mysql/src/mysql.inc
index 31842df318..7c037d52e6 100644
--- a/packages/mysql/src/mysql.inc
+++ b/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}
diff --git a/packages/mysql/src/mysql3_comdyn.pp b/packages/mysql/src/mysql3_comdyn.pp
index 11be5c64b5..36dce54de7 100644
--- a/packages/mysql/src/mysql3_comdyn.pp
+++ b/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}
diff --git a/packages/mysql/src/mysql3dyn.pp b/packages/mysql/src/mysql3dyn.pp
index 99a1db2be7..1c4f7a3bd2 100644
--- a/packages/mysql/src/mysql3dyn.pp
+++ b/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}
diff --git a/packages/mysql/src/mysql4.pp b/packages/mysql/src/mysql4.pp
index f933927a1f..fae8e7f58a 100644
--- a/packages/mysql/src/mysql4.pp
+++ b/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}
diff --git a/packages/mysql/src/mysql4_com.pp b/packages/mysql/src/mysql4_com.pp
index 7ca926f40f..f99e2916c9 100644
--- a/packages/mysql/src/mysql4_com.pp
+++ b/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}
diff --git a/packages/mysql/src/mysql4_comdyn.pp b/packages/mysql/src/mysql4_comdyn.pp
index 9164c93e60..f91e4985da 100644
--- a/packages/mysql/src/mysql4_comdyn.pp
+++ b/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}
diff --git a/packages/mysql/src/mysql4dyn.pp b/packages/mysql/src/mysql4dyn.pp
index 7b37e66835..99ee6f4265 100644
--- a/packages/mysql/src/mysql4dyn.pp
+++ b/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}