Module: wine Branch: master Commit: 41c599646fb9750abfd3794bd47ae45be8be1731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c599646fb9750abfd3794bd4...
Author: Ben Taylor sol11x86@comcast.net Date: Mon Apr 23 13:41:42 2007 +0000
configure: Fix to properly recognize functions on Solaris.
---
configure | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++------- configure.ac | 20 +++++---- 2 files changed, 123 insertions(+), 24 deletions(-)
diff --git a/configure b/configure index e0790fc..435de9c 100755 --- a/configure +++ b/configure @@ -15755,14 +15755,6 @@ fi
- - - - - - - - for ac_func in \ _pclose \ _popen \ @@ -15786,22 +15778,15 @@ for ac_func in \ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ - getnameinfo \ - getnetbyname \ getopt_long \ getpagesize \ - getprotobyname \ - getprotobynumber \ getpwuid \ - getservbyport \ gettid \ gettimeofday \ getuid \ inet_aton \ - inet_network \ kqueue \ lstat \ memmove \ @@ -15816,7 +15801,6 @@ for ac_func in \ rfork \ sched_yield \ select \ - sendmsg \ setrlimit \ settimeofday \ sigaltstack \ @@ -16398,6 +16382,117 @@ fi fi
+ + + + + + + +for ac_func in \ + getaddrinfo \ + getnameinfo \ + getnetbyname \ + getprotobyname \ + getprotobynumber \ + getservbyport \ + inet_network \ + sendmsg \ + +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test "${$as_var+set}" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *"* | *`* | *\*) ac_try_echo=$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo "$as_me:$LINENO: $ac_try_echo"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then diff --git a/configure.ac b/configure.ac index 6fd21b4..7757427 100644 --- a/configure.ac +++ b/configure.ac @@ -1165,22 +1165,15 @@ AC_CHECK_FUNCS(\ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ - getnameinfo \ - getnetbyname \ getopt_long \ getpagesize \ - getprotobyname \ - getprotobynumber \ getpwuid \ - getservbyport \ gettid \ gettimeofday \ getuid \ inet_aton \ - inet_network \ kqueue \ lstat \ memmove \ @@ -1195,7 +1188,6 @@ AC_CHECK_FUNCS(\ rfork \ sched_yield \ select \ - sendmsg \ setrlimit \ settimeofday \ sigaltstack \ @@ -1247,6 +1239,18 @@ then AC_CHECK_LIB(resolv,inet_aton) fi
+dnl **** Check for functions which may rely on -lsocket on Solaris. +AC_CHECK_FUNCS(\ + getaddrinfo \ + getnameinfo \ + getnetbyname \ + getprotobyname \ + getprotobynumber \ + getservbyport \ + inet_network \ + sendmsg \ +) + dnl **** Check for types ****
AC_C_CONST