From 7b9f3cd9f5160af4fe784e5a5628ab91da7b3de8 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 27 Dec 2020 19:28:49 +0000 Subject: [PATCH] got rid of unneeded stuffs --- hawk/Makefile.in | 1 - hawk/bin/Makefile.in | 1 - hawk/configure | 55 +++------------------------------------- hawk/configure.ac | 14 +++------- hawk/lib/Makefile.in | 1 - hawk/lib/hawk-cfg.h.in | 6 ----- hawk/mod/Makefile.am | 2 +- hawk/mod/Makefile.in | 4 +-- hawk/samples/Makefile.in | 1 - hawk/t/Makefile.in | 1 - hawk/tools/Makefile.in | 1 - 11 files changed, 8 insertions(+), 79 deletions(-) diff --git a/hawk/Makefile.in b/hawk/Makefile.in index 420d695e..3d664f88 100644 --- a/hawk/Makefile.in +++ b/hawk/Makefile.in @@ -239,7 +239,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/hawk/bin/Makefile.in b/hawk/bin/Makefile.in index 1c5b18b2..5b284ebd 100644 --- a/hawk/bin/Makefile.in +++ b/hawk/bin/Makefile.in @@ -208,7 +208,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/hawk/configure b/hawk/configure index 2677b9db..5988c00a 100755 --- a/hawk/configure +++ b/hawk/configure @@ -674,7 +674,6 @@ ax_pthread_config SOCKET_LIBS UNWIND_LIBS FFI_LIBS -DYNCALL_LIBS LTDL_LIBS DL_LIBS LIBM @@ -18958,7 +18957,7 @@ fi done -for ac_header in ffi.h dyncall.h libunwind.h quadmath.h crt_externs.h +for ac_header in ffi.h libunwind.h quadmath.h crt_externs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -19278,54 +19277,6 @@ fi LIBS="$save_LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcNewCallVM in -ldyncall_s" >&5 -$as_echo_n "checking for dcNewCallVM in -ldyncall_s... " >&6; } -if ${ac_cv_lib_dyncall_s_dcNewCallVM+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldyncall_s $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dcNewCallVM (); -int -main () -{ -return dcNewCallVM (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dyncall_s_dcNewCallVM=yes -else - ac_cv_lib_dyncall_s_dcNewCallVM=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_dyncall_s_dcNewCallVM" >&5 -$as_echo "$ac_cv_lib_dyncall_s_dcNewCallVM" >&6; } -if test "x$ac_cv_lib_dyncall_s_dcNewCallVM" = xyes; then : - - DYNCALL_LIBS="-ldyncall_s" - -$as_echo "#define HAVE_DYNCALL_LIB 1" >>confdefs.h - - - -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_call in -lffi" >&5 $as_echo_n "checking for ffi_call in -lffi... " >&6; } if ${ac_cv_lib_ffi_ffi_call+:} false; then : @@ -24202,7 +24153,7 @@ else fi -if test "x${ac_cv_lib_ffi_ffi_call}" != "xyes" -a "x${ac_cv_lib_dyncall_s_dcNewCallVM}" != "xyes" +if test "x${ac_cv_lib_ffi_ffi_call}" != "xyes" then enable_mod_ffi_is="no" fi @@ -26913,7 +26864,7 @@ echo " C++ compiler: ${CXX} ${CXXFLAGS}" echo " C++ support: ${enable_cxx_is}" echo " Math library: ${LIBM}" echo " Socket library: ${SOCKET_LIBS}" -echo " Native function call library: ${FFI_LIBS} ${DYNCALL_LIBS}" +echo " Native function call library: ${FFI_LIBS}" echo " Thraed library: ${PTHREAD_LIBS}" echo "-------------------------------------------------------------------------" diff --git a/hawk/configure.ac b/hawk/configure.ac index 50df632d..f13601ed 100644 --- a/hawk/configure.ac +++ b/hawk/configure.ac @@ -252,7 +252,7 @@ AC_CHECK_HEADERS([netinet/in.h sys/un.h netpacket/packet.h net/if.h net/if_dl.h #include #include ]) AC_CHECK_HEADERS([sys/stropts.h sys/macstat.h linux/ethtool.h linux/sockios.h]) -AC_CHECK_HEADERS([ffi.h dyncall.h libunwind.h quadmath.h crt_externs.h]) +AC_CHECK_HEADERS([ffi.h libunwind.h quadmath.h crt_externs.h]) dnl check data types dnl AC_CHECK_TYPE([wchar_t], @@ -303,14 +303,6 @@ AC_SEARCH_LIBS([lt_dlopen], [ltdl], [ LIBS="$save_LIBS" AC_SUBST(LTDL_LIBS) -AC_CHECK_LIB([dyncall_s], [dcNewCallVM], - [ - DYNCALL_LIBS="-ldyncall_s" - AC_DEFINE([HAVE_DYNCALL_LIB], [1], [dyncall library is available]) - ] -) -AC_SUBST(DYNCALL_LIBS) - AC_CHECK_LIB([ffi], [ffi_call], [ FFI_LIBS="-lffi" @@ -1004,7 +996,7 @@ AC_ARG_ENABLE([mod-ffi], enable_mod_ffi_is=$enableval, enable_mod_ffi_is=yes ) -if test "x${ac_cv_lib_ffi_ffi_call}" != "xyes" -a "x${ac_cv_lib_dyncall_s_dcNewCallVM}" != "xyes" +if test "x${ac_cv_lib_ffi_ffi_call}" != "xyes" then enable_mod_ffi_is="no" fi @@ -1082,7 +1074,7 @@ echo " C++ compiler: ${CXX} ${CXXFLAGS}" echo " C++ support: ${enable_cxx_is}" echo " Math library: ${LIBM}" echo " Socket library: ${SOCKET_LIBS}" -echo " Native function call library: ${FFI_LIBS} ${DYNCALL_LIBS}" +echo " Native function call library: ${FFI_LIBS}" echo " Thraed library: ${PTHREAD_LIBS}" echo "-------------------------------------------------------------------------" ] diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index e543ab97..e838eed0 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -447,7 +447,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/hawk/lib/hawk-cfg.h.in b/hawk/lib/hawk-cfg.h.in index c99d9b6b..47e62651 100644 --- a/hawk/lib/hawk-cfg.h.in +++ b/hawk/lib/hawk-cfg.h.in @@ -133,12 +133,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the header file. */ -#undef HAVE_DYNCALL_H - -/* dyncall library is available */ -#undef HAVE_DYNCALL_LIB - /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE diff --git a/hawk/mod/Makefile.am b/hawk/mod/Makefile.am index c91a3d89..f8bd062f 100644 --- a/hawk/mod/Makefile.am +++ b/hawk/mod/Makefile.am @@ -71,7 +71,7 @@ libhawk_ffi_la_SOURCES = mod-ffi.c mod-ffi.h libhawk_ffi_la_CPPFLAGS = $(CPPFLAGS_COMMON) libhawk_ffi_la_CFLAGS = $(CFLAGS_COMMON) libhawk_ffi_la_LDFLAGS = $(LDFLAGS_COMMON) -libhawk_ffi_la_LIBADD = $(LIBADD_COMMON) $(DYNCALL_LIBS) $(FFI_LIBS) +libhawk_ffi_la_LIBADD = $(LIBADD_COMMON) $(FFI_LIBS) endif if ENABLE_MOD_MYSQL diff --git a/hawk/mod/Makefile.in b/hawk/mod/Makefile.in index df61b9ea..b4985644 100644 --- a/hawk/mod/Makefile.in +++ b/hawk/mod/Makefile.in @@ -144,7 +144,6 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkgmodexec_LTLIBRARIES) am__DEPENDENCIES_1 = @ENABLE_MOD_FFI_TRUE@libhawk_ffi_la_DEPENDENCIES = \ @ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) \ @ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) am__libhawk_ffi_la_SOURCES_DIST = mod-ffi.c mod-ffi.h @ENABLE_MOD_FFI_TRUE@am_libhawk_ffi_la_OBJECTS = \ @@ -285,7 +284,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -452,7 +450,7 @@ CFLAGS_COMMON = @ENABLE_MOD_FFI_TRUE@libhawk_ffi_la_CPPFLAGS = $(CPPFLAGS_COMMON) @ENABLE_MOD_FFI_TRUE@libhawk_ffi_la_CFLAGS = $(CFLAGS_COMMON) @ENABLE_MOD_FFI_TRUE@libhawk_ffi_la_LDFLAGS = $(LDFLAGS_COMMON) -@ENABLE_MOD_FFI_TRUE@libhawk_ffi_la_LIBADD = $(LIBADD_COMMON) $(DYNCALL_LIBS) $(FFI_LIBS) +@ENABLE_MOD_FFI_TRUE@libhawk_ffi_la_LIBADD = $(LIBADD_COMMON) $(FFI_LIBS) @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_SOURCES = mod-mysql.c mod-mysql.h @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_CPPFLAGS = $(CPPFLAGS_COMMON) $(MYSQL_CFLAGS) @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_CFLAGS = $(CFLAGS_COMMON) diff --git a/hawk/samples/Makefile.in b/hawk/samples/Makefile.in index 76a00b32..62e199ef 100644 --- a/hawk/samples/Makefile.in +++ b/hawk/samples/Makefile.in @@ -237,7 +237,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/hawk/t/Makefile.in b/hawk/t/Makefile.in index 67aec334..88dcf61c 100644 --- a/hawk/t/Makefile.in +++ b/hawk/t/Makefile.in @@ -443,7 +443,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/hawk/tools/Makefile.in b/hawk/tools/Makefile.in index cb5a4088..d8eb9b32 100644 --- a/hawk/tools/Makefile.in +++ b/hawk/tools/Makefile.in @@ -214,7 +214,6 @@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DYNCALL_LIBS = @DYNCALL_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@