Browse Source

* Use DynLibs.Sharedsuffix for postgres,sqlite and odbc

git-svn-id: trunk@12289 -
joost 16 years ago
parent
commit
19a73853bd

+ 1 - 3
packages/odbc/src/odbcsql.inc

@@ -22,16 +22,14 @@
 interface
 interface
 
 
 uses
 uses
-{$IFDEF DYNLOADINGODBC}
      Dynlibs,
      Dynlibs,
-{$ENDIF}
      ctypes,
      ctypes,
      sysutils;
      sysutils;
 
 
 {$IFDEF Unix}
 {$IFDEF Unix}
   {$DEFINE extdecl:=cdecl}
   {$DEFINE extdecl:=cdecl}
   const
   const
-    odbclib = 'libodbc.so';
+    odbclib = 'libodbc.'+sharedsuffix;
 {$ENDIF}
 {$ENDIF}
 {$IFDEF Windows}
 {$IFDEF Windows}
   {$DEFINE extdecl:=stdcall}
   {$DEFINE extdecl:=stdcall}

+ 2 - 2
packages/postgres/src/postgres3dyn.pp

@@ -12,11 +12,11 @@ unit postgres3dyn;
 interface
 interface
 
 
 uses
 uses
-  dynlibs, SysUtils, dllistdyn;
+  dynlibs, SysUtils, dllistdyn, ctypes;
 
 
 {$IFDEF Unix}
 {$IFDEF Unix}
   const
   const
-    pqlib = 'libpq.so';
+    pqlib = 'libpq.'+sharedsuffix;
 {$ENDIF}
 {$ENDIF}
 {$IFDEF Win32}
 {$IFDEF Win32}
   const
   const

+ 4 - 2
packages/sqlite/src/sqlite3.inc

@@ -7,9 +7,11 @@
 
 
 interface
 interface
 
 
+uses
 {$ifdef LOAD_DYNAMICALLY}
 {$ifdef LOAD_DYNAMICALLY}
-uses 
   SysUtils, DynLibs;
   SysUtils, DynLibs;
+{$else}
+  DynLibs;
 {$endif}
 {$endif}
 
 
 {
 {
@@ -28,7 +30,7 @@ const
 {$IFDEF WINDOWS}
 {$IFDEF WINDOWS}
   Sqlite3Lib = 'sqlite3.dll';
   Sqlite3Lib = 'sqlite3.dll';
 {$else}
 {$else}
-  Sqlite3Lib = 'libsqlite3.so';
+  Sqlite3Lib = 'libsqlite3.'+sharedsuffix;
 {$endif}
 {$endif}
 
 
   SQLITE_INTEGER = 1;   
   SQLITE_INTEGER = 1;