1 |
blueness 14/06/02 00:08:10 |
2 |
|
3 |
Added: ipv6calc-fix-configure-opts.patch |
4 |
Log: |
5 |
Fix several issues with configure file, bug #511578 |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-misc/ipv6calc/files/ipv6calc-fix-configure-opts.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ipv6calc/files/ipv6calc-fix-configure-opts.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ipv6calc/files/ipv6calc-fix-configure-opts.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: ipv6calc-fix-configure-opts.patch |
16 |
=================================================================== |
17 |
--- ipv6calc-0.97.2.orig/configure.in 2014-05-23 14:29:46.000000000 -0400 |
18 |
+++ ipv6calc-0.97.2/configure.in 2014-06-01 20:03:27.623149762 -0400 |
19 |
@@ -44,12 +44,20 @@ |
20 |
AS_HELP_STRING([--enable-bundled-getopt], |
21 |
[Enable bundled getopt library (default: autoselected)]), |
22 |
[ |
23 |
- AC_MSG_RESULT([*** use of bundled getopt library forced]) |
24 |
- ENABLE_BUNDLED_GETOPT=1 |
25 |
+ if test "$enable_bundled_getopt" = "yes"; then |
26 |
+ AC_MSG_RESULT([*** use of bundled getopt library forced]) |
27 |
+ ENABLE_BUNDLED_GETOPT=1 |
28 |
+ else |
29 |
+ AC_MSG_RESULT([*** use of system getopt library forced]) |
30 |
+ fi |
31 |
], |
32 |
[ |
33 |
- AC_CHECK_FUNC(getopt_long, [], |
34 |
+ AC_CHECK_FUNC(getopt_long, |
35 |
+ [ |
36 |
+ AC_MSG_RESULT([*** use of system getopt library autoselected]) |
37 |
+ ], |
38 |
[ |
39 |
+ AC_MSG_RESULT([*** use of bundled getopt library autoselected]) |
40 |
ENABLE_BUNDLED_GETOPT=1 |
41 |
]) |
42 |
]) |
43 |
@@ -72,8 +80,12 @@ |
44 |
AS_HELP_STRING([--enable-bundled-md5], |
45 |
[Enable bundled MD5 library (default: autoselected)]), |
46 |
[ |
47 |
- AC_MSG_RESULT([*** use of bundled MD5 library forced]) |
48 |
- ENABLE_BUNDLED_MD5=1 |
49 |
+ if test "$enable_bundled_md5" = "yes"; then |
50 |
+ AC_MSG_RESULT([*** use of bundled MD5 library forced]) |
51 |
+ ENABLE_BUNDLED_MD5=1 |
52 |
+ else |
53 |
+ AC_MSG_RESULT([*** use of system MD5 library forced]) |
54 |
+ fi |
55 |
], |
56 |
[ |
57 |
AC_CHECK_HEADER("openssl/md5.h", [ |
58 |
@@ -83,11 +95,16 @@ |
59 |
LDFLAGS="-lcrypto $LDFLAGS" |
60 |
AC_CHECK_FUNCS(MD5_Init MD5_Update MD5_Final, |
61 |
[ |
62 |
+ md5_found="yes" |
63 |
], |
64 |
[ |
65 |
ENABLE_BUNDLED_MD5=1 |
66 |
]) |
67 |
- |
68 |
+ if test "$md5_found" = "yes"; then |
69 |
+ AC_MSG_RESULT([*** use of system MD5 library autoselected]) |
70 |
+ else |
71 |
+ AC_MSG_RESULT([*** use of bundled MD5 library autoselected]) |
72 |
+ fi |
73 |
], |
74 |
[ |
75 |
AC_MSG_WARN([crypto library header files were found but not supporting required MD5 functions (will us bundled MD5 function).]) |
76 |
@@ -129,19 +146,19 @@ |
77 |
AC_ARG_ENABLE( |
78 |
[shared], |
79 |
AS_HELP_STRING([--enable-shared], |
80 |
- [Enable shared library build (default: disabled)]), |
81 |
- [ |
82 |
- AC_MSG_RESULT([*** Shared library build enabled]) |
83 |
- SHARED_LIBRARY="yes" |
84 |
- AC_DEFINE(SHARED_LIBRARY, 1, Define if you want ipv6calc binaries compiled with shared library libipv6calc) |
85 |
- LDFLAGS_EXTRA="../lib/libipv6calc.so.$PACKAGE_VERSION ../databases/lib/libipv6calc_db_wrapper.so.$PACKAGE_VERSION $LDFLAGS_EXTRA" |
86 |
- LD_LIBRARY_PATH=../lib:../databases/lib:$LD_LIBRARY_PATH |
87 |
- ], |
88 |
- [ |
89 |
- SHARED_LIBRARY="no" |
90 |
- IPV6CALC_LIB="-L../lib/ -L../databases/lib/ -lipv6calc -lipv6calc_db_wrapper" |
91 |
- ],[ |
92 |
- ]) |
93 |
+ [Enable shared library build (default: disabled)]) |
94 |
+ ) |
95 |
+ |
96 |
+if test "$enable_shared" = "yes"; then |
97 |
+ AC_MSG_RESULT([*** Shared library build enabled]) |
98 |
+ SHARED_LIBRARY="yes" |
99 |
+ AC_DEFINE(SHARED_LIBRARY, 1, Define if you want ipv6calc binaries compiled with shared library libipv6calc) |
100 |
+ LDFLAGS_EXTRA="../lib/libipv6calc.so.$PACKAGE_VERSION ../databases/lib/libipv6calc_db_wrapper.so.$PACKAGE_VERSION $LDFLAGS_EXTRA" |
101 |
+ LD_LIBRARY_PATH=../lib:../databases/lib:$LD_LIBRARY_PATH |
102 |
+else |
103 |
+ SHARED_LIBRARY="no" |
104 |
+ IPV6CALC_LIB="-L../lib/ -L../databases/lib/ -lipv6calc -lipv6calc_db_wrapper" |
105 |
+fi |
106 |
|
107 |
AC_SUBST(SHARED_LIBRARY) |
108 |
AC_SUBST(IPV6CALC_LIB) |
109 |
@@ -153,24 +170,24 @@ |
110 |
AC_CHECK_HEADER(dlfcn.h, |
111 |
[ |
112 |
AC_MSG_RESULT([*** Dynamic loading of libraries is SUPPORTED]) |
113 |
- DYNAMIC_LOAD_SUPPORT="yes" |
114 |
+ DYNAMIC_LOAD_SUPPORT="yes" |
115 |
], |
116 |
- [ |
117 |
- DYNAMIC_LOAD_SUPPORT="no" |
118 |
+ [ |
119 |
+ DYNAMIC_LOAD_SUPPORT="no" |
120 |
AC_MSG_WARN(["Dynamic loading of libraries is not supported, no header file found"]) |
121 |
]) |
122 |
|
123 |
AC_ARG_ENABLE( |
124 |
[dynamic-load], |
125 |
AS_HELP_STRING([--disable-dynamic-load], |
126 |
- [Disable dynamic load of libraries (default: enabled)]), |
127 |
- [ |
128 |
- DYNAMIC_LOAD="no" |
129 |
- ], |
130 |
- [ |
131 |
- DYNAMIC_LOAD="yes" |
132 |
- ],[ |
133 |
- ]) |
134 |
+ [Disable dynamic load of libraries (default: enabled)]) |
135 |
+ ) |
136 |
+ |
137 |
+if test "$enable_dynamic_load" = "yes"; then |
138 |
+ DYNAMIC_LOAD="no" |
139 |
+else |
140 |
+ DYNAMIC_LOAD="yes" |
141 |
+fi |
142 |
|
143 |
if test "$DYNAMIC_LOAD_SUPPORT" = "yes"; then |
144 |
if test "$DYNAMIC_LOAD" = "no"; then |
145 |
@@ -186,7 +203,7 @@ |
146 |
AS_HELP_STRING([--disable-db-ieee], |
147 |
[Disable built-in IEEE database (default: enabled)]), |
148 |
[ |
149 |
- DB_IEEE="$enableval" |
150 |
+ DB_IEEE="$enable_db_ieee" |
151 |
],[ |
152 |
DB_IEEE="yes" |
153 |
]) |
154 |
@@ -203,7 +220,7 @@ |
155 |
AS_HELP_STRING([--disable-db-ipv4], |
156 |
[Disable built-in IPv4 database (default: enabled)]), |
157 |
[ |
158 |
- DB_IPV4="$enableval" |
159 |
+ DB_IPV4="$enable_db_ipv6" |
160 |
],[ |
161 |
DB_IPV4="yes" |
162 |
]) |
163 |
@@ -220,7 +237,7 @@ |
164 |
AS_HELP_STRING([--disable-db-ipv6], |
165 |
[Disable built-in IPv6 database (default: enabled)]), |
166 |
[ |
167 |
- DB_IPV6="$enableval" |
168 |
+ DB_IPV6="$enable_db_ipv6" |
169 |
], |
170 |
[ |
171 |
DB_IPV6="yes" |
172 |
@@ -238,7 +255,7 @@ |
173 |
AS_HELP_STRING([--enable-ip2location], |
174 |
[Enable IP2Location support (default: disabled)]), |
175 |
[ |
176 |
- IP2LOCATION="$enableval" |
177 |
+ IP2LOCATION="$enable_ip2location" |
178 |
],[ |
179 |
IP2LOCATION="no" |
180 |
]) |
181 |
@@ -247,21 +264,21 @@ |
182 |
AS_HELP_STRING([--with-ip2location-headers=DIR], |
183 |
[IP2Location include files location]), |
184 |
[ |
185 |
- IP2LOCATION_INCLUDE="-I$withval" |
186 |
+ IP2LOCATION_INCLUDE="-I$with_ip2location_headers" |
187 |
]) |
188 |
|
189 |
AC_ARG_WITH([ip2location-lib], |
190 |
AS_HELP_STRING([--with-ip2location-lib=FILE], |
191 |
[IP2Location library location]), |
192 |
[ |
193 |
- IP2LOCATION_LIB="-L$withval $IP2LOCATION_LIB" |
194 |
+ IP2LOCATION_LIB="-L$with_ip2location_lib $IP2LOCATION_LIB" |
195 |
]) |
196 |
|
197 |
AC_ARG_WITH([ip2location-static], |
198 |
AS_HELP_STRING([--with-ip2location-static], |
199 |
[Explicitly link IP2Location statically (default=no)]), |
200 |
[ |
201 |
- if test "$withval" != "no"; then |
202 |
+ if test "$with_ip2location_static" != "no"; then |
203 |
IP2LOCATION_LIB="-Wl,-Bstatic $IP2LOCATION_LIB -Wl,-Bdynamic" |
204 |
fi |
205 |
]) |
206 |
@@ -270,8 +287,8 @@ |
207 |
AS_HELP_STRING([--with-ip2location-dynamic], |
208 |
[Enable use of dynamic loading of IP2Location library (default=no)]), |
209 |
[ |
210 |
- if test "$enableval" != "no"; then |
211 |
- IP2LOCATION_DYN="$enableval" |
212 |
+ if test "$enable_ip2location_dynamic" != "no"; then |
213 |
+ IP2LOCATION_DYN="$enable_ip2location_dynamic" |
214 |
fi |
215 |
],[ |
216 |
true |
217 |
@@ -282,7 +299,7 @@ |
218 |
AS_HELP_STRING([--with-ip2location-db=DIR], |
219 |
[Use specified IP2Location database directory, default: /usr/share/IP2Location]), |
220 |
[ |
221 |
- ip2location_db="$withval" |
222 |
+ ip2location_db="$with_ip2location_db" |
223 |
], |
224 |
[ |
225 |
ip2location_db=$ip2location_db_default |
226 |
@@ -292,7 +309,7 @@ |
227 |
AS_HELP_STRING([--with-ip2location-dyn-lib=NAME], |
228 |
[Use specified IP2Location dynamic library, default: libIP2Location.so]), |
229 |
[ |
230 |
- ip2location_dyn_lib="$withval" |
231 |
+ ip2location_dyn_lib="$with_ip2location_dyn_lib" |
232 |
], |
233 |
[ |
234 |
ip2location_dyn_lib=$ip2location_dyn_lib_default |
235 |
@@ -303,7 +320,7 @@ |
236 |
AC_MSG_RESULT([*** IP2Location support requested]) |
237 |
|
238 |
AC_CHECK_HEADER(IP2Location.h,, |
239 |
- [ |
240 |
+ [ |
241 |
AC_MSG_ERROR([IP2Location library header files not found]) |
242 |
]) |
243 |
|
244 |
@@ -319,7 +336,7 @@ |
245 |
AC_MSG_ERROR([IP2Location library header files were found but the library was not found]) |
246 |
]) |
247 |
|
248 |
- IP2LOCATION_LIB="-lIP2Location" |
249 |
+ IP2LOCATION_LIB="-lIP2Location" |
250 |
LDFLAGS="$LDFLAGS $IP2LOCATION_LIB" |
251 |
|
252 |
if test "$IP2LOCATION_STATIC" = "yes"; then |
253 |
@@ -327,13 +344,13 @@ |
254 |
fi |
255 |
|
256 |
AC_CHECK_LIB(IP2Location, IP2Location_open, |
257 |
- [ |
258 |
+ [ |
259 |
AC_DEFINE(SUPPORT_IP2LOCATION, 1, Define if you want IP2Location support.) |
260 |
AC_MSG_RESULT([*** IP2Location support enabled]) |
261 |
- ], |
262 |
- [ |
263 |
+ ], |
264 |
+ [ |
265 |
AC_MSG_ERROR([IP2Location library header files were found but the library was not found]) |
266 |
- ]) |
267 |
+ ]) |
268 |
else |
269 |
# wrapper detects by itself the real support |
270 |
AC_MSG_RESULT([*** IP2Location dyn lib: $ip2location_dyn_lib]) |
271 |
@@ -358,8 +375,8 @@ |
272 |
AS_HELP_STRING([--enable-geoip], |
273 |
[Enable GeoIP support (default: disabled)]), |
274 |
[ |
275 |
- if test "$enableval" != "no"; then |
276 |
- GEOIP="$enableval" |
277 |
+ if test "$enable_geoip" != "no"; then |
278 |
+ GEOIP="$enable_geoip" |
279 |
fi |
280 |
],[ |
281 |
GEOIP="no" |
282 |
@@ -369,22 +386,22 @@ |
283 |
AS_HELP_STRING([--with-geoip-headers=DIR], |
284 |
[GeoIP include files location]), |
285 |
[ |
286 |
- GEOIP_INCLUDE="-I$withval" |
287 |
+ GEOIP_INCLUDE="-I$with_geoip_headers" |
288 |
]) |
289 |
|
290 |
AC_ARG_WITH([geoip-lib], |
291 |
AS_HELP_STRING([--with-geoip-lib=DIR], |
292 |
[GeoIP library location]), |
293 |
[ |
294 |
- GEOIP_LIB="-L$withval $GEOIP_LIB" |
295 |
+ GEOIP_LIB="-L$with_geoip_lib $GEOIP_LIB" |
296 |
]) |
297 |
|
298 |
AC_ARG_WITH([geoip-static], |
299 |
AS_HELP_STRING([--with-geoip-static], |
300 |
[Explicitly link GeoIP statically (default=no)]), |
301 |
[ |
302 |
- if test "$withval" != "no"; then |
303 |
- GEOIP_STATIC="$enableval" |
304 |
+ if test "$with_geoip_static" != "no"; then |
305 |
+ GEOIP_STATIC="$with_geoip_static" |
306 |
GEOIP_LIB="-Wl,-Bstatic $GEOIP_LIB -Wl,-Bdynamic" |
307 |
fi |
308 |
],[ |
309 |
@@ -395,8 +412,8 @@ |
310 |
AS_HELP_STRING([--with-geoip-dynamic], |
311 |
[Enable use of dynamic loading of GeoIP library (default=no)]), |
312 |
[ |
313 |
- if test "$enableval" != "no"; then |
314 |
- GEOIP_DYN="$enableval" |
315 |
+ if test "$with_geoip_dynamic" != "no"; then |
316 |
+ GEOIP_DYN="$with_geoip_dynamic" |
317 |
fi |
318 |
],[ |
319 |
true |
320 |
@@ -406,7 +423,7 @@ |
321 |
AS_HELP_STRING([--with-geoip-db=DIR], |
322 |
[Use specified GeoIP database directory, default: /usr/share/GeoIP]), |
323 |
[ |
324 |
- geoip_db="$withval" |
325 |
+ geoip_db="$with_geoip_db" |
326 |
], |
327 |
[ |
328 |
geoip_db=$geoip_db_default |
329 |
@@ -416,7 +433,7 @@ |
330 |
AS_HELP_STRING([--with-geoip-dyn-lib=NAME], |
331 |
[Use specified GeoIP dynamic library, default: libGeoIP.so.1]), |
332 |
[ |
333 |
- geoip_dyn_lib="$withval" |
334 |
+ geoip_dyn_lib="$with_geoip_dyn_lib" |
335 |
], |
336 |
[ |
337 |
geoip_dyn_lib=$geoip_dyn_lib_default |
338 |
@@ -426,7 +443,7 @@ |
339 |
AS_HELP_STRING([--with-geoip-ipv6-compat], |
340 |
[Use IPv6 interface of GeoIP in compatibility mode (supporting 1.4.5)]), |
341 |
[ |
342 |
- if test "$withval" != "no"; then |
343 |
+ if test "$with_geoip_ipv6_compat" != "no"; then |
344 |
GEOIP_COMPAT="yes", |
345 |
fi |
346 |
],[ |
347 |
@@ -493,7 +510,7 @@ |
348 |
AC_DEFINE(SUPPORT_GEOIP_LIB_VERSION, 1, Define if your GeoIP version supports GeoIP_lib_version.) |
349 |
], |
350 |
[ |
351 |
- AC_MSG_WARN([GeoIP library header files were found but not supporting GeoIP_lib_version (upgrade to newer version for support).]) |
352 |
+ AC_MSG_WARN([GeoIP library header files were found but not supporting GeoIP_lib_version (upgrade to newer version for support).]) |
353 |
]) |
354 |
|
355 |
AC_CHECK_LIB(GeoIP, GeoIP_country_code_by_addr_v6, |
356 |
@@ -545,7 +562,7 @@ |
357 |
dnl ************************************************* |
358 |
if test "$DYNAMIC_LOAD" = "yes"; then |
359 |
if test "$GEOIP_DYN" = "yes" -o "$IP2LOCATION_DYN" = "yes"; then |
360 |
- DYNAMIC_LOAD="yes" |
361 |
+ DYNAMIC_LOAD="yes" |
362 |
AC_MSG_RESULT([*** Dynamic loading of libraries is ENABLED]) |
363 |
DYNLOAD_LIB="-rdynamic -ldl" |
364 |
fi |