hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to use SSL_new for checking openssl in configure.ac

Browse Source
This commit is contained in:
hyung-hwan
2019-01-31 04:53:20 +00:00
parent f850f459c4
commit 044314daa8
5 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qse/Makefile.in
View File

@ -166,7 +166,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/README.in \
$(top_srcdir)/ac/config.guess $(top_srcdir)/ac/config.sub \
$(top_srcdir)/ac/install-sh $(top_srcdir)/ac/ltmain.sh \
$(top_srcdir)/ac/missing ac/ar-lib ac/compile ac/config.guess \
ac/config.sub ac/install-sh ac/ltmain.sh ac/missing
ac/config.sub ac/depcomp ac/install-sh ac/ltmain.sh ac/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)

32
qse/configure vendored
View File

@ -18949,27 +18949,27 @@ fi
done
for ac_func in SSL_library_init
for ac_func in SSL_new
do :
ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
if test "x$ac_cv_func_SSL_library_init" = xyes; then :
ac_fn_c_check_func "$LINENO" "SSL_new" "ac_cv_func_SSL_new"
if test "x$ac_cv_func_SSL_new" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SSL_LIBRARY_INIT 1
#define HAVE_SSL_NEW 1
_ACEOF
fi
done
if test "x$ac_cv_func_SSL_library_init" = "xyes"
if test "x$ac_cv_func_SSL_new" = "xyes"
then
$as_echo "#define HAVE_SSL 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
$as_echo_n "checking for SSL_new in -lssl... " >&6; }
if ${ac_cv_lib_ssl_SSL_new+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -18983,27 +18983,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char SSL_library_init ();
char SSL_new ();
int
main ()
{
return SSL_library_init ();
return SSL_new ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ssl_SSL_library_init=yes
ac_cv_lib_ssl_SSL_new=yes
else
ac_cv_lib_ssl_SSL_library_init=no
ac_cv_lib_ssl_SSL_new=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
SSL_LIBS="-lssl"
@ -19053,7 +19053,7 @@ if test "x$ac_cv_lib_crypto_ERR_get_error" = xyes; then :
fi
$as_echo "#define HAVE_SSL_LIBRARY_INIT 1" >>confdefs.h
$as_echo "#define HAVE_SSL_NEW 1" >>confdefs.h
fi

13
qse/configure.ac
View File

@ -275,13 +275,18 @@ then
AC_CHECK_HEADERS([openssl/ssl.h openssl/err.h openssl/engine.h])
dnl check for an SSL library
AC_CHECK_FUNCS([SSL_library_init])
dnl i used SSL_library_init at first.
dnl starting from openssl 1.1.0, SSL_library_init was made to a macro
dnl aliasing OPENSSL_init_ssl.
dnl #define SSL_library_init() OPENSSL_init_ssl(0, NULL)
dnl instead of checking both, now i use SSL_new.
AC_CHECK_FUNCS([SSL_new])
if test "x$ac_cv_func_SSL_library_init" = "xyes"
if test "x$ac_cv_func_SSL_new" = "xyes"
then
AC_DEFINE(HAVE_SSL, 1, [ssl support])
else
AC_CHECK_LIB([ssl], [SSL_library_init], [
AC_CHECK_LIB([ssl], [SSL_new], [
SSL_LIBS="-lssl"
AC_DEFINE(HAVE_SSL, 1, [ssl support])
@ -291,7 +296,7 @@ then
])
dnl only for consistency with AC_CHECK_FUNCS
AC_DEFINE(HAVE_SSL_LIBRARY_INIT, 1)
AC_DEFINE(HAVE_SSL_NEW, 1)
])
fi

4
qse/include/qse/config.h.in
View File

@ -529,8 +529,8 @@
/* ssl support */
#undef HAVE_SSL
/* Define to 1 if you have the `SSL_library_init' function. */
#undef HAVE_SSL_LIBRARY_INIT
/* Define to 1 if you have the `SSL_new' function. */
#undef HAVE_SSL_NEW
/* Define to 1 if you have the `stat64' function. */
#undef HAVE_STAT64

62
qse/samples/si/Makefile.in
View File

@ -88,12 +88,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = aio01$(EXEEXT) dir01$(EXEEXT) fio01$(EXEEXT) \
fio02$(EXEEXT) fs01$(EXEEXT) fs02$(EXEEXT) fs03$(EXEEXT) \
glob01$(EXEEXT) log01$(EXEEXT) nwad01$(EXEEXT) nwif01$(EXEEXT) \
nwif02$(EXEEXT) pio01$(EXEEXT) rwl01$(EXEEXT) sck01$(EXEEXT) \
sio01$(EXEEXT) sio02$(EXEEXT) sio03$(EXEEXT) spl01$(EXEEXT) \
task01$(EXEEXT) thr01$(EXEEXT) $(am__EXEEXT_1)
bin_PROGRAMS = dir01$(EXEEXT) fio01$(EXEEXT) fio02$(EXEEXT) \
fs01$(EXEEXT) fs02$(EXEEXT) fs03$(EXEEXT) glob01$(EXEEXT) \
log01$(EXEEXT) nwad01$(EXEEXT) nwif01$(EXEEXT) nwif02$(EXEEXT) \
pio01$(EXEEXT) rwl01$(EXEEXT) sck01$(EXEEXT) sio01$(EXEEXT) \
sio02$(EXEEXT) sio03$(EXEEXT) spl01$(EXEEXT) task01$(EXEEXT) \
thr01$(EXEEXT) $(am__EXEEXT_1)
@WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
@ENABLE_CXX_TRUE@am__append_2 = sck01 spl02 tcpsvr01 tcpsvr02 thr02 thr03
subdir = samples/si
@ -117,20 +117,16 @@ CONFIG_CLEAN_VPATH_FILES =
@ENABLE_CXX_TRUE@ thr02$(EXEEXT) thr03$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_aio01_OBJECTS = aio01.$(OBJEXT)
aio01_OBJECTS = $(am_aio01_OBJECTS)
aio01_LDADD = $(LDADD)
am_dir01_OBJECTS = dir01.$(OBJEXT)
dir01_OBJECTS = $(am_dir01_OBJECTS)
dir01_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
@WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
aio01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
dir01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
am_dir01_OBJECTS = dir01.$(OBJEXT)
dir01_OBJECTS = $(am_dir01_OBJECTS)
dir01_LDADD = $(LDADD)
dir01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
am_fio01_OBJECTS = fio01.$(OBJEXT)
fio01_OBJECTS = $(am_fio01_OBJECTS)
fio01_LDADD = $(LDADD)
@ -286,22 +282,22 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = $(aio01_SOURCES) $(dir01_SOURCES) $(fio01_SOURCES) \
$(fio02_SOURCES) $(fs01_SOURCES) $(fs02_SOURCES) \
$(fs03_SOURCES) $(glob01_SOURCES) $(log01_SOURCES) \
$(nwad01_SOURCES) $(nwif01_SOURCES) $(nwif02_SOURCES) \
$(pio01_SOURCES) $(rwl01_SOURCES) $(sck01_SOURCES) \
$(sio01_SOURCES) $(sio02_SOURCES) $(sio03_SOURCES) \
$(spl01_SOURCES) $(spl02_SOURCES) $(task01_SOURCES) \
$(tcpsvr01_SOURCES) $(tcpsvr02_SOURCES) $(thr01_SOURCES) \
$(thr02_SOURCES) $(thr03_SOURCES)
DIST_SOURCES = $(aio01_SOURCES) $(dir01_SOURCES) $(fio01_SOURCES) \
$(fio02_SOURCES) $(fs01_SOURCES) $(fs02_SOURCES) \
$(fs03_SOURCES) $(glob01_SOURCES) $(log01_SOURCES) \
$(nwad01_SOURCES) $(nwif01_SOURCES) $(nwif02_SOURCES) \
$(pio01_SOURCES) $(rwl01_SOURCES) $(am__sck01_SOURCES_DIST) \
$(sio01_SOURCES) $(sio02_SOURCES) $(sio03_SOURCES) \
$(spl01_SOURCES) $(am__spl02_SOURCES_DIST) $(task01_SOURCES) \
SOURCES = $(dir01_SOURCES) $(fio01_SOURCES) $(fio02_SOURCES) \
$(fs01_SOURCES) $(fs02_SOURCES) $(fs03_SOURCES) \
$(glob01_SOURCES) $(log01_SOURCES) $(nwad01_SOURCES) \
$(nwif01_SOURCES) $(nwif02_SOURCES) $(pio01_SOURCES) \
$(rwl01_SOURCES) $(sck01_SOURCES) $(sio01_SOURCES) \
$(sio02_SOURCES) $(sio03_SOURCES) $(spl01_SOURCES) \
$(spl02_SOURCES) $(task01_SOURCES) $(tcpsvr01_SOURCES) \
$(tcpsvr02_SOURCES) $(thr01_SOURCES) $(thr02_SOURCES) \
$(thr03_SOURCES)
DIST_SOURCES = $(dir01_SOURCES) $(fio01_SOURCES) $(fio02_SOURCES) \
$(fs01_SOURCES) $(fs02_SOURCES) $(fs03_SOURCES) \
$(glob01_SOURCES) $(log01_SOURCES) $(nwad01_SOURCES) \
$(nwif01_SOURCES) $(nwif02_SOURCES) $(pio01_SOURCES) \
$(rwl01_SOURCES) $(am__sck01_SOURCES_DIST) $(sio01_SOURCES) \
$(sio02_SOURCES) $(sio03_SOURCES) $(spl01_SOURCES) \
$(am__spl02_SOURCES_DIST) $(task01_SOURCES) \
$(am__tcpsvr01_SOURCES_DIST) $(am__tcpsvr02_SOURCES_DIST) \
$(thr01_SOURCES) $(am__thr02_SOURCES_DIST) \
$(am__thr03_SOURCES_DIST)
@ -505,7 +501,6 @@ AM_CPPFLAGS = \
AM_LDFLAGS = -L../../lib/si -L../../lib/cmn
AM_CFLAGS = $(PTHREAD_CFLAGS)
LDADD = -lqsesi -lqsecmn $(PTHREAD_LIBS) $(am__append_1)
aio01_SOURCES = aio01.c
dir01_SOURCES = dir01.c
fio01_SOURCES = fio01.c
fio02_SOURCES = fio02.c
@ -621,10 +616,6 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
aio01$(EXEEXT): $(aio01_OBJECTS) $(aio01_DEPENDENCIES) $(EXTRA_aio01_DEPENDENCIES)
@rm -f aio01$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(aio01_OBJECTS) $(aio01_LDADD) $(LIBS)
dir01$(EXEEXT): $(dir01_OBJECTS) $(dir01_DEPENDENCIES) $(EXTRA_dir01_DEPENDENCIES)
@rm -f dir01$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dir01_OBJECTS) $(dir01_LDADD) $(LIBS)
@ -731,7 +722,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aio01.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir01.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fio01.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fio02.Po@am__quote@