Attachment #162115 for bug #231772

View | Details | Raw Unified | Return to bug 231772
Collapse All | Expand All




++ b/configure.in 


NUT_CHECK_LIBNETSNMP
NUT_CHECK_LIBUSB
NUT_CHECK_LIBHAL
NUT_CHECK_LIBNEON

dnl ----------------------------------------------------------------------

dnl ${nut_with_ssl}: any value except "yes" or "no" is treated as "auto". 
if test "${nut_with_ssl}" != "no"; then
   dnl check for libssl compiler flags

   if test -z "${nut_have_libssl_seen}"; then
      nut_have_libssl_seen=yes
      
      PKG_CHECK_MODULES(SSL, [libssl],
         nut_have_libssl=yes,
	 nut_have_libssl=no)
   fi

   if test "${nut_with_ssl}" = "yes" -a "${nut_have_libssl}" != "yes"; then
      AC_MSG_ERROR(["OpenSSL not found, required for SSL support"])
   fi

   nut_with_ssl="${nut_have_libssl}"

   if test "${nut_with_ssl}" = "yes"; then
      AC_DEFINE(HAVE_SSL, 1, [Define to enable SSL development code])
   fi
fi

AM_CONDITIONAL(WITH_SSL, test "${nut_with_ssl}" = "yes")
AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS)


NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}])



dnl ----------------------------------------------------------------------
dnl checks related to --with-hal
NUT_CHECK_LIBHAL

dnl ${nut_with_hal}: any value except "yes" or "no" is treated as "auto". 
if test "${nut_with_hal}" = "yes" -a "${nut_have_libhal}" != "yes"; then

fi

AM_CONDITIONAL(WITH_HAL, test "${nut_with_hal}" = "yes")
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
AC_SUBST(HAL_USER)
AC_SUBST(HAL_FDI_PATH)
AC_SUBST(HAL_CALLOUTS_PATH)

NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}])

dnl ----------------------------------------------------------------------

AC_DEFINE_UNQUOTED(DATADIR, "${conftemp}",
			[Default path for data files])

AC_SUBST(LIBSSL_CFLAGS)
AC_SUBST(LIBSSL_LDFLAGS)
AC_SUBST(LIBGD_CFLAGS)
AC_SUBST(LIBGD_LDFLAGS)
AC_SUBST(LIBNETSNMP_CFLAGS)

AC_SUBST(LIBUSB_LDFLAGS)
AC_SUBST(LIBNEON_CFLAGS)
AC_SUBST(LIBNEON_LDFLAGS)
AC_SUBST(HAL_USER)
AC_SUBST(HAL_FDI_PATH)
AC_SUBST(HAL_CALLOUTS_PATH)
AC_SUBST(LIBHAL_CFLAGS)
AC_SUBST(LIBHAL_LDFLAGS)
AC_SUBST(DRIVER_BUILD_LIST)
AC_SUBST(DRIVER_MAN_LIST)
AC_SUBST(DRIVER_INSTALL_TARGET)
++ b/server/Makefile.am 

# but only add them if we really use the target.
AM_CFLAGS = -I$(top_srcdir)/include
if WITH_SSL
  AM_CFLAGS += $(SSL_CFLAGS)
endif
LDADD = ../common/libcommon.a ../common/state.o ../common/upsconf.o	\
 ../common/parseconf.o $(NETLIBS)
if WITH_SSL
   LDADD += $(SSL_LIBS)
endif

sbin_PROGRAMS = upsd
++ b/m4/nut_check_libssl.m4 

dnl Check for LIBSSL compiler flags. On success, set nut_have_libssl="yes"
dnl and set LIBSSL_CFLAGS and LIBSSL_LIBS. On failure, set
dnl nut_have_libssl="no". This macro can be run multiple times, but will
dnl do the checking only once. 



   AC_MSG_CHECKING(for SSL library availability)

   PKG_CHECK_MODULES(LIBSSL, [libssl],
       nut_have_libssl=yes, 
       nut_have_libssl=no)
   AC_SUBST(LIBSSL_CFLAGS)
   AC_SUBST(LIBSSL_LIBS)
   LDFLAGS="-lssl -lcrypto"

   AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init()], 
	       nut_have_libssl=yes, 
	       nut_have_libssl=no)

   if test "${nut_have_libssl}" != "yes"; then
      CFLAGS="-I/usr/kerberos/include"
      LDFLAGS="-lssl -lcrypto"

      AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init], 
                   nut_have_libssl=yes, 
		   nut_have_libssl=no)
   fi

   if test "${nut_have_libssl}" != "yes"; then
      CFLAGS="-I/usr/local/ssl/include"
      LDFLAGS="-L/usr/local/ssl/lib -lssl -lcrypto"

      AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init], 
                  nut_have_libssl=yes, 
		  nut_have_libssl=no)
   fi

   if test "${nut_have_libssl}" != "yes"; then
      CFLAGS="-I/usr/local/ssl/include -I/usr/kerberos/include"
      LDFLAGS="-L/usr/local/ssl/lib -lssl -lcrypto"

      AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init], 
                   nut_have_libssl=yes, 
		   nut_have_libssl=no)
   fi

   if test "${nut_have_libssl}" = "yes"; then
	LIBSSL_CFLAGS="${CFLAGS}"
	LIBSSL_LDFLAGS="${LDFLAGS}"
   fi

   dnl restore original CFLAGS and LDFLAGS
   CFLAGS="${CFLAGS_ORIG}"
   LDFLAGS="${LDFLAGS_ORIG}"

   AC_MSG_RESULT([${nut_have_libssl}])

fi
])

++ b/m4/nut_check_libhal.m4 

dnl Check for HAL compiler flags. On success, set nut_have_libhal="yes"
dnl and set HAL_CFLAGS and HAL_LIBS. On failure, set
dnl nut_have_libhal="no". This macro can be run multiple times, but will
dnl do the checking only once. 
dnl NUT requires HAL version 0.5.8 at least


   CFLAGS_ORIG="${CFLAGS}"
   CPPFLAGS_ORIG="${CPPFLAGS}"
   LIBS_ORIG="${LIBS}"

   nut_have_libhal=yes
   AC_MSG_CHECKING(for libhal version via pkg-config (0.5.8 minimum required))


   dnl also get libs from glib-2.0 to workaround a bug in dbus-glib
   AC_MSG_CHECKING(for libhal ldflags via pkg-config)
   LIBS=`pkg-config --silence-errors --libs hal dbus-glib-1`
   if (test "$?" != "0")
   then
	   AC_MSG_RESULT(not found)
	   nut_have_libhal=no
   else
	   AC_MSG_RESULT(${LIBS})
   fi

   dnl this will only work as of HAL 0.5.9


      CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
      CPPFLAGS="${CFLAGS}"
      LIBS="-lhal -ldbus-1 -lpthread"
      
      AC_CHECK_HEADER(libhal.h, , [nut_have_libhal=no])
      AC_CHECK_LIB(hal, libhal_device_new_changeset, [nut_have_libhal=yes], 
      [nut_have_libhal=no], 
      ${LIBS})
   fi

   if test "${nut_have_libhal}" = "yes"; then
        HAL_CFLAGS="${CFLAGS}"
        HAL_LIBS="${LIBS}"
   fi

   CFLAGS="${CFLAGS_ORIG}"
   CPPFLAGS="${CPPFLAGS_ORIG}"
   LIBS="${LIBS_ORIG}"

fi
])
++ b/drivers/Makefile.am 

# but only add them if we really use the target.
AM_CFLAGS = -I$(top_srcdir)/include
if WITH_HAL
  AM_CFLAGS += $(HAL_CFLAGS)
endif
if WITH_USB
if HAVE_LIBUSB

  AM_CFLAGS += $(LIBNETSNMP_CFLAGS)
endif
if WITH_SNMP
  AM_CFLAGS += $(SSL_CFLAGS)
endif
if WITH_NEONXML
  AM_CFLAGS += $(LIBNEON_CFLAGS)

 $(USBHID_UPS_SUBDRIVERS)
usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)
if WITH_SSL
  usbhid_ups_LDADD += $(SSL_LIBS)
endif

energizerups_SOURCES = energizerups.c

# HAL
hald_addon_usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c	\
 $(USBHID_UPS_SUBDRIVERS)
hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS) $(SSL_LIBS)

hald_addon_tripplite_usb_SOURCES = tripplite_usb.c libusb.c
hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS) -lm

hald_addon_bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c
hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS)

hald_addon_megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c
hald_addon_megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV
hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS)

# NEON XML/HTTP
netxml_ups_SOURCES = netxml-ups.c mge-xml.c
++ b/clients/Makefile.am 

# by default, link programs in this directory with libcommon.a
LDADD = ../common/libcommon.a libupsclient.la $(NETLIBS)
if WITH_SSL
  LDADD += $(SSL_LIBS)
endif

# Avoid per-target CFLAGS, because this will prevent re-use of object

# but only add them if we really use the target.
AM_CFLAGS = -I$(top_srcdir)/include
if WITH_SSL
  AM_CFLAGS += $(SSL_CFLAGS)
endif
if WITH_CGI
  AM_CFLAGS += $(LIBGD_CFLAGS)

# not LDADD.
libupsclient_la_SOURCES = upsclient.c upsclient.h
libupsclient_la_LIBADD = ../common/parseconf.lo
if WITH_SSL
  libupsclient_la_LIBADD += $(SSL_LIBS)
endif
libupsclient_la_LDFLAGS = -version-info 1:0:0 -export-dynamic

# rules for cross-directory targets
../common/libcommon.a: FORCE

Return to bug 231772

Line Link Here

(-)file_not_specified_in_diff (-98 / +65 lines)
0	-- nut/configure.in	0	++ b/configure.in
Lines 194-200 Link Here
194		194
195	NUT_CHECK_LIBNETSNMP	195	NUT_CHECK_LIBNETSNMP
196	NUT_CHECK_LIBUSB	196	NUT_CHECK_LIBUSB
197	NUT_CHECK_LIBHAL
198	NUT_CHECK_LIBNEON	197	NUT_CHECK_LIBNEON
199		198
200	dnl ----------------------------------------------------------------------	199	dnl ----------------------------------------------------------------------
Lines 238-259 Link Here
238	dnl ${nut_with_ssl}: any value except "yes" or "no" is treated as "auto".	237	dnl ${nut_with_ssl}: any value except "yes" or "no" is treated as "auto".
239	if test "${nut_with_ssl}" != "no"; then	238	if test "${nut_with_ssl}" != "no"; then
240	dnl check for libssl compiler flags	239	dnl check for libssl compiler flags
241	NUT_CHECK_LIBSSL	240
242	fi	241	if test -z "${nut_have_libssl_seen}"; then
243		242	nut_have_libssl_seen=yes
244	if test "${nut_with_ssl}" = "yes" -a "${nut_have_libssl}" != "yes"; then	243
245	AC_MSG_ERROR(["OpenSSL not found, required for SSL support"])	244	PKG_CHECK_MODULES(SSL, [libssl],
246	fi	245	nut_have_libssl=yes,
247		246	nut_have_libssl=no)
248	if test "${nut_with_ssl}" != "no"; then	247	fi
		248
		249	if test "${nut_with_ssl}" = "yes" -a "${nut_have_libssl}" != "yes"; then
		250	AC_MSG_ERROR(["OpenSSL not found, required for SSL support"])
		251	fi
		252
249	nut_with_ssl="${nut_have_libssl}"	253	nut_with_ssl="${nut_have_libssl}"
250	fi	254
251		255	if test "${nut_with_ssl}" = "yes"; then
252	if test "${nut_with_ssl}" = "yes"; then	256	AC_DEFINE(HAVE_SSL, 1, [Define to enable SSL development code])
253	AC_DEFINE(HAVE_SSL, 1, [Define to enable SSL development code])	257	fi
254	fi	258	fi
255
256	AM_CONDITIONAL(WITH_SSL, test "${nut_with_ssl}" = "yes")	259	AM_CONDITIONAL(WITH_SSL, test "${nut_with_ssl}" = "yes")
		260	AC_SUBST(SSL_CFLAGS)
		261	AC_SUBST(SSL_LIBS)
		262
257		263
258	NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}])	264	NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}])
259		265
Lines 383-388 Link Here
383		389
384	dnl ----------------------------------------------------------------------	390	dnl ----------------------------------------------------------------------
385	dnl checks related to --with-hal	391	dnl checks related to --with-hal
		392	NUT_CHECK_LIBHAL
386		393
387	dnl ${nut_with_hal}: any value except "yes" or "no" is treated as "auto".	394	dnl ${nut_with_hal}: any value except "yes" or "no" is treated as "auto".
388	if test "${nut_with_hal}" = "yes" -a "${nut_have_libhal}" != "yes"; then	395	if test "${nut_with_hal}" = "yes" -a "${nut_have_libhal}" != "yes"; then
Lines 402-407 Link Here
402	fi	409	fi
403		410
404	AM_CONDITIONAL(WITH_HAL, test "${nut_with_hal}" = "yes")	411	AM_CONDITIONAL(WITH_HAL, test "${nut_with_hal}" = "yes")
		412	AC_SUBST(HAL_CFLAGS)
		413	AC_SUBST(HAL_LIBS)
		414	AC_SUBST(HAL_USER)
		415	AC_SUBST(HAL_FDI_PATH)
		416	AC_SUBST(HAL_CALLOUTS_PATH)
		417
405	NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}])	418	NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}])
406		419
407	dnl ----------------------------------------------------------------------	420	dnl ----------------------------------------------------------------------
Lines 764-771 Link Here
764	AC_DEFINE_UNQUOTED(DATADIR, "${conftemp}",	777	AC_DEFINE_UNQUOTED(DATADIR, "${conftemp}",
765	[Default path for data files])	778	[Default path for data files])
766		779
767	AC_SUBST(LIBSSL_CFLAGS)
768	AC_SUBST(LIBSSL_LDFLAGS)
769	AC_SUBST(LIBGD_CFLAGS)	780	AC_SUBST(LIBGD_CFLAGS)
770	AC_SUBST(LIBGD_LDFLAGS)	781	AC_SUBST(LIBGD_LDFLAGS)
771	AC_SUBST(LIBNETSNMP_CFLAGS)	782	AC_SUBST(LIBNETSNMP_CFLAGS)
Lines 774-784 Link Here
774	AC_SUBST(LIBUSB_LDFLAGS)	785	AC_SUBST(LIBUSB_LDFLAGS)
775	AC_SUBST(LIBNEON_CFLAGS)	786	AC_SUBST(LIBNEON_CFLAGS)
776	AC_SUBST(LIBNEON_LDFLAGS)	787	AC_SUBST(LIBNEON_LDFLAGS)
777	AC_SUBST(HAL_USER)
778	AC_SUBST(HAL_FDI_PATH)
779	AC_SUBST(HAL_CALLOUTS_PATH)
780	AC_SUBST(LIBHAL_CFLAGS)
781	AC_SUBST(LIBHAL_LDFLAGS)
782	AC_SUBST(DRIVER_BUILD_LIST)	788	AC_SUBST(DRIVER_BUILD_LIST)
783	AC_SUBST(DRIVER_MAN_LIST)	789	AC_SUBST(DRIVER_MAN_LIST)
784	AC_SUBST(DRIVER_INSTALL_TARGET)	790	AC_SUBST(DRIVER_INSTALL_TARGET)
785	-- nut/server/Makefile.am	791	++ b/server/Makefile.am
Lines 5-16 Link Here
5	# but only add them if we really use the target.	5	# but only add them if we really use the target.
6	AM_CFLAGS = -I$(top_srcdir)/include	6	AM_CFLAGS = -I$(top_srcdir)/include
7	if WITH_SSL	7	if WITH_SSL
8	AM_CFLAGS += $(LIBSSL_CFLAGS)	8	AM_CFLAGS += $(SSL_CFLAGS)
9	endif	9	endif
10	LDADD = ../common/libcommon.a ../common/state.o ../common/upsconf.o \	10	LDADD = ../common/libcommon.a ../common/state.o ../common/upsconf.o \
11	../common/parseconf.o $(NETLIBS)	11	../common/parseconf.o $(NETLIBS)
12	if WITH_SSL	12	if WITH_SSL
13	LDADD += $(LIBSSL_LDFLAGS)	13	LDADD += $(SSL_LIBS)
14	endif	14	endif
15		15
16	sbin_PROGRAMS = upsd	16	sbin_PROGRAMS = upsd
17	-- nut/m4/nut_check_libssl.m4	17	++ b/m4/nut_check_libssl.m4
Lines 1-5 Link Here
1	dnl Check for LIBSSL compiler flags. On success, set nut_have_libssl="yes"	1	dnl Check for LIBSSL compiler flags. On success, set nut_have_libssl="yes"
2	dnl and set LIBSSL_CFLAGS and LIBSSL_LDFLAGS. On failure, set	2	dnl and set LIBSSL_CFLAGS and LIBSSL_LIBS. On failure, set
3	dnl nut_have_libssl="no". This macro can be run multiple times, but will	3	dnl nut_have_libssl="no". This macro can be run multiple times, but will
4	dnl do the checking only once.	4	dnl do the checking only once.
5		5
Lines 10-64 Link Here
10		10
11	AC_MSG_CHECKING(for SSL library availability)	11	AC_MSG_CHECKING(for SSL library availability)
12		12
13	dnl save CFLAGS and LDFLAGS	13	PKG_CHECK_MODULES(LIBSSL, [libssl],
14	CFLAGS_ORIG="${CFLAGS}"	14	nut_have_libssl=yes,
15	LDFLAGS_ORIG="${LDFLAGS}"	15	nut_have_libssl=no)
16		16	AC_SUBST(LIBSSL_CFLAGS)
17	CFLAGS=""	17	AC_SUBST(LIBSSL_LIBS)
18	LDFLAGS="-lssl -lcrypto"
19
20	AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init()],
21	nut_have_libssl=yes,
22	nut_have_libssl=no)
23
24	if test "${nut_have_libssl}" != "yes"; then
25	CFLAGS="-I/usr/kerberos/include"
26	LDFLAGS="-lssl -lcrypto"
27
28	AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init],
29	nut_have_libssl=yes,
30	nut_have_libssl=no)
31	fi
32
33	if test "${nut_have_libssl}" != "yes"; then
34	CFLAGS="-I/usr/local/ssl/include"
35	LDFLAGS="-L/usr/local/ssl/lib -lssl -lcrypto"
36
37	AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init],
38	nut_have_libssl=yes,
39	nut_have_libssl=no)
40	fi
41
42	if test "${nut_have_libssl}" != "yes"; then
43	CFLAGS="-I/usr/local/ssl/include -I/usr/kerberos/include"
44	LDFLAGS="-L/usr/local/ssl/lib -lssl -lcrypto"
45
46	AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_library_init],
47	nut_have_libssl=yes,
48	nut_have_libssl=no)
49	fi
50
51	if test "${nut_have_libssl}" = "yes"; then
52	LIBSSL_CFLAGS="${CFLAGS}"
53	LIBSSL_LDFLAGS="${LDFLAGS}"
54	fi
55
56	dnl restore original CFLAGS and LDFLAGS
57	CFLAGS="${CFLAGS_ORIG}"
58	LDFLAGS="${LDFLAGS_ORIG}"
59		18
60	AC_MSG_RESULT([${nut_have_libssl}])	19	AC_MSG_RESULT([${nut_have_libssl}])
61
62	fi	20	fi
63	])	21	])
64		22
65	-- nut/m4/nut_check_libhal.m4	23	++ b/m4/nut_check_libhal.m4
Lines 1-5 Link Here
1	dnl Check for LIBHAL compiler flags. On success, set nut_have_libhal="yes"	1	dnl Check for HAL compiler flags. On success, set nut_have_libhal="yes"
2	dnl and set LIBHAL_CFLAGS and LIBHAL_LDFLAGS. On failure, set	2	dnl and set HAL_CFLAGS and HAL_LIBS. On failure, set
3	dnl nut_have_libhal="no". This macro can be run multiple times, but will	3	dnl nut_have_libhal="no". This macro can be run multiple times, but will
4	dnl do the checking only once.	4	dnl do the checking only once.
5	dnl NUT requires HAL version 0.5.8 at least	5	dnl NUT requires HAL version 0.5.8 at least
Lines 11-17 Link Here
11		11
12	CFLAGS_ORIG="${CFLAGS}"	12	CFLAGS_ORIG="${CFLAGS}"
13	CPPFLAGS_ORIG="${CPPFLAGS}"	13	CPPFLAGS_ORIG="${CPPFLAGS}"
14	LDFLAGS_ORIG="${LDFLAGS}"	14	LIBS_ORIG="${LIBS}"
15		15
16	nut_have_libhal=yes	16	nut_have_libhal=yes
17	AC_MSG_CHECKING(for libhal version via pkg-config (0.5.8 minimum required))	17	AC_MSG_CHECKING(for libhal version via pkg-config (0.5.8 minimum required))
Lines 38-50 Link Here
38		38
39	dnl also get libs from glib-2.0 to workaround a bug in dbus-glib	39	dnl also get libs from glib-2.0 to workaround a bug in dbus-glib
40	AC_MSG_CHECKING(for libhal ldflags via pkg-config)	40	AC_MSG_CHECKING(for libhal ldflags via pkg-config)
41	LDFLAGS=`pkg-config --silence-errors --libs hal dbus-glib-1`	41	LIBS=`pkg-config --silence-errors --libs hal dbus-glib-1`
42	if (test "$?" != "0")	42	if (test "$?" != "0")
43	then	43	then
44	AC_MSG_RESULT(not found)	44	AC_MSG_RESULT(not found)
45	nut_have_libhal=no	45	nut_have_libhal=no
46	else	46	else
47	AC_MSG_RESULT(${LDFLAGS})	47	AC_MSG_RESULT(${LIBS})
48	fi	48	fi
49		49
50	dnl this will only work as of HAL 0.5.9	50	dnl this will only work as of HAL 0.5.9
Lines 98-119 Link Here
98		98
99	CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"	99	CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
100	CPPFLAGS="${CFLAGS}"	100	CPPFLAGS="${CFLAGS}"
101	LDFLAGS="-lhal -ldbus-1 -lpthread"	101	LIBS="-lhal -ldbus-1 -lpthread"
102		102
103	AC_CHECK_HEADER(libhal.h, , [nut_have_libhal=no])	103	AC_CHECK_HEADER(libhal.h, , [nut_have_libhal=no])
104	AC_CHECK_LIB(hal, libhal_device_new_changeset, [nut_have_libhal=yes],	104	AC_CHECK_LIB(hal, libhal_device_new_changeset, [nut_have_libhal=yes],
105	[nut_have_libhal=no],	105	[nut_have_libhal=no],
106	${LDFLAGS})	106	${LIBS})
107	fi	107	fi
108		108
109	if test "${nut_have_libhal}" = "yes"; then	109	if test "${nut_have_libhal}" = "yes"; then
110	LIBHAL_CFLAGS="${CFLAGS}"	110	HAL_CFLAGS="${CFLAGS}"
111	LIBHAL_LDFLAGS="${LDFLAGS}"	111	HAL_LIBS="${LIBS}"
112	fi	112	fi
113		113
114	CFLAGS="${CFLAGS_ORIG}"	114	CFLAGS="${CFLAGS_ORIG}"
115	CPPFLAGS="${CPPFLAGS_ORIG}"	115	CPPFLAGS="${CPPFLAGS_ORIG}"
116	LDFLAGS="${LDFLAGS_ORIG}"	116	LIBS="${LIBS_ORIG}"
117		117
118	fi	118	fi
119	])	119	])
120	-- nut/drivers/Makefile.am	120	++ b/drivers/Makefile.am
Lines 15-21 Link Here
15	# but only add them if we really use the target.	15	# but only add them if we really use the target.
16	AM_CFLAGS = -I$(top_srcdir)/include	16	AM_CFLAGS = -I$(top_srcdir)/include
17	if WITH_HAL	17	if WITH_HAL
18	AM_CFLAGS += $(LIBHAL_CFLAGS)	18	AM_CFLAGS += $(HAL_CFLAGS)
19	endif	19	endif
20	if WITH_USB	20	if WITH_USB
21	if HAVE_LIBUSB	21	if HAVE_LIBUSB
Lines 26-32 Link Here
26	AM_CFLAGS += $(LIBNETSNMP_CFLAGS)	26	AM_CFLAGS += $(LIBNETSNMP_CFLAGS)
27	endif	27	endif
28	if WITH_SNMP	28	if WITH_SNMP
29	AM_CFLAGS += $(LIBSSL_CFLAGS)	29	AM_CFLAGS += $(SSL_CFLAGS)
30	endif	30	endif
31	if WITH_NEONXML	31	if WITH_NEONXML
32	AM_CFLAGS += $(LIBNEON_CFLAGS)	32	AM_CFLAGS += $(LIBNEON_CFLAGS)
Lines 146-152 Link Here
146	$(USBHID_UPS_SUBDRIVERS)	146	$(USBHID_UPS_SUBDRIVERS)
147	usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)	147	usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)
148	if WITH_SSL	148	if WITH_SSL
149	usbhid_ups_LDADD += $(LIBSSL_LDFLAGS)	149	usbhid_ups_LDADD += $(SSL_LIBS)
150	endif	150	endif
151		151
152	energizerups_SOURCES = energizerups.c	152	energizerups_SOURCES = energizerups.c
Lines 175-191 Link Here
175	# HAL	175	# HAL
176	hald_addon_usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \	176	hald_addon_usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \
177	$(USBHID_UPS_SUBDRIVERS)	177	$(USBHID_UPS_SUBDRIVERS)
178	hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) $(LIBSSL_LDFLAGS)	178	hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS) $(SSL_LIBS)
179		179
180	hald_addon_tripplite_usb_SOURCES = tripplite_usb.c libusb.c	180	hald_addon_tripplite_usb_SOURCES = tripplite_usb.c libusb.c
181	hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) -lm	181	hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS) -lm
182		182
183	hald_addon_bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c	183	hald_addon_bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c
184	hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS)	184	hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS)
185		185
186	hald_addon_megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c	186	hald_addon_megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c
187	hald_addon_megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV	187	hald_addon_megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV
188	hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS)	188	hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(HAL_LIBS)
189		189
190	# NEON XML/HTTP	190	# NEON XML/HTTP
191	netxml_ups_SOURCES = netxml-ups.c mge-xml.c	191	netxml_ups_SOURCES = netxml-ups.c mge-xml.c
192	-- nut/clients/Makefile.am	192	++ b/clients/Makefile.am
Lines 3-9 Link Here
3	# by default, link programs in this directory with libcommon.a	3	# by default, link programs in this directory with libcommon.a
4	LDADD = ../common/libcommon.a libupsclient.la $(NETLIBS)	4	LDADD = ../common/libcommon.a libupsclient.la $(NETLIBS)
5	if WITH_SSL	5	if WITH_SSL
6	LDADD += $(LIBSSL_LDFLAGS)	6	LDADD += $(SSL_LIBS)
7	endif	7	endif
8		8
9	# Avoid per-target CFLAGS, because this will prevent re-use of object	9	# Avoid per-target CFLAGS, because this will prevent re-use of object
Lines 11-17 Link Here
11	# but only add them if we really use the target.	11	# but only add them if we really use the target.
12	AM_CFLAGS = -I$(top_srcdir)/include	12	AM_CFLAGS = -I$(top_srcdir)/include
13	if WITH_SSL	13	if WITH_SSL
14	AM_CFLAGS += $(LIBSSL_CFLAGS)	14	AM_CFLAGS += $(SSL_CFLAGS)
15	endif	15	endif
16	if WITH_CGI	16	if WITH_CGI
17	AM_CFLAGS += $(LIBGD_CFLAGS)	17	AM_CFLAGS += $(LIBGD_CFLAGS)
Lines 47-53 Link Here
47	# not LDADD.	47	# not LDADD.
48	libupsclient_la_SOURCES = upsclient.c upsclient.h	48	libupsclient_la_SOURCES = upsclient.c upsclient.h
49	libupsclient_la_LIBADD = ../common/parseconf.lo	49	libupsclient_la_LIBADD = ../common/parseconf.lo
50	libupsclient_la_LDFLAGS = -version-info 1:0:0	50	if WITH_SSL
		51	libupsclient_la_LIBADD += $(SSL_LIBS)
		52	endif
		53	libupsclient_la_LDFLAGS = -version-info 1:0:0 -export-dynamic
51		54
52	# rules for cross-directory targets	55	# rules for cross-directory targets
53	../common/libcommon.a: FORCE	56	../common/libcommon.a: FORCE