works now with autoconf 2.54 (22a32389) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

configure.in

+26 −26

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ dnl

		AC_CANONICAL_HOST
		dnl Get system canonical name
		AC_DEFINE_UNQUOTED(OS, "${host}")
		AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS])

		dnl Check for AIX weirdos
		AC_AIX
		@@ -76,9 +76,9 @@ AC_ARG_ENABLE(http,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_HTTP)
		AC_DEFINE(CURL_DISABLE_HTTP, 1, [to disable HTTP])
		AC_MSG_WARN([disable HTTP disables FTP over proxy and GOPHER too])
		AC_DEFINE(CURL_DISABLE_GOPHER)
		AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable GOPHER])
		AC_SUBST(CURL_DISABLE_HTTP)
		AC_SUBST(CURL_DISABLE_GOPHER)
		;;
		@@ -94,7 +94,7 @@ AC_ARG_ENABLE(ftp,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_FTP)
		AC_DEFINE(CURL_DISABLE_FTP, 1, [to disable FTP])
		AC_SUBST(CURL_DISABLE_FTP)
		;;
		*) AC_MSG_RESULT(yes)
		@@ -109,7 +109,7 @@ AC_ARG_ENABLE(gopher,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_GOPHER)
		AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable GOPHER])
		AC_SUBST(CURL_DISABLE_GOPHER)
		;;
		*) AC_MSG_RESULT(yes)
		@@ -124,7 +124,7 @@ AC_ARG_ENABLE(file,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_FILE)
		AC_DEFINE(CURL_DISABLE_FILE, 1, [to disable FILE])
		AC_SUBST(CURL_DISABLE_FILE)
		;;
		*) AC_MSG_RESULT(yes)
		@@ -139,7 +139,7 @@ AC_ARG_ENABLE(ldap,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_LDAP)
		AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
		AC_SUBST(CURL_DISABLE_LDAP)
		;;
		*) AC_MSG_RESULT(yes)
		@@ -154,7 +154,7 @@ AC_ARG_ENABLE(dict,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_DICT)
		AC_DEFINE(CURL_DISABLE_DICT, 1 [to disable DICT])
		AC_SUBST(CURL_DISABLE_DICT)
		;;
		*) AC_MSG_RESULT(yes)
		@@ -169,7 +169,7 @@ AC_ARG_ENABLE(telnet,
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_TELNET)
		AC_DEFINE(CURL_DISABLE_TELNET, 1, [to disable TELNET])
		AC_SUBST(CURL_DISABLE_TELNET)
		;;
		*) AC_MSG_RESULT(yes)
		@@ -226,11 +226,11 @@ dnl Checks for libraries.
		dnl **********************************************************************

		dnl gethostbyname in the nsl lib?
		AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
		AC_CHECK_FUNC(gethostbyname, , [ AC_CHECK_LIB(nsl, gethostbyname) ])

		if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
		dnl gethostbyname in the socket lib?
		AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(socket, gethostbyname))
		AC_CHECK_FUNC(gethostbyname, , [ AC_CHECK_LIB(socket, gethostbyname) ])
		fi

		dnl At least one system has been identified to require BOTH nsl and
		@@ -255,7 +255,7 @@ if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then
		fi

		dnl resolve lib?
		AC_CHECK_FUNC(strcasecmp, , AC_CHECK_LIB(resolve, strcasecmp))
		AC_CHECK_FUNC(strcasecmp, , [ AC_CHECK_LIB(resolve, strcasecmp) ])

		if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
		AC_CHECK_LIB(resolve, strcasecmp,
		@@ -265,10 +265,10 @@ if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
		fi

		dnl socket lib?
		AC_CHECK_FUNC(connect, , AC_CHECK_LIB(socket, connect))
		AC_CHECK_FUNC(connect, , [ AC_CHECK_LIB(socket, connect) ])

		dnl dl lib?
		AC_CHECK_FUNC(dlclose, , AC_CHECK_LIB(dl, dlopen))
		AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ])

		dnl **********************************************************************
		dnl Check how non-blocking sockets are set
		@@ -279,7 +279,8 @@ AC_ARG_ENABLE(nonblocking,
		[
		if test "$enableval" = "no" ; then
		AC_MSG_WARN([non-blocking sockets disabled])
		AC_DEFINE(HAVE_DISABLED_NONBLOCKING)
		AC_DEFINE(HAVE_DISABLED_NONBLOCKING, 1,
		[to disable NON-BLOCKING connections])
		else
		CURL_CHECK_NONBLOCKING_SOCKET
		fi
		@@ -297,7 +298,8 @@ AC_ARG_WITH(egd-socket,
		[ EGD_SOCKET="$withval" ]
		)
		if test -n "$EGD_SOCKET" ; then
		AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
		AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET",
		[your Entropy Gathering Daemon socket pathname] )
		fi

		dnl Check for user-specified random device
		@@ -306,16 +308,13 @@ AC_ARG_WITH(random,
		[ RANDOM_FILE="$withval" ],
		[
		dnl Check for random device
		AC_CHECK_FILE("/dev/urandom",
		[
		RANDOM_FILE="/dev/urandom";
		]
		)
		AC_CHECK_FILE("/dev/urandom", [ RANDOM_FILE="/dev/urandom"] )
		]
		)
		if test -n "$RANDOM_FILE" ; then
		AC_SUBST(RANDOM_FILE)
		AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE")
		AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE",
		[a suitable file to read random data from])
		fi

		dnl **********************************************************************
		@@ -377,7 +376,7 @@ then
		AC_CHECK_HEADERS(des.h)

		dnl resolv lib?
		AC_CHECK_FUNC(res_search, , AC_CHECK_LIB(resolv, res_search))
		AC_CHECK_FUNC(res_search, , [AC_CHECK_LIB(resolv, res_search)])

		dnl Check for the Kerberos4 library
		AC_CHECK_LIB(krb, krb_net_read,
		@@ -393,7 +392,8 @@ then
		AC_CHECK_FUNCS(krb_get_our_ip_for_realm)

		dnl add define KRB4
		AC_DEFINE(KRB4)
		AC_DEFINE(KRB4, 1,
		[if you have the Kerberos4 libraries (including -ldes)])

		dnl substitute it too!
		KRB4_ENABLED=1
		@@ -494,7 +494,7 @@ else

		dnl If the ENGINE library seems to be around, check for the OpenSSL engine
		dnl header, it is kind of "separated" from the main SSL check
		AC_CHECK_FUNC(ENGINE_init, AC_CHECK_HEADERS(openssl/engine.h))
		AC_CHECK_FUNC(ENGINE_init, [ AC_CHECK_HEADERS(openssl/engine.h) ])

		AC_SUBST(OPENSSL_ENABLED)

		@@ -686,7 +686,7 @@ if test "$ac_cv_func_sigsetjmp" != "yes"; then
		[sigjmp_buf jmpenv;
		sigsetjmp(jmpenv, 1);],
		AC_MSG_RESULT(yes)
		AC_DEFINE(HAVE_SIGSETJMP),
		AC_DEFINE(HAVE_SIGSETJMP, 1, [If you have sigsetjmp]),
		AC_MSG_RESULT(no)
		)
		fi