fixed some cross-compiling problems in build files
- specifying $(includedir) to AM_CPPFLAGS caused problems when --prefix was set to /usr during cross-compliation since header files for the cross compiler conflicted with files in $(includedir)=/usr/include. - the same applies to $(libdir) in LDFLAGS or something similar
This commit is contained in:
@ -238,25 +238,29 @@ dnl the existence of the libaray.
|
||||
AC_CHECK_LIB([unicows], [main], [UNICOWS_LIBS="-lunicows"])
|
||||
AC_SUBST(UNICOWS_LIBS)
|
||||
|
||||
dnl check for an SSL library
|
||||
AC_CHECK_FUNCS([SSL_library_init])
|
||||
if test "$ac_cv_func_SSL_library_init" = "yes"
|
||||
AC_ARG_ENABLE([ssl], [AS_HELP_STRING([--enable-ssl],[build the library in the ssl mode (default. yes)])],
|
||||
enable_ssl_is=$enableval,enable_ssl_is=yes)
|
||||
if test "$enable_ssl_is" = "yes"
|
||||
then
|
||||
AC_DEFINE(HAVE_SSL, 1, [ssl support])
|
||||
else
|
||||
AC_CHECK_LIB([ssl], [SSL_library_init], [
|
||||
SSL_LIBS="-lssl"
|
||||
dnl check for an SSL library
|
||||
AC_CHECK_FUNCS([SSL_library_init])
|
||||
if test "$ac_cv_func_SSL_library_init" = "yes"
|
||||
then
|
||||
AC_DEFINE(HAVE_SSL, 1, [ssl support])
|
||||
else
|
||||
AC_CHECK_LIB([ssl], [SSL_library_init], [
|
||||
SSL_LIBS="-lssl"
|
||||
AC_DEFINE(HAVE_SSL, 1, [ssl support])
|
||||
|
||||
dnl additional check
|
||||
AC_CHECK_LIB([crypto], [ERR_get_error], [
|
||||
SSL_LIBS="${SSL_LIBS} -lcrypto"
|
||||
dnl additional check
|
||||
AC_CHECK_LIB([crypto], [ERR_get_error], [
|
||||
SSL_LIBS="${SSL_LIBS} -lcrypto"
|
||||
])
|
||||
|
||||
dnl only for consistency with AC_CHECK_FUNCS
|
||||
AC_DEFINE(HAVE_SSL_LIBRARY_INIT, 1)
|
||||
])
|
||||
|
||||
dnl only for consistency with AC_CHECK_FUNCS
|
||||
AC_DEFINE(HAVE_SSL_LIBRARY_INIT, 1)
|
||||
])
|
||||
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(SSL_LIBS)
|
||||
|
||||
|
Reference in New Issue
Block a user