blob: a1a1394582ee174d55ea7b9c7bda41f57eeff236 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From 2b9d37672c4e2d065b996bb80f3086018d639115 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 29 Sep 2016 16:05:46 +0200
Subject: [PATCH] honours --with-libdir option, instead of harcoding lib or
lib64
---
config.m4 | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/config.m4 b/config.m4
index 3c92535..390c829 100644
--- a/config.m4
+++ b/config.m4
@@ -137,14 +137,9 @@ int main ()
AC_MSG_CHECKING([for $static_link_extra_file])
static_link_dir=""
- if test -r $V8_DIR/lib64/$static_link_extra_file; then
- static_link_dir=$V8_DIR/lib64
- AC_MSG_RESULT(found in $V8_DIR/lib64)
- fi
-
- if test -r $V8_DIR/lib/$static_link_extra_file; then
- static_link_dir=$V8_DIR/lib
- AC_MSG_RESULT(found in $V8_DIR/lib)
+ if test -r $V8_DIR/$PHP_LIBDIR/$static_link_extra_file; then
+ static_link_dir=$V8_DIR/$PHP_LIBDIR
+ AC_MSG_RESULT(found in $V8_DIR/$PHP_LIBDIR)
fi
if test -z "$static_link_dir"; then
@@ -196,7 +191,7 @@ public:
AC_MSG_RESULT([yes])
AC_DEFINE([PHP_V8_USE_EXTERNAL_STARTUP_DATA], [1], [Whether V8 requires (and can be provided with custom versions of) external startup data])
- SEARCH_PATH="$V8_DIR/lib $V8_DIR/share/v8"
+ SEARCH_PATH="$V8_DIR/$PHP_LIBDIR $V8_DIR/share/v8"
AC_MSG_CHECKING([for natives_blob.bin])
SEARCH_FOR="natives_blob.bin"
|
