summaryrefslogtreecommitdiffstats
path: root/158.patch
blob: 024cba5d693b191b21dad6857b377b3ec50b5ebf (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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
From f44f4196ba504b5a096e4ded2baae5a7751bdd84 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 6 Sep 2019 17:41:25 +0200
Subject: [PATCH] fix config to allow to enable the reader when using system
 libxlswriter

---
 config.m4 | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/config.m4 b/config.m4
index 7bf2d53..f0a6851 100644
--- a/config.m4
+++ b/config.m4
@@ -1,4 +1,4 @@
-PHP_ARG_WITH(xlsxwriter, xlswriter support,
+PHP_ARG_WITH(xlswriter, xlswriter support,
 [  --with-xlswriter           Include xlswriter support], yes)
 
 PHP_ARG_WITH(libxlsxwriter, system libxlsswriter,
@@ -23,11 +23,14 @@ if test "$PHP_XLSWRITER" != "no"; then
     kernel/read.c \
     "
 
-    libxlsxwriter_sources="
+    minizip_sources="
     library/libxlsxwriter/third_party/minizip/ioapi.c \
     library/libxlsxwriter/third_party/minizip/mztools.c \
     library/libxlsxwriter/third_party/minizip/unzip.c \
     library/libxlsxwriter/third_party/minizip/zip.c \
+    "
+
+    libxlsxwriter_sources="
     library/libxlsxwriter/third_party/tmpfileplus/tmpfileplus.c \
     library/libxlsxwriter/src/app.c \
     library/libxlsxwriter/src/chart.c \
@@ -111,7 +114,7 @@ if test "$PHP_XLSWRITER" != "no"; then
         AC_DEFINE(HAVE_LIBXLSXWRITER, 1, [ use system libxlsxwriter ])
     else
         AC_MSG_RESULT([use the bundled library])
-        xls_writer_sources="$xls_writer_sources $libxlsxwriter_sources"
+        xls_writer_sources="$xls_writer_sources $libxlsxwriter_sources $minizip_sources"
         PHP_ADD_INCLUDE([$srcdir/library/libxlsxwriter/include])
 
         XLSXWRITER_VERSION=`$EGREP "define LXW_VERSION" $srcdir/library/include/libxlsxwriter/xlsxwriter.h | $SED -e 's/[[^0-9\.]]//g'`
@@ -132,18 +135,18 @@ if test "$PHP_XLSWRITER" != "no"; then
     fi
 
     if test "$PHP_READER" = "yes"; then
-        xls_writer_sources="$xls_writer_sources $xls_read_sources"
+        xls_writer_sources="$xls_writer_sources $xls_read_sources $minizip_sources"
 
         AC_DEFINE(ENABLE_READER, 1, [enable reader])
 
         xls_writer_sources="$xls_writer_sources $libexpat"
         PHP_ADD_INCLUDE([$srcdir/library/libexpat/expat/lib])
-        PHP_ADD_BUILD_DIR([$ext_builddir/library/libexpat/expat/lib])
+        PHP_ADD_BUILD_DIR([$abs_builddir/library/libexpat/expat/lib])
         LIBOPT="$LIBOPT -DXML_POOR_ENTROPY"
 
         xls_writer_sources="$xls_writer_sources $libxlsxio"
         PHP_ADD_INCLUDE([$srcdir/library/libxlsxio/include])
-        PHP_ADD_BUILD_DIR([$ext_builddir/library/libxlsxio/lib])
+        PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxio/lib])
         LIBOPT="$LIBOPT -DUSE_MINIZIP"
     fi
 
@@ -158,11 +161,11 @@ if test "$PHP_XLSWRITER" != "no"; then
     PHP_ADD_INCLUDE([$srcdir])
     PHP_ADD_INCLUDE([$srcdir/include])
 
-    PHP_ADD_BUILD_DIR([$ext_builddir/kernel])
-    PHP_ADD_BUILD_DIR([$ext_builddir/library/libxlsxwriter/src])
-    PHP_ADD_BUILD_DIR([$ext_builddir/library/libxlsxwriter/third_party/minizip])
-    PHP_ADD_BUILD_DIR([$ext_builddir/library/libxlsxwriter/third_party/tmpfileplus])
+    PHP_ADD_BUILD_DIR([$abs_builddir/kernel])
+    PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/src])
+    PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/third_party/minizip])
+    PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxwriter/third_party/tmpfileplus])
 
-    PHP_ADD_BUILD_DIR([$ext_builddir/library/libexpat/expat/lib])
-    PHP_ADD_BUILD_DIR([$ext_builddir/library/libxlsxio/lib])
+    PHP_ADD_BUILD_DIR([$abs_builddir/library/libexpat/expat/lib])
+    PHP_ADD_BUILD_DIR([$abs_builddir/library/libxlsxio/lib])
 fi