blob: 929910beaccbfb482ff536689c76e0257fd5faa8 (
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
|
diff -ur apr_util.org/aprutil.mak apr_util/aprutil.mak
--- apr_util.org/aprutil.mak 2014-03-05 16:40:02.385701779 +0100
+++ apr_util/aprutil.mak 2014-03-05 16:40:49.409702332 +0100
@@ -210,8 +210,6 @@
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\LibR\apriconv-1.lib" \
- ".\xml\expat\lib\LibR\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -406,8 +404,6 @@
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\LibD\apriconv-1.lib" \
- ".\xml\expat\lib\LibD\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -602,8 +598,6 @@
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\x64\LibR\apriconv-1.lib" \
- ".\xml\expat\lib\x64\LibR\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -798,8 +792,6 @@
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\x64\LibD\apriconv-1.lib" \
- ".\xml\expat\lib\x64\LibD\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
diff -ur apr_util.org/include/apu.hw apr_util/include/apu.hw
--- apr_util.org/include/apu.hw 2014-03-05 16:40:02.377701779 +0100
+++ apr_util/include/apu.hw 2014-03-05 16:40:38.769702207 +0100
@@ -138,8 +138,8 @@
#define APU_HAVE_NSS 0
#endif
-#define APU_HAVE_APR_ICONV 1
-#define APU_HAVE_ICONV 0
+#undef APU_HAVE_APR_ICONV
+#undef APU_HAVE_ICONV
#define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
#endif /* APU_H */
|
