From 7ac852cd9709af98b6c12f2c7eca67915932e8a9 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 22 Nov 2014 23:45:59 +0000
Subject: Fix PCRE on linux and macosx. The soname of libpcre.so is different
 depending on the system, e.g. .so.1 on Arch and .so.3 on Debian. Instead of
 always using libpcre.so.0, detect the soname for the current system. Thanks
 to rudi_s.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3105 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/config.inc.in     | 1 +
 src/lib/pcre/pcre.pas | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/config.inc.in b/src/config.inc.in
index 967612a4..232ba615 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -71,6 +71,7 @@
 
 {$@DEFINE_HAVE_LIBPCRE@ HaveLibPcre}
 {$IF Defined(HaveLibPcre) and Defined(IncludeConstants)}
+  LIBPCRE_LIBNAME  = '@libpcre_LIBNAME@';
   LIBPCRE_LIBDIR   = '@libpcre_LIBDIR@';
 {$IFEND}
 
diff --git a/src/lib/pcre/pcre.pas b/src/lib/pcre/pcre.pas
index ab04a9d0..d328f4cf 100644
--- a/src/lib/pcre/pcre.pas
+++ b/src/lib/pcre/pcre.pas
@@ -503,9 +503,7 @@ implementation
 
 uses
   SysUtils,
-  {$IFDEF DARWIN}
   UConfig,
-  {$ENDIF DARWIN}  
   {$IFDEF MSWINDOWS}
   Windows;
   {$ENDIF MSWINDOWS}
@@ -536,7 +534,8 @@ const
   libpcremodulename = 'pcre3.dll';
   {$ENDIF MSWINDOWS}
   {$IFDEF LINUX}
-  libpcremodulename = 'libpcre.so.0';
+  // "libpcre.so.<soname>", soname is different on platforms
+  libpcremodulename = LIBPCRE_LIBNAME;
   {$ENDIF LINUX}
   {$IFDEF DARWIN}
   libpcremodulename = 'libpcre.dylib';  // this is a symlink for example to libpcre.0.0.1.dylib
-- 
cgit v1.2.3