aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-30 11:24:59 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-30 11:24:59 +0000
commit39aaf72754dcca65c6f7ef4ac4e91c344c7d98a1 (patch)
treee2412449dd252cf6a60ff1e4c8609afa5ea33dcc /src/lib
parentcafa9b8034cbff7f7c3507f3f1b0b03a2e5455f7 (diff)
downloadusdx-39aaf72754dcca65c6f7ef4ac4e91c344c7d98a1.tar.gz
usdx-39aaf72754dcca65c6f7ef4ac4e91c344c7d98a1.tar.xz
usdx-39aaf72754dcca65c6f7ef4ac4e91c344c7d98a1.zip
more careful with the path to libpcre.dylib. avoid possible problem with standalone version.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2426 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/pcre/pcre.pas7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/pcre/pcre.pas b/src/lib/pcre/pcre.pas
index fc15bdbc..075fd417 100644
--- a/src/lib/pcre/pcre.pas
+++ b/src/lib/pcre/pcre.pas
@@ -539,7 +539,8 @@ const
libpcremodulename = 'libpcre.so.0';
{$ENDIF LINUX}
{$IFDEF DARWIN}
- libpcremodulename = LIBPCRE_LIBDIR + '/libpcre.dylib';
+ libpcremodulename = 'libpcre.dylib';
+ libpcremodulenamefromfink = LIBPCRE_LIBDIR + '/libpcre.dylib';
{$ENDIF DARWIN}
PCRECompileExportName = 'pcre_compile';
PCRECompile2ExportName = 'pcre_compile2';
@@ -783,6 +784,10 @@ begin
{$IFDEF UNIX}
PCRELib := dlopen(PAnsiChar(libpcremodulename), RTLD_NOW);
{$ENDIF UNIX}
+ {$IFDEF DARWIN} // if not found, do another try from the fink path
+ if PCRELib = INVALID_MODULEHANDLE_VALUE then
+ PCRELib := dlopen(PAnsiChar(libpcremodulenamefromfink), RTLD_NOW);
+ {$ENDIF DARWIN}
Result := PCRELib <> INVALID_MODULEHANDLE_VALUE;
if Result then
begin