diff --git a/moo/Makefile.in b/moo/Makefile.in index 8b9f49a..302823c 100644 --- a/moo/Makefile.in +++ b/moo/Makefile.in @@ -315,6 +315,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ TERMINAL_LIBS = @TERMINAL_LIBS@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/moo/configure b/moo/configure index 2fa04b6..7aef7e3 100755 --- a/moo/configure +++ b/moo/configure @@ -678,6 +678,7 @@ PACKAGE_VERSION_MINOR PACKAGE_VERSION_MAJOR QUADMATH_LIBS UNICOWS_LIBS +SOCKET_LIBS TERMINAL_LIBS DYNCALL_LIBS PTHREAD_CFLAGS @@ -19775,6 +19776,181 @@ LIBS="$save_LIBS" +for ac_func in connect gethostbyname +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +if test "x$ac_cv_func_gethostbyname" = "xno" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $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 gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostbyname=yes +else + ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : + + SOCKET_LIBS="$SOCKET_LIBS -lnsl" + $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h + + +fi + +fi +if test "x$ac_cv_func_connect" = "xno" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if ${ac_cv_lib_socket_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $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 connect (); +int +main () +{ +return connect (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes +else + ac_cv_lib_socket_connect=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_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes; then : + + SOCKET_LIBS="$SOCKET_LIBS -lsocket" + $as_echo "#define HAVE_CONNECT 1" >>confdefs.h + + +fi + + + if test "x$ac_cv_lib_socket_connect" = xno + then + for ac_func in t_connect +do : + ac_fn_c_check_func "$LINENO" "t_connect" "ac_cv_func_t_connect" +if test "x$ac_cv_func_t_connect" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_T_CONNECT 1 +_ACEOF + +fi +done + + if test "x$ac_cv_func_t_connect" = "xno" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_connect in -lnsl_s" >&5 +$as_echo_n "checking for t_connect in -lnsl_s... " >&6; } +if ${ac_cv_lib_nsl_s_t_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl_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 t_connect (); +int +main () +{ +return t_connect (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_s_t_connect=yes +else + ac_cv_lib_nsl_s_t_connect=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_nsl_s_t_connect" >&5 +$as_echo "$ac_cv_lib_nsl_s_t_connect" >&6; } +if test "x$ac_cv_lib_nsl_s_t_connect" = xyes; then : + + SOCKET_LIBS="$SOCKET_LIBS -lnsl_s" + $as_echo "#define HAVE_T_CONNECT 1" >>confdefs.h + + +fi + + fi + fi +fi +if test "x${platform_win32}" = "xyes" +then + SOCKET_LIBS="$SOCKET_LIBS -lws2_32" +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunicows" >&5 $as_echo_n "checking for main in -lunicows... " >&6; } if ${ac_cv_lib_unicows_main+:} false; then : diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index 869fa40..dbee95f 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -356,6 +356,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ TERMINAL_LIBS = @TERMINAL_LIBS@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/moo/lib/moo-cfg.h.in b/moo/lib/moo-cfg.h.in index 4add3b8..d4887b8 100644 --- a/moo/lib/moo-cfg.h.in +++ b/moo/lib/moo-cfg.h.in @@ -63,6 +63,9 @@ /* Define to 1 if you have the `closedir' function. */ #undef HAVE_CLOSEDIR +/* Define to 1 if you have the `connect' function. */ +#undef HAVE_CONNECT + /* Define to 1 if you have the `coshq' function. */ #undef HAVE_COSHQ @@ -127,6 +130,9 @@ /* Define to 1 if you have the `getcontext' function. */ #undef HAVE_GETCONTEXT +/* Define to 1 if you have the `gethostbyname' function. */ +#undef HAVE_GETHOSTBYNAME + /* Define to 1 if you have the `getitimer' function. */ #undef HAVE_GETITIMER @@ -298,6 +304,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TIME_H +/* Define to 1 if you have the `t_connect' function. */ +#undef HAVE_T_CONNECT + /* Define to 1 if you have the header file. */ #undef HAVE_UCONTEXT_H diff --git a/moo/mod/Makefile.am b/moo/mod/Makefile.am index 5154ca1..ec68920 100644 --- a/moo/mod/Makefile.am +++ b/moo/mod/Makefile.am @@ -92,7 +92,7 @@ if ENABLE_MOD_SCK libmoo_sck_la_SOURCES = sck.c sck-addr.c _sck.h libmoo_sck_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_sck_la_LDFLAGS = $(LDFLAGS_COMMON) -libmoo_sck_la_LIBADD = $(LIBADD_COMMON) +libmoo_sck_la_LIBADD = $(LIBADD_COMMON) $(SOCKET_LIBS) endif libmoo_stdio_la_SOURCES = stdio.c _stdio.h diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in index 82a0ba1..69c9e88 100644 --- a/moo/mod/Makefile.in +++ b/moo/mod/Makefile.in @@ -176,6 +176,7 @@ libmoo_ffi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) @ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libmoo_ffi_la_rpath = @ENABLE_MOD_SCK_TRUE@libmoo_sck_la_DEPENDENCIES = \ +@ENABLE_MOD_SCK_TRUE@ $(am__DEPENDENCIES_1) \ @ENABLE_MOD_SCK_TRUE@ $(am__DEPENDENCIES_1) am__libmoo_sck_la_SOURCES_DIST = sck.c sck-addr.c _sck.h @ENABLE_MOD_SCK_TRUE@am_libmoo_sck_la_OBJECTS = libmoo_sck_la-sck.lo \ @@ -381,6 +382,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ TERMINAL_LIBS = @TERMINAL_LIBS@ UNICOWS_LIBS = @UNICOWS_LIBS@ @@ -477,7 +479,7 @@ libmoo_con_la_LIBADD = $(LIBADD_COMMON) $(TERMINAL_LIBS) @ENABLE_MOD_SCK_TRUE@libmoo_sck_la_SOURCES = sck.c sck-addr.c _sck.h @ENABLE_MOD_SCK_TRUE@libmoo_sck_la_CPPFLAGS = $(CPPFLAGS_COMMON) @ENABLE_MOD_SCK_TRUE@libmoo_sck_la_LDFLAGS = $(LDFLAGS_COMMON) -@ENABLE_MOD_SCK_TRUE@libmoo_sck_la_LIBADD = $(LIBADD_COMMON) +@ENABLE_MOD_SCK_TRUE@libmoo_sck_la_LIBADD = $(LIBADD_COMMON) $(SOCKET_LIBS) libmoo_stdio_la_SOURCES = stdio.c _stdio.h libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_stdio_la_LDFLAGS = $(LDFLAGS_COMMON)