diff options
Diffstat (limited to '')
| -rw-r--r-- | src/config-darwin.inc | 5 | ||||
| -rw-r--r-- | src/config.inc.in | 5 | ||||
| -rw-r--r-- | src/lib/pcre/pcre.pas | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 83cadbae..4c128a05 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -50,4 +50,9 @@ PORTAUDIO_VERSION_RELEASE = 0; {$IFEND} +{$DEFINE HaveLibPcre} +{$IF Defined(HaveLibPcre) and Defined(IncludeConstants)} + LIBPCRE_LIBDIR = '/sw/lib'; +{$IFEND} + {$UNDEF HavePortmixer} diff --git a/src/config.inc.in b/src/config.inc.in index b5e086f4..d57c7ab4 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -50,4 +50,9 @@ PORTAUDIO_VERSION_RELEASE = @portaudio_VERSION_RELEASE@; {$IFEND} +{$@DEFINE_HAVE_LIBPCRE@ HaveLibPcre} +{$IF Defined(HaveLibPcre) and Defined(IncludeConstants)} + LIBPCRE_LIBDIR = '@libpcre_LIBDIR@'; +{$IFEND} + {$@DEFINE_HAVE_PORTMIXER@ HavePortmixer} diff --git a/src/lib/pcre/pcre.pas b/src/lib/pcre/pcre.pas index 50e3371a..fc15bdbc 100644 --- a/src/lib/pcre/pcre.pas +++ b/src/lib/pcre/pcre.pas @@ -503,6 +503,9 @@ implementation uses SysUtils, + {$IFDEF DARWIN} + UConfig, + {$ENDIF DARWIN} {$IFDEF MSWINDOWS} Windows; {$ENDIF MSWINDOWS} @@ -536,7 +539,7 @@ const libpcremodulename = 'libpcre.so.0'; {$ENDIF LINUX} {$IFDEF DARWIN} - libpcremodulename = 'libpcre.dylib'; + libpcremodulename = LIBPCRE_LIBDIR + '/libpcre.dylib'; {$ENDIF DARWIN} PCRECompileExportName = 'pcre_compile'; PCRECompile2ExportName = 'pcre_compile2'; |