1 |
ssuominen 10/07/01 19:19:30 |
2 |
|
3 |
Added: nut-2.4.3-asneeded.patch |
4 |
Log: |
5 |
Fix building with -Wl,--as-needed wrt #318481 by Diego E. Pettenò. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-power/nut/files/nut-2.4.3-asneeded.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/nut/files/nut-2.4.3-asneeded.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/nut/files/nut-2.4.3-asneeded.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: nut-2.4.3-asneeded.patch |
15 |
=================================================================== |
16 |
--- clients/Makefile.am |
17 |
+++ clients/Makefile.am |
18 |
@@ -3,7 +3,7 @@ |
19 |
# by default, link programs in this directory with libcommon.a |
20 |
LDADD = ../common/libcommon.a libupsclient.la $(NETLIBS) |
21 |
if WITH_SSL |
22 |
- LDADD += $(LIBSSL_LDFLAGS) |
23 |
+ LDADD += $(LIBSSL_LIBS) |
24 |
endif |
25 |
|
26 |
# Avoid per-target CFLAGS, because this will prevent re-use of object |
27 |
@@ -38,7 +38,7 @@ |
28 |
upssched_LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS) |
29 |
|
30 |
upsimage_cgi_SOURCES = upsimage.c upsclient.h upsimagearg.h cgilib.c cgilib.h |
31 |
-upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS) |
32 |
+upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LIBS) |
33 |
|
34 |
upsset_cgi_SOURCES = upsset.c upsclient.h cgilib.c cgilib.h |
35 |
upsstats_cgi_SOURCES = upsstats.c upsclient.h status.h upsstats.h \ |
36 |
@@ -48,6 +48,6 @@ |
37 |
libupsclient_la_SOURCES = upsclient.c upsclient.h |
38 |
libupsclient_la_LIBADD = ../common/libparseconf.la |
39 |
if WITH_SSL |
40 |
- libupsclient_la_LIBADD += $(LIBSSL_LDFLAGS) |
41 |
+ libupsclient_la_LIBADD += $(LIBSSL_LIBS) |
42 |
endif |
43 |
libupsclient_la_LDFLAGS = -version-info 1:0:0 |
44 |
--- configure.in |
45 |
+++ configure.in |
46 |
@@ -194,7 +194,7 @@ |
47 |
solaris2.1* ) |
48 |
echo Checking for Solaris 10 / 11 specific configuration for usb drivers |
49 |
AC_SEARCH_LIBS(nanosleep, rt) |
50 |
- LIBUSB_LDFLAGS="-R/usr/sfw/lib ${LIBUSB_LDFLAGS}" |
51 |
+ LIBUSB_LIBS="-R/usr/sfw/lib ${LIBUSB_LIBS}" |
52 |
dnl FIXME: Sun's libusb doesn't support timeout (so blocks notification) |
53 |
dnl and need to call libusb close upon reconnexion |
54 |
AC_DEFINE(SUN_LIBUSB, 1, [Define to 1 for Sun version of the libusb.]) |
55 |
@@ -742,26 +742,26 @@ |
56 |
|
57 |
AC_SUBST(OS_NAME) |
58 |
AC_SUBST(LIBSSL_CFLAGS) |
59 |
-AC_SUBST(LIBSSL_LDFLAGS) |
60 |
+AC_SUBST(LIBSSL_LIBS) |
61 |
AC_SUBST(LIBGD_CFLAGS) |
62 |
-AC_SUBST(LIBGD_LDFLAGS) |
63 |
+AC_SUBST(LIBGD_LIBS) |
64 |
AC_SUBST(LIBNETSNMP_CFLAGS) |
65 |
-AC_SUBST(LIBNETSNMP_LDFLAGS) |
66 |
+AC_SUBST(LIBNETSNMP_LIBS) |
67 |
AC_SUBST(LIBUSB_CFLAGS) |
68 |
-AC_SUBST(LIBUSB_LDFLAGS) |
69 |
+AC_SUBST(LIBUSB_LIBS) |
70 |
AC_SUBST(LIBNEON_CFLAGS) |
71 |
-AC_SUBST(LIBNEON_LDFLAGS) |
72 |
+AC_SUBST(LIBNEON_LIBS) |
73 |
AC_SUBST(LIBPOWERMAN_CFLAGS) |
74 |
-AC_SUBST(LIBPOWERMAN_LDFLAGS) |
75 |
+AC_SUBST(LIBPOWERMAN_LIBS) |
76 |
AC_SUBST(LIBWRAP_CFLAGS) |
77 |
-AC_SUBST(LIBWRAP_LDFLAGS) |
78 |
+AC_SUBST(LIBWRAP_LIBS) |
79 |
AC_SUBST(HAL_USER) |
80 |
AC_SUBST(HAL_DEVICE_MATCH_KEY) |
81 |
AC_SUBST(HAL_FDI_PATH) |
82 |
AC_SUBST(HAL_CALLOUTS_PATH) |
83 |
AC_SUBST(HAVE_GLIB_2_14) |
84 |
AC_SUBST(LIBHAL_CFLAGS) |
85 |
-AC_SUBST(LIBHAL_LDFLAGS) |
86 |
+AC_SUBST(LIBHAL_LIBS) |
87 |
AC_SUBST(DRIVER_BUILD_LIST) |
88 |
AC_SUBST(DRIVER_MAN_LIST) |
89 |
AC_SUBST(DRIVER_INSTALL_TARGET) |
90 |
--- drivers/Makefile.am |
91 |
+++ drivers/Makefile.am |
92 |
@@ -134,7 +134,7 @@ |
93 |
dummy_ups_LDADD = $(LDADD_DRIVERS) ../clients/libupsclient.la |
94 |
if WITH_SSL |
95 |
dummy_ups_CFLAGS += $(LIBSSL_CFLAGS) |
96 |
- dummy_ups_LDADD += $(LIBSSL_LDFLAGS) |
97 |
+ dummy_ups_LDADD += $(LIBSSL_LIBS) |
98 |
endif |
99 |
|
100 |
# Clone drivers |
101 |
@@ -151,23 +151,23 @@ |
102 |
liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c |
103 |
usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ |
104 |
usb-common.c $(USBHID_UPS_SUBDRIVERS) |
105 |
-usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) |
106 |
+usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) |
107 |
|
108 |
tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c |
109 |
-tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm |
110 |
+tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm |
111 |
|
112 |
bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c |
113 |
-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) |
114 |
+bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) |
115 |
|
116 |
megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c usb-common.c |
117 |
megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV |
118 |
-megatec_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) |
119 |
+megatec_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) |
120 |
|
121 |
blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c |
122 |
-blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm |
123 |
+blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm |
124 |
|
125 |
richcomm_usb_SOURCES = richcomm_usb.c usb-common.c |
126 |
-richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) |
127 |
+richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) |
128 |
|
129 |
# HID-over-serial |
130 |
newmge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c |
131 |
@@ -178,30 +178,30 @@ |
132 |
# SNMP |
133 |
snmp_ups_SOURCES = snmp-ups.c apc-mib.c baytech-mib.c compaq-mib.c eaton-mib.c \ |
134 |
ietf-mib.c mge-mib.c netvision-mib.c powerware-mib.c raritan-pdu-mib.c |
135 |
-snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LDFLAGS) |
136 |
+snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LIBS) |
137 |
|
138 |
# HAL |
139 |
hald_addon_usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ |
140 |
$(USBHID_UPS_SUBDRIVERS) |
141 |
-hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) |
142 |
+hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) |
143 |
|
144 |
hald_addon_tripplite_usb_SOURCES = tripplite_usb.c libusb.c |
145 |
-hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) -lm |
146 |
+hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) -lm |
147 |
|
148 |
hald_addon_bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c |
149 |
-hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) |
150 |
+hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) |
151 |
|
152 |
hald_addon_megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c |
153 |
hald_addon_megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV |
154 |
-hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) |
155 |
+hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) |
156 |
|
157 |
# NEON XML/HTTP |
158 |
netxml_ups_SOURCES = netxml-ups.c mge-xml.c |
159 |
-netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LDFLAGS) |
160 |
+netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LIBS) |
161 |
|
162 |
# Powerman |
163 |
powerman_pdu_SOURCES = powerman-pdu.c |
164 |
-powerman_pdu_LDADD = $(LDADD) $(LIBPOWERMAN_LDFLAGS) |
165 |
+powerman_pdu_LDADD = $(LDADD) $(LIBPOWERMAN_LIBS) |
166 |
|
167 |
# ---------------------------------------------------------------------- |
168 |
# List of header files. The purpose of this list is not dependency |
169 |
--- m4/nut_check_libgd.m4 |
170 |
+++ m4/nut_check_libgd.m4 |
171 |
@@ -1,5 +1,5 @@ |
172 |
dnl Check for LIBGD compiler flags. On success, set nut_have_libgd="yes" |
173 |
-dnl and set LIBGD_CFLAGS and LIBGD_LDFLAGS. On failure, set |
174 |
+dnl and set LIBGD_CFLAGS and LIBGD_LIBS. On failure, set |
175 |
dnl nut_have_libgd="no". This macro can be run multiple times, but will |
176 |
dnl do the checking only once. |
177 |
|
178 |
@@ -9,14 +9,14 @@ |
179 |
nut_have_libgd_seen=yes |
180 |
|
181 |
CFLAGS_ORIG="${CFLAGS}" |
182 |
- LDFLAGS_ORIG="${LDFLAGS}" |
183 |
+ LIBS_ORIG="${LIBS}" |
184 |
LIBS_ORIG="${LIBS}" |
185 |
|
186 |
dnl Initial defaults. These are only used if gdlib-config is |
187 |
dnl unusable and the user fails to pass better values in --with |
188 |
dnl arguments |
189 |
CFLAGS="" |
190 |
- LDFLAGS="-L/usr/X11R6/lib" |
191 |
+ LIBS="-L/usr/X11R6/lib" |
192 |
LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11" |
193 |
|
194 |
AC_MSG_CHECKING(for gd version via gdlib-config) |
195 |
@@ -37,7 +37,7 @@ |
196 |
;; |
197 |
*) |
198 |
CFLAGS="`gdlib-config --includes`" |
199 |
- LDFLAGS="`gdlib-config --ldflags`" |
200 |
+ LIBS="`gdlib-config --ldflags`" |
201 |
LIBS="`gdlib-config --libs`" |
202 |
;; |
203 |
esac |
204 |
@@ -51,9 +51,9 @@ |
205 |
|
206 |
AC_MSG_CHECKING(for gd library flags) |
207 |
AC_ARG_WITH(gd-libs, [ |
208 |
- AC_HELP_STRING([--with-gd-libs=LDFLAGS], [linker flags for the gd library]) |
209 |
- ], [LDFLAGS="${withval}" LIBS=""], []) |
210 |
- AC_MSG_RESULT([${LDFLAGS} ${LIBS}]) |
211 |
+ AC_HELP_STRING([--with-gd-libs=LIBS], [linker flags for the gd library]) |
212 |
+ ], [LIBS="${withval}" LIBS=""], []) |
213 |
+ AC_MSG_RESULT([${LIBS} ${LIBS}]) |
214 |
|
215 |
dnl check if gd is usable |
216 |
AC_CHECK_HEADERS(gd.h gdfontmb.h, [nut_have_libgd=yes], [nut_have_libgd=no], [AC_INCLUDES_DEFAULT]) |
217 |
@@ -62,12 +62,12 @@ |
218 |
if test "${nut_have_libgd}" = "yes"; then |
219 |
AC_DEFINE(HAVE_LIBGD, 1, [Define if you have Boutell's libgd installed]) |
220 |
LIBGD_CFLAGS="${CFLAGS}" |
221 |
- LIBGD_LDFLAGS="${LDFLAGS} ${LIBS}" |
222 |
+ LIBGD_LIBS="${LIBS} ${LIBS}" |
223 |
fi |
224 |
|
225 |
dnl put back the original versions |
226 |
CFLAGS="${CFLAGS_ORIG}" |
227 |
- LDFLAGS="${LDFLAGS_ORIG}" |
228 |
+ LIBS="${LIBS_ORIG}" |
229 |
LIBS="${LIBS_ORIG}" |
230 |
fi |
231 |
]) |
232 |
--- m4/nut_check_libhal.m4 |
233 |
+++ m4/nut_check_libhal.m4 |
234 |
@@ -1,5 +1,5 @@ |
235 |
dnl Check for LIBHAL compiler flags. On success, set nut_have_libhal="yes" |
236 |
-dnl and set LIBHAL_CFLAGS and LIBHAL_LDFLAGS. On failure, set |
237 |
+dnl and set LIBHAL_CFLAGS and LIBHAL_LIBS. On failure, set |
238 |
dnl nut_have_libhal="no". This macro can be run multiple times, but will |
239 |
dnl do the checking only once. |
240 |
dnl NUT requires HAL version 0.5.8 at least |
241 |
@@ -10,7 +10,7 @@ |
242 |
nut_have_libhal_seen=yes |
243 |
|
244 |
CFLAGS_ORIG="${CFLAGS}" |
245 |
- LDFLAGS_ORIG="${LDFLAGS}" |
246 |
+ LIBS_ORIG="${LIBS}" |
247 |
|
248 |
AC_MSG_CHECKING(for libhal version via pkg-config (0.5.8 minimum required)) |
249 |
HAL_VERSION=`pkg-config --silence-errors --modversion hal` |
250 |
@@ -31,9 +31,9 @@ |
251 |
|
252 |
dnl also get libs from glib-2.0 to workaround a bug in dbus-glib |
253 |
AC_MSG_CHECKING(for libhal ldflags via pkg-config) |
254 |
- LDFLAGS=`pkg-config --silence-errors --libs hal dbus-glib-1` |
255 |
+ LIBS=`pkg-config --silence-errors --libs hal dbus-glib-1` |
256 |
if test "$?" = "0"; then |
257 |
- AC_MSG_RESULT(${LDFLAGS}) |
258 |
+ AC_MSG_RESULT(${LIBS}) |
259 |
else |
260 |
AC_MSG_RESULT(not found) |
261 |
nut_have_libhal=no |
262 |
@@ -50,7 +50,7 @@ |
263 |
dnl try again using defaults if pkg-config is not available |
264 |
if test "${nut_have_libhal}" = "check"; then |
265 |
CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include" |
266 |
- LDFLAGS="-lhal -ldbus-1 -lpthread" |
267 |
+ LIBS="-lhal -ldbus-1 -lpthread" |
268 |
|
269 |
AC_CHECK_HEADERS(libhal.h, [nut_have_libhal=yes], [nut_have_libhal=no], [AC_INCLUDES_DEFAULT]) |
270 |
AC_CHECK_FUNCS(libhal_device_new_changeset, [], [nut_have_libhal=no]) |
271 |
@@ -58,7 +58,7 @@ |
272 |
|
273 |
if test "${nut_have_libhal}" = "yes"; then |
274 |
LIBHAL_CFLAGS="${CFLAGS}" |
275 |
- LIBHAL_LDFLAGS="${LDFLAGS}" |
276 |
+ LIBHAL_LIBS="${LIBS}" |
277 |
|
278 |
dnl this will only work as of HAL 0.5.9 |
279 |
AC_MSG_CHECKING(for libhal user via pkg-config) |
280 |
@@ -124,7 +124,7 @@ |
281 |
fi |
282 |
|
283 |
CFLAGS="${CFLAGS_ORIG}" |
284 |
- LDFLAGS="${LDFLAGS_ORIG}" |
285 |
+ LIBS="${LIBS_ORIG}" |
286 |
|
287 |
dnl - test for g_timeout_add_seconds availability |
288 |
AC_MSG_CHECKING([if GLib is version 2.14.0 or newer]) |
289 |
--- m4/nut_check_libneon.m4 |
290 |
+++ m4/nut_check_libneon.m4 |
291 |
@@ -1,5 +1,5 @@ |
292 |
dnl Check for LIBNEON compiler flags. On success, set nut_have_neon="yes" |
293 |
-dnl and set LIBNEON_CFLAGS and LIBNEON_LDFLAGS. On failure, set |
294 |
+dnl and set LIBNEON_CFLAGS and LIBNEON_LIBS. On failure, set |
295 |
dnl nut_have_neon="no". This macro can be run multiple times, but will |
296 |
dnl do the checking only once. |
297 |
|
298 |
@@ -8,9 +8,9 @@ |
299 |
if test -z "${nut_have_neon_seen}"; then |
300 |
nut_have_neon_seen=yes |
301 |
|
302 |
- dnl save CFLAGS and LDFLAGS |
303 |
+ dnl save CFLAGS and LIBS |
304 |
CFLAGS_ORIG="${CFLAGS}" |
305 |
- LDFLAGS_ORIG="${LDFLAGS}" |
306 |
+ LIBS_ORIG="${LIBS}" |
307 |
|
308 |
dnl See which version of the neon library (if any) is installed |
309 |
AC_MSG_CHECKING(for libneon version via pkg-config (0.25.0 minimum required)) |
310 |
@@ -29,9 +29,9 @@ |
311 |
|
312 |
AC_MSG_CHECKING(for libneon ldflags) |
313 |
AC_ARG_WITH(neon-libs, [ |
314 |
- AC_HELP_STRING([--with-neon-libs=LDFLAGS], [linker flags for the neon library]) |
315 |
- ], [LDFLAGS="${withval}"], [LDFLAGS="`pkg-config --silence-errors --libs neon`"]) |
316 |
- AC_MSG_RESULT([${LDFLAGS}]) |
317 |
+ AC_HELP_STRING([--with-neon-libs=LIBS], [linker flags for the neon library]) |
318 |
+ ], [LIBS="${withval}"], [LIBS="`pkg-config --silence-errors --libs neon`"]) |
319 |
+ AC_MSG_RESULT([${LIBS}]) |
320 |
|
321 |
dnl check if neon is usable |
322 |
AC_CHECK_HEADERS(ne_xmlreq.h, [nut_have_neon=yes], [nut_have_neon=no], [AC_INCLUDES_DEFAULT]) |
323 |
@@ -41,11 +41,11 @@ |
324 |
dnl Check for connect timeout support in library (optional) |
325 |
AC_CHECK_FUNCS(ne_set_connect_timeout ne_sock_connect_timeout) |
326 |
LIBNEON_CFLAGS="${CFLAGS}" |
327 |
- LIBNEON_LDFLAGS="${LDFLAGS}" |
328 |
+ LIBNEON_LIBS="${LIBS}" |
329 |
fi |
330 |
|
331 |
- dnl restore original CFLAGS and LDFLAGS |
332 |
+ dnl restore original CFLAGS and LIBS |
333 |
CFLAGS="${CFLAGS_ORIG}" |
334 |
- LDFLAGS="${LDFLAGS_ORIG}" |
335 |
+ LIBS="${LIBS_ORIG}" |
336 |
fi |
337 |
]) |
338 |
--- m4/nut_check_libnetsnmp.m4 |
339 |
+++ m4/nut_check_libnetsnmp.m4 |
340 |
@@ -1,6 +1,6 @@ |
341 |
dnl Check for LIBNETSNMP compiler flags. On success, set |
342 |
dnl nut_have_libnetsnmp="yes" and set LIBNETSNMP_CFLAGS and |
343 |
-dnl LIBNETSNMP_LDFLAGS. On failure, set nut_have_libnetsnmp="no". |
344 |
+dnl LIBNETSNMP_LIBS. On failure, set nut_have_libnetsnmp="no". |
345 |
dnl This macro can be run multiple times, but will do the checking only |
346 |
dnl once. |
347 |
|
348 |
@@ -9,9 +9,9 @@ |
349 |
if test -z "${nut_have_libnetsnmp_seen}"; then |
350 |
nut_have_libnetsnmp_seen=yes |
351 |
|
352 |
- dnl save CFLAGS and LDFLAGS |
353 |
+ dnl save CFLAGS and LIBS |
354 |
CFLAGS_ORIG="${CFLAGS}" |
355 |
- LDFLAGS_ORIG="${LDFLAGS}" |
356 |
+ LIBS_ORIG="${LIBS}" |
357 |
|
358 |
dnl See which version of the Net-SNMP library (if any) is installed |
359 |
AC_MSG_CHECKING(for Net-SNMP version via net-snmp-config) |
360 |
@@ -30,9 +30,9 @@ |
361 |
|
362 |
AC_MSG_CHECKING(for Net-SNMP libs) |
363 |
AC_ARG_WITH(snmp-libs, [ |
364 |
- AC_HELP_STRING([--with-snmp-libs=LDFLAGS], [linker flags for the Net-SNMP library]) |
365 |
- ], [LDFLAGS="${withval}"], [LDFLAGS="`net-snmp-config --libs 2>/dev/null`"]) |
366 |
- AC_MSG_RESULT([${LDFLAGS}]) |
367 |
+ AC_HELP_STRING([--with-snmp-libs=LIBS], [linker flags for the Net-SNMP library]) |
368 |
+ ], [LIBS="${withval}"], [LIBS="`net-snmp-config --libs 2>/dev/null`"]) |
369 |
+ AC_MSG_RESULT([${LIBS}]) |
370 |
|
371 |
dnl Check if the Net-SNMP library is usable |
372 |
AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [nut_have_libnetsnmp=yes], [nut_have_libnetsnmp=no], [AC_INCLUDES_DEFAULT]) |
373 |
@@ -40,11 +40,11 @@ |
374 |
|
375 |
if test "${nut_have_libnetsnmp}" = "yes"; then |
376 |
LIBNETSNMP_CFLAGS="${CFLAGS}" |
377 |
- LIBNETSNMP_LDFLAGS="${LDFLAGS}" |
378 |
+ LIBNETSNMP_LIBS="${LIBS}" |
379 |
fi |
380 |
|
381 |
- dnl restore original CFLAGS and LDFLAGS |
382 |
+ dnl restore original CFLAGS and LIBS |
383 |
CFLAGS="${CFLAGS_ORIG}" |
384 |
- LDFLAGS="${LDFLAGS_ORIG}" |
385 |
+ LIBS="${LIBS_ORIG}" |
386 |
fi |
387 |
]) |
388 |
--- m4/nut_check_libpowerman.m4 |
389 |
+++ m4/nut_check_libpowerman.m4 |
390 |
@@ -1,5 +1,5 @@ |
391 |
dnl Check for LIBPOWERMAN compiler flags. On success, set nut_have_libpowerman="yes" |
392 |
-dnl and set LIBPOWERMAN_CFLAGS and LIBPOWERMAN_LDFLAGS. On failure, set |
393 |
+dnl and set LIBPOWERMAN_CFLAGS and LIBPOWERMAN_LIBS. On failure, set |
394 |
dnl nut_have_libpowerman="no". This macro can be run multiple times, but will |
395 |
dnl do the checking only once. |
396 |
|
397 |
@@ -8,9 +8,9 @@ |
398 |
if test -z "${nut_have_libpowerman_seen}"; then |
399 |
nut_have_libpowerman_seen=yes |
400 |
|
401 |
- dnl save CFLAGS and LDFLAGS |
402 |
+ dnl save CFLAGS and LIBS |
403 |
CFLAGS_ORIG="${CFLAGS}" |
404 |
- LDFLAGS_ORIG="${LDFLAGS}" |
405 |
+ LIBS_ORIG="${LIBS}" |
406 |
|
407 |
AC_MSG_CHECKING(for libpowerman cflags) |
408 |
AC_ARG_WITH(powerman-includes, [ |
409 |
@@ -20,9 +20,9 @@ |
410 |
|
411 |
AC_MSG_CHECKING(for libpowerman libs) |
412 |
AC_ARG_WITH(powerman-libs, [ |
413 |
- AC_HELP_STRING([--with-powerman-libs=LDFLAGS], [linker flags for the libpowerman library]) |
414 |
- ], [LDFLAGS="${withval}"], [LDFLAGS="`pkg-config --silence-errors --libs libpowerman`"]) |
415 |
- AC_MSG_RESULT([${LDFLAGS}]) |
416 |
+ AC_HELP_STRING([--with-powerman-libs=LIBS], [linker flags for the libpowerman library]) |
417 |
+ ], [LIBS="${withval}"], [LIBS="`pkg-config --silence-errors --libs libpowerman`"]) |
418 |
+ AC_MSG_RESULT([${LIBS}]) |
419 |
|
420 |
dnl check if libpowerman is usable |
421 |
AC_CHECK_HEADERS(libpowerman.h, [nut_have_libpowerman=yes], [nut_have_libpowerman=no], [AC_INCLUDES_DEFAULT]) |
422 |
@@ -30,12 +30,12 @@ |
423 |
|
424 |
if test "${nut_have_libpowerman}" = "yes"; then |
425 |
LIBPOWERMAN_CFLAGS="${CFLAGS}" |
426 |
- LIBPOWERMAN_LDFLAGS="${LDFLAGS}" |
427 |
+ LIBPOWERMAN_LIBS="${LIBS}" |
428 |
fi |
429 |
|
430 |
- dnl restore original CFLAGS and LDFLAGS |
431 |
+ dnl restore original CFLAGS and LIBS |
432 |
CFLAGS="${CFLAGS_ORIG}" |
433 |
- LDFLAGS="${LDFLAGS_ORIG}" |
434 |
+ LIBS="${LIBS_ORIG}" |
435 |
|
436 |
fi |
437 |
]) |
438 |
--- m4/nut_check_libssl.m4 |
439 |
+++ m4/nut_check_libssl.m4 |
440 |
@@ -1,5 +1,5 @@ |
441 |
dnl Check for LIBSSL compiler flags. On success, set nut_have_libssl="yes" |
442 |
-dnl and set LIBSSL_CFLAGS and LIBSSL_LDFLAGS. On failure, set |
443 |
+dnl and set LIBSSL_CFLAGS and LIBSSL_LIBS. On failure, set |
444 |
dnl nut_have_libssl="no". This macro can be run multiple times, but will |
445 |
dnl do the checking only once. |
446 |
|
447 |
@@ -8,20 +8,20 @@ |
448 |
if test -z "${nut_have_libssl_seen}"; then |
449 |
nut_have_libssl_seen=yes |
450 |
|
451 |
- dnl save CFLAGS and LDFLAGS |
452 |
+ dnl save CFLAGS and LIBS |
453 |
CFLAGS_ORIG="${CFLAGS}" |
454 |
- LDFLAGS_ORIG="${LDFLAGS}" |
455 |
+ LIBS_ORIG="${LIBS}" |
456 |
|
457 |
AC_MSG_CHECKING(for openssl version via pkg-config) |
458 |
OPENSSL_VERSION=`pkg-config --silence-errors --modversion openssl` |
459 |
if test "$?" = "0"; then |
460 |
AC_MSG_RESULT(${OPENSSL_VERSION} found) |
461 |
CFLAGS="`pkg-config --silence-errors --cflags openssl`" |
462 |
- LDFLAGS="`pkg-config --silence-errors --libs openssl`" |
463 |
+ LIBS="`pkg-config --silence-errors --libs openssl`" |
464 |
else |
465 |
AC_MSG_RESULT(not found) |
466 |
CFLAGS="" |
467 |
- LDFLAGS="-lssl -lcrypto" |
468 |
+ LIBS="-lssl -lcrypto" |
469 |
fi |
470 |
|
471 |
dnl allow overriding openssl settings if the user knows best |
472 |
@@ -33,9 +33,9 @@ |
473 |
|
474 |
AC_MSG_CHECKING(for openssl ldflags) |
475 |
AC_ARG_WITH(ssl-libs, [ |
476 |
- AC_HELP_STRING([--with-ssl-libs=LDFLAGS], [linker flags for the OpenSSL library]) |
477 |
- ], [LDFLAGS="${withval}"], []) |
478 |
- AC_MSG_RESULT([${LDFLAGS}]) |
479 |
+ AC_HELP_STRING([--with-ssl-libs=LIBS], [linker flags for the OpenSSL library]) |
480 |
+ ], [LIBS="${withval}"], []) |
481 |
+ AC_MSG_RESULT([${LIBS}]) |
482 |
|
483 |
dnl check if openssl is usable |
484 |
AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_libssl=yes], [nut_have_libssl=no], [AC_INCLUDES_DEFAULT]) |
485 |
@@ -44,11 +44,11 @@ |
486 |
if test "${nut_have_libssl}" = "yes"; then |
487 |
AC_DEFINE(HAVE_SSL, 1, [Define to enable SSL development code]) |
488 |
LIBSSL_CFLAGS="${CFLAGS}" |
489 |
- LIBSSL_LDFLAGS="${LDFLAGS}" |
490 |
+ LIBSSL_LIBS="${LIBS}" |
491 |
fi |
492 |
|
493 |
- dnl restore original CFLAGS and LDFLAGS |
494 |
+ dnl restore original CFLAGS and LIBS |
495 |
CFLAGS="${CFLAGS_ORIG}" |
496 |
- LDFLAGS="${LDFLAGS_ORIG}" |
497 |
+ LIBS="${LIBS_ORIG}" |
498 |
fi |
499 |
]) |
500 |
--- m4/nut_check_libusb.m4 |
501 |
+++ m4/nut_check_libusb.m4 |
502 |
@@ -1,5 +1,5 @@ |
503 |
dnl Check for LIBUSB compiler flags. On success, set nut_have_libusb="yes" |
504 |
-dnl and set LIBUSB_CFLAGS and LIBUSB_LDFLAGS. On failure, set |
505 |
+dnl and set LIBUSB_CFLAGS and LIBUSB_LIBS. On failure, set |
506 |
dnl nut_have_libusb="no". This macro can be run multiple times, but will |
507 |
dnl do the checking only once. |
508 |
|
509 |
@@ -8,27 +8,27 @@ |
510 |
if test -z "${nut_have_libusb_seen}"; then |
511 |
nut_have_libusb_seen=yes |
512 |
|
513 |
- dnl save CFLAGS and LDFLAGS |
514 |
+ dnl save CFLAGS and LIBS |
515 |
CFLAGS_ORIG="${CFLAGS}" |
516 |
- LDFLAGS_ORIG="${LDFLAGS}" |
517 |
+ LIBS_ORIG="${LIBS}" |
518 |
|
519 |
AC_MSG_CHECKING(for libusb version via pkg-config) |
520 |
LIBUSB_VERSION=`pkg-config --silence-errors --modversion libusb` |
521 |
if test "$?" = "0"; then |
522 |
AC_MSG_RESULT(${LIBUSB_VERSION} found) |
523 |
CFLAGS="`pkg-config --silence-errors --cflags libusb`" |
524 |
- LDFLAGS="`pkg-config --silence-errors --libs libusb`" |
525 |
+ LIBS="`pkg-config --silence-errors --libs libusb`" |
526 |
else |
527 |
AC_MSG_CHECKING(via libusb-config) |
528 |
LIBUSB_VERSION=`libusb-config --version 2>/dev/null` |
529 |
if test "$?" = "0"; then |
530 |
AC_MSG_RESULT(${LIBUSB_VERSION} found) |
531 |
CFLAGS="`libusb-config --cflags 2>/dev/null`" |
532 |
- LDFLAGS="`libusb-config --libs 2>/dev/null`" |
533 |
+ LIBS="`libusb-config --libs 2>/dev/null`" |
534 |
else |
535 |
AC_MSG_RESULT(not found) |
536 |
CFLAGS="" |
537 |
- LDFLAGS="-lusb" |
538 |
+ LIBS="-lusb" |
539 |
fi |
540 |
fi |
541 |
|
542 |
@@ -40,9 +40,9 @@ |
543 |
|
544 |
AC_MSG_CHECKING(for libusb ldflags) |
545 |
AC_ARG_WITH(usb-libs, [ |
546 |
- AC_HELP_STRING([--with-usb-libs=LDFLAGS], [linker flags for the libusb library]) |
547 |
- ], [LDFLAGS="${withval}"], []) |
548 |
- AC_MSG_RESULT([${LDFLAGS}]) |
549 |
+ AC_HELP_STRING([--with-usb-libs=LIBS], [linker flags for the libusb library]) |
550 |
+ ], [LIBS="${withval}"], []) |
551 |
+ AC_MSG_RESULT([${LIBS}]) |
552 |
|
553 |
dnl check if libusb is usable |
554 |
AC_CHECK_HEADERS(usb.h, [nut_have_libusb=yes], [nut_have_libusb=no], [AC_INCLUDES_DEFAULT]) |
555 |
@@ -52,11 +52,11 @@ |
556 |
dnl Check for libusb "force driver unbind" availability |
557 |
AC_CHECK_FUNCS(usb_detach_kernel_driver_np) |
558 |
LIBUSB_CFLAGS="${CFLAGS}" |
559 |
- LIBUSB_LDFLAGS="${LDFLAGS}" |
560 |
+ LIBUSB_LIBS="${LIBS}" |
561 |
fi |
562 |
|
563 |
- dnl restore original CFLAGS and LDFLAGS |
564 |
+ dnl restore original CFLAGS and LIBS |
565 |
CFLAGS="${CFLAGS_ORIG}" |
566 |
- LDFLAGS="${LDFLAGS_ORIG}" |
567 |
+ LIBS="${LIBS_ORIG}" |
568 |
fi |
569 |
]) |
570 |
--- m4/nut_check_libwrap.m4 |
571 |
+++ m4/nut_check_libwrap.m4 |
572 |
@@ -1,5 +1,5 @@ |
573 |
dnl Check for LIBWRAP compiler flags. On success, set nut_have_libwrap="yes" |
574 |
-dnl and set LIBWRAP_CFLAGS and LIBWRAP_LDFLAGS. On failure, set |
575 |
+dnl and set LIBWRAP_CFLAGS and LIBWRAP_LIBS. On failure, set |
576 |
dnl nut_have_libwrap="no". This macro can be run multiple times, but will |
577 |
dnl do the checking only once. |
578 |
|
579 |
@@ -39,7 +39,7 @@ |
580 |
if test "${nut_have_libwrap}" = "yes"; then |
581 |
AC_DEFINE(HAVE_WRAP, 1, [Define to enable libwrap support]) |
582 |
LIBWRAP_CFLAGS="" |
583 |
- LIBWRAP_LDFLAGS="${LIBS}" |
584 |
+ LIBWRAP_LIBS="${LIBS}" |
585 |
fi |
586 |
|
587 |
dnl restore original LIBS |
588 |
--- server/Makefile.am |
589 |
+++ server/Makefile.am |
590 |
@@ -12,10 +12,10 @@ |
591 |
endif |
592 |
LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS) |
593 |
if WITH_WRAP |
594 |
- LDADD += $(LIBWRAP_LDFLAGS) |
595 |
+ LDADD += $(LIBWRAP_LIBS) |
596 |
endif |
597 |
if WITH_SSL |
598 |
- LDADD += $(LIBSSL_LDFLAGS) |
599 |
+ LDADD += $(LIBSSL_LIBS) |
600 |
endif |
601 |
|
602 |
sbin_PROGRAMS = upsd |