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
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Tue, 14 Aug 2018 21:48:59 +0200
Description: Do not try to create Makefile in deleted dir
--- a/configure.ac
+++ b/configure.ac
@@ -3019,7 +3019,6 @@ AC_CONFIG_FILES([
libsrc/util/Makefile
libsrc/Wi/Makefile
libsrc/Xml.new/Makefile
- libsrc/zlib/Makefile
appsrc/Makefile
appsrc/ODS-Framework/Makefile
appsrc/ODS-Addressbook/Makefile
--- a/libsrc/Wi/bif_file.c
+++ b/libsrc/Wi/bif_file.c
@@ -6872,10 +6872,11 @@ signal_error:
#define fopen64 fopen
#endif
-#include "zlib/contrib/minizip/unzip.h"
-#include "zlib/contrib/minizip/ioapi.h"
-#include "zlib/contrib/minizip/ioapi.c"
-#include "zlib/contrib/minizip/unzip.c"
+#include "minizip/unzip.h"
+#include "minizip/ioapi.h"
+/*#include "minizip/ioapi.c"
+ *#include "minizip/unzip.c"
+ */
static caddr_t
bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
--- a/binsrc/virtuoso/Makefile.am
+++ b/binsrc/virtuoso/Makefile.am
@@ -39,7 +39,7 @@ else
VIRTUOSO_BIN=virtuoso-t
endif
-LIBS += @ZLIB_LIB@
+LIBS += @ZLIB_LIB@ -lminizip -lpcre
lib_LTLIBRARIES = libvirtuoso-t.la $(IODBC_LIBS) $(MONO_LIBS) $(IODBC_MONO_LIBS)
bin_PROGRAMS = virtuoso-t $(IODBC_PROGS)
--- a/binsrc/tests/Makefile.am
+++ b/binsrc/tests/Makefile.am
@@ -51,15 +51,16 @@ server_libs = \
$(top_builddir)/libsrc/langfunc/liblangfunc.la \
$(top_builddir)/libsrc/Tidy/libtidy.la \
$(top_builddir)/libsrc/util/libutil.la \
- @srvrlibs@
+ @srvrlibs@ \
+ -lpcre -lminizip
client_libs = \
$(top_builddir)/libsrc/Wi/libwic.la \
$(top_builddir)/libsrc/Dk/libdk1t.la \
$(top_builddir)/libsrc/Thread/libthrs.la \
$(top_builddir)/libsrc/util/libutil.la \
- @clntlibs@
-
+ @clntlibs@ \
+ -lpcre -lminizip
M2_SOURCES = chil.c
M2_LDADD = \
--- a/libsrc/Wi/Makefile.am
+++ b/libsrc/Wi/Makefile.am
@@ -559,7 +559,7 @@ libwi_la_SOURCES += \
$(libwi_base_la_sources)
libwi_la_CFLAGS = $(libwi_base_la_cflags)
-libwi_la_LDLAGS = -static
+libwi_la_LDLAGS = -static -lminizip -lpcre
#KUBL_UNIV_FILES_ODBC
libwi_odbc_la_SOURCES += \
|
