build: libhostname and chkhostname linkage adjustments followup (50a1d5ee) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

configure.ac

+4 −0

Original line number	Diff line number	Diff line
		@@ -764,6 +764,8 @@ ac_cv_func_strcasecmp="no"

		CURL_CHECK_LIBS_CONNECT

		CURL_NETWORK_LIBS=$LIBS

		dnl **********************************************************************
		dnl In case that function clock_gettime with monotonic timer is available,
		dnl check for additional required libraries.
		@@ -2651,6 +2653,7 @@ LIBCURL_LIBS=$LIBS
		AC_SUBST(LIBCURL_LIBS)
		AC_SUBST(CURL_LIBS)
		AC_SUBST(TEST_SERVER_LIBS)
		AC_SUBST(CURL_NETWORK_LIBS)
		LIBS=$ALL_LIBS dnl LIBS is a magic variable that's used for every link

		AM_CONDITIONAL(CROSSCOMPILING, test x$cross_compiling = xyes)
		@@ -2775,6 +2778,7 @@ squeeze LIBS
		squeeze CURL_LIBS
		squeeze LIBCURL_LIBS
		squeeze TEST_SERVER_LIBS
		squeeze CURL_NETWORK_LIBS

		squeeze SUPPORT_FEATURES
		squeeze SUPPORT_PROTOCOLS

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
		lib568 lib569 lib570 lib571 lib572 lib573 chkhostname

		chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c
		chkhostname_LDADD =
		chkhostname_LDADD = @CURL_NETWORK_LIBS@
		chkhostname_DEPENDENCIES =
		chkhostname_CFLAGS = $(AM_CFLAGS)

+8 −1

Original line number	Diff line number	Diff line
		@@ -21,5 +21,12 @@
		# endif
		#endif

		LIBHOSTNAME_EXTERN int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen);
		#ifdef USE_WINSOCK
		# define FUNCALLCONV __stdcall
		#else
		# define FUNCALLCONV
		#endif

		LIBHOSTNAME_EXTERN int FUNCALLCONV
		gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen);