# define NDEBUG
#endif
-#if defined HAVE_OPENSSL || defined HAVE_GNUTLS
+/* Is OpenSSL or GNUTLS available? */
+#if defined HAVE_LIBSSL || defined HAVE_LIBGNUTLS
# define HAVE_SSL
#endif
# define WGINT_MAX LLONG_MAX
# ifdef HAVE_STRTOLL
# define str_to_wgint strtoll
-# elif HAVE_STRTOIMAX /* HPUX 11.0 has strtoimax, but no strtoll */
+# elif defined HAVE_STRTOIMAX /* HPUX 11.0 has strtoimax, but no strtoll */
# define str_to_wgint strtoimax
# else
# define str_to_wgint strtoll