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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
--- curl/makefile.mk 16 Jul 2003 17:24:06 -0000 1.8
+++ curl/makefile.mk 22 Dec 2003 15:07:10 -0000
@@ -71,6 +71,12 @@
# --- Files --------------------------------------------------------
+.IF "$(SYSTEM_CURL)" == "YES"
+@all:
+
+ echo "Using curl already installed on system."
+.ENDIF
+
TARFILE_NAME=curl-7.9.8
.IF "$(GUI)"=="UNX"
Index: office/files.scp
===================================================================
RCS file: /cvs/installation/scp/source/office/files.scp,v
retrieving revision 1.369.16.3.12.3
diff -u -r1.369.16.3.12.3 files.scp
--- scp/source/office/files.scp 13 Dec 2003 15:36:15 -0000 1.369.16.3.12.3
+++ scp/source/office/files.scp 22 Dec 2003 19:38:30 -0000
@@ -938,6 +938,8 @@
#endif
End
+#ifndef SYSTEM_CURL
+
File GID_FILE_LIB_CURL
TXT_FILE_BODY;
Styles = (PACKED);
@@ -949,6 +951,7 @@
#endif
End
+#endif
File GID_FILE_LIB_I18NREGEXP
TXT_FILE_BODY;
Index: ftpurl.hxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftpurl.hxx,v
retrieving revision 1.11
diff -u -r1.11 ftpurl.hxx
--- ucb/source/ucp/ftp/ftpurl.hxx 27 Mar 2003 17:26:48 -0000 1.11
+++ ucb/source/ucp/ftp/ftpurl.hxx 15 Jan 2004 03:16:09 -0000
@@ -80,6 +80,9 @@
#include "ftpdirp.hxx"
#include "ftpcfunc.hxx"
+#define TRUE 1
+#define FALSE 0
+
namespace ftp {
/** Forward declarations.
--- ucb/source/ucp/ftp/makefile.mk-old 2004-01-28 11:14:15.000000000 +0100
+++ ucb/source/ucp/ftp/makefile.mk 2004-05-29 22:41:14.000000000 +0200
@@ -118,6 +118,10 @@
$(UCBHELPERLIB) \
$(CURLLIB)
+#.IF "$(CURL_LINKING_NEEDS_XT)" == "YES"
+SHL1STDLIBS += -lXt
+#.ENDIF
+
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS= \
$(LIB1TARGET)
Index: ftphandleprovider.hxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftphandleprovider.hxx,v
retrieving revision 1.2
diff -u -r1.2 ftphandleprovider.hxx
--- ucb/source/ucp/ftp/ftphandleprovider.hxx 15 Oct 2002 09:21:17 -0000 1.2
+++ ucb/source/ucp/ftp/ftphandleprovider.hxx 20 Jul 2004 22:02:48 -0000
@@ -1,5 +1,5 @@
#include <rtl/ustring.hxx>
-#include <curl/types.h>
+#include <curl/curl.h>
namespace ftp {
Index: ftploaderthread.hxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftploaderthread.hxx,v
retrieving revision 1.5
diff -u -r1.5 ftploaderthread.hxx
--- ucb/source/ucp/ftp/ftploaderthread.hxx 28 Aug 2002 07:23:14 -0000 1.5
+++ ucb/source/ucp/ftp/ftploaderthread.hxx 20 Jul 2004 22:02:48 -0000
@@ -71,11 +71,10 @@
#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
#endif
-#ifndef __CURL_TYPES_H
-#include <curl/types.h>
+#ifndef __CURL_CURL_H
+#include <curl/curl.h>
#endif
-
namespace ftp {
/** A loaderthread acts as factory for CURL-handles,
|
