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
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
Patch fixes linking of Trf library at build time. It is taken from
http://sourceforge.net/tracker/index.php?func=detail&aid=680667&group_id=60766&atid=495205
--- a/generic/zlib.c
+++ b/generic/zlib.c
@@ -44,11 +44,11 @@
0,
deflate,
deflateEnd,
- deflateInit_,
+ deflateInit2_,
deflateReset,
inflate,
inflateEnd,
- inflateInit_,
+ inflateInit2_,
inflateReset,
adler32,
crc32,
--- a/trf.m4
+++ b/trf.m4
@@ -155,15 +155,15 @@
AC_ARG_ENABLE(static-zlib,
[ --enable-static-zlib link 'zlib' statically],
- [STATIC_ZLIB=$enableval], [STATIC_ZLIB=no])
+ [ZLIB_STATIC=$enableval], [ZLIB_STATIC=no])
AC_ARG_ENABLE(static-bzlib,
[ --enable-static-bzlib link 'bzlib' statically],
- [STATIC_BZLIB=$enableval], [STATIC_BZLIB=no])
+ [BZLIB_STATIC=$enableval], [BZLIB_STATIC=no])
AC_ARG_ENABLE(static-md5,
[ --enable-static-md5 link 'md5' statically],
- [STATIC_MD5=$enableval], [STATIC_MD5=no])
+ [MD5_STATIC=$enableval], [MD5_STATIC=no])
AC_ARG_ENABLE(trf_debug,
[ --enable-trf-debug enable debugging output],
@@ -260,7 +260,7 @@
else
ZLIB_INCLUDE_DIR="\"`${CYGPATH} $trf_cv_path_ZLIB_INCLUDE_DIR`\""
- eval AC_DEFINE_UNQUOTED(HAVE_ZLIB_H, 1)
+ AC_DEFINE_UNQUOTED(HAVE_ZLIB_H, 1)
TRF_TESTS="$TRF_TESTS hasZlib"
fi
dnl
@@ -374,10 +374,10 @@
AC_MSG_WARN([Squashing SSL / Windows])
SSL_INCLUDE_DIR="\".\""
else
- eval AC_DEFINE_UNQUOTED(HAVE_SSL_H, 1)
- eval AC_DEFINE_UNQUOTED(HAVE_MD2_H, 1)
- eval AC_DEFINE_UNQUOTED(HAVE_MD5_H, 1)
- eval AC_DEFINE_UNQUOTED(HAVE_SHA_H, 1)
+ AC_DEFINE_UNQUOTED(HAVE_SSL_H, 1)
+ AC_DEFINE_UNQUOTED(HAVE_MD2_H, 1)
+ AC_DEFINE_UNQUOTED(HAVE_MD5_H, 1)
+ AC_DEFINE_UNQUOTED(HAVE_SHA_H, 1)
#DEFS="$DEFS -DHAVE_SSL_H -DHAVE_MD2_H -DHAVE_SHA_H"
TRF_TESTS="$TRF_TESTS hasSSL"
fi
@@ -470,7 +470,7 @@
BZ2_INCLUDE_DIR="\".\""
else
BZ2_INCLUDE_DIR="\"`${CYGPATH} $trf_cv_path_BZ2_INCLUDE_DIR`\""
- eval AC_DEFINE_UNQUOTED(HAVE_BZ2_H, 1)
+ AC_DEFINE_UNQUOTED(HAVE_BZ2_H, 1)
fi
dnl
@@ -529,27 +529,27 @@
if test "x$ZLIB_STATIC" = "xyes"
then
- eval AC_DEFINE_UNQUOTED(ZLIB_STATIC_BUILD, 1)
+ AC_DEFINE_UNQUOTED(ZLIB_STATIC_BUILD, 1)
fi
if test "x$BZLIB_STATIC" = "xyes"
then
- eval AC_DEFINE_UNQUOTED(BZLIB_STATIC_BUILD, 1)
+ AC_DEFINE_UNQUOTED(BZLIB_STATIC_BUILD, 1)
fi
if test "x$MD5_STATIC" = "xyes"
then
- eval AC_DEFINE_UNQUOTED(MD5_STATIC_BUILD, 1)
+ AC_DEFINE_UNQUOTED(MD5_STATIC_BUILD, 1)
fi
if test "x$trf_debug" = "xyes"
then
- eval AC_DEFINE_UNQUOTED(TRF_DEBUG, 1)
+ AC_DEFINE_UNQUOTED(TRF_DEBUG, 1)
fi
if test "x$stream_debug" = "xyes"
then
- eval AC_DEFINE_UNQUOTED(TRF_STREAM_DEBUG, 1)
+ AC_DEFINE_UNQUOTED(TRF_STREAM_DEBUG, 1)
fi
--- a/configure
+++ b/configure
@@ -13087,25 +13087,25 @@
# Check whether --enable-static-zlib was given.
if test "${enable_static_zlib+set}" = set; then
- enableval=$enable_static_zlib; STATIC_ZLIB=$enableval
+ enableval=$enable_static_zlib; ZLIB_STATIC=$enableval
else
- STATIC_ZLIB=no
+ ZLIB_STATIC=no
fi
# Check whether --enable-static-bzlib was given.
if test "${enable_static_bzlib+set}" = set; then
- enableval=$enable_static_bzlib; STATIC_BZLIB=$enableval
+ enableval=$enable_static_bzlib; BZLIB_STATIC=$enableval
else
- STATIC_BZLIB=no
+ BZLIB_STATIC=no
fi
# Check whether --enable-static-md5 was given.
if test "${enable_static_md5+set}" = set; then
- enableval=$enable_static_md5; STATIC_MD5=$enableval
+ enableval=$enable_static_md5; MD5_STATIC=$enableval
else
- STATIC_MD5=no
+ MD5_STATIC=no
fi
|
