tExtra libraries added to search for networking functions for proper configurin… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 07f2d8a2a3e9f255af8c1377026fadd81c81e261 | |
parent 9f75850a08b67411b23f05dc8d845b1c08a1ab4e | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 23 Oct 2000 11:59:27 +0000 | |
Extra libraries added to search for networking functions for proper configuring | |
under Solaris and friends | |
Diffstat: | |
M configure | 136 +++++++++++++++++++++++++++++… | |
M configure.in | 8 ++++++-- | |
2 files changed, 137 insertions(+), 7 deletions(-) | |
--- | |
diff --git a/configure b/configure | |
t@@ -4210,15 +4210,139 @@ network="no" | |
if test "$CYGWIN" = "yes" ; then | |
network="yes" | |
else | |
- for ac_func in socket select | |
+ | |
+echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
+echo "configure:4216: checking for library containing socket" >&5 | |
+if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then | |
+ echo $ac_n "(cached) $ac_c" 1>&6 | |
+else | |
+ ac_func_search_save_LIBS="$LIBS" | |
+ac_cv_search_socket="no" | |
+cat > conftest.$ac_ext <<EOF | |
+#line 4223 "configure" | |
+#include "confdefs.h" | |
+/* Override any gcc2 internal prototype to avoid an error. */ | |
+/* We use char because int might match the return type of a gcc2 | |
+ builtin and then its argument prototype would still apply. */ | |
+char socket(); | |
+ | |
+int main() { | |
+socket() | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+ rm -rf conftest* | |
+ ac_cv_search_socket="none required" | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+fi | |
+rm -f conftest* | |
+test "$ac_cv_search_socket" = "no" && for i in socket; do | |
+LIBS="-l$i $ac_func_search_save_LIBS" | |
+cat > conftest.$ac_ext <<EOF | |
+#line 4245 "configure" | |
+#include "confdefs.h" | |
+/* Override any gcc2 internal prototype to avoid an error. */ | |
+/* We use char because int might match the return type of a gcc2 | |
+ builtin and then its argument prototype would still apply. */ | |
+char socket(); | |
+ | |
+int main() { | |
+socket() | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+ rm -rf conftest* | |
+ ac_cv_search_socket="-l$i" | |
+break | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+fi | |
+rm -f conftest* | |
+done | |
+LIBS="$ac_func_search_save_LIBS" | |
+fi | |
+ | |
+echo "$ac_t""$ac_cv_search_socket" 1>&6 | |
+if test "$ac_cv_search_socket" != "no"; then | |
+ test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket … | |
+ | |
+else : | |
+ | |
+fi | |
+ | |
+echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
+echo "configure:4278: checking for library containing gethostbyname" >&5 | |
+if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then | |
+ echo $ac_n "(cached) $ac_c" 1>&6 | |
+else | |
+ ac_func_search_save_LIBS="$LIBS" | |
+ac_cv_search_gethostbyname="no" | |
+cat > conftest.$ac_ext <<EOF | |
+#line 4285 "configure" | |
+#include "confdefs.h" | |
+/* Override any gcc2 internal prototype to avoid an error. */ | |
+/* We use char because int might match the return type of a gcc2 | |
+ builtin and then its argument prototype would still apply. */ | |
+char gethostbyname(); | |
+ | |
+int main() { | |
+gethostbyname() | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+ rm -rf conftest* | |
+ ac_cv_search_gethostbyname="none required" | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+fi | |
+rm -f conftest* | |
+test "$ac_cv_search_gethostbyname" = "no" && for i in nsl socket; do | |
+LIBS="-l$i $ac_func_search_save_LIBS" | |
+cat > conftest.$ac_ext <<EOF | |
+#line 4307 "configure" | |
+#include "confdefs.h" | |
+/* Override any gcc2 internal prototype to avoid an error. */ | |
+/* We use char because int might match the return type of a gcc2 | |
+ builtin and then its argument prototype would still apply. */ | |
+char gethostbyname(); | |
+ | |
+int main() { | |
+gethostbyname() | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+ rm -rf conftest* | |
+ ac_cv_search_gethostbyname="-l$i" | |
+break | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+fi | |
+rm -f conftest* | |
+done | |
+LIBS="$ac_func_search_save_LIBS" | |
+fi | |
+ | |
+echo "$ac_t""$ac_cv_search_gethostbyname" 1>&6 | |
+if test "$ac_cv_search_gethostbyname" != "no"; then | |
+ test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_… | |
+ | |
+else : | |
+ | |
+fi | |
+ for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4217: checking for $ac_func" >&5 | |
+echo "configure:4341: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4222 "configure" | |
+#line 4346 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4241,7 +4365,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4267,7 +4391,9 @@ done | |
if test "$ac_cv_func_select" = "yes" ; then | |
if test "$ac_cv_func_socket" = "yes" ; then | |
- network="yes" | |
+ if test "$ac_cv_func_gethostbyname" = "yes" ; then | |
+ network="yes" | |
+ fi | |
fi | |
fi | |
fi | |
diff --git a/configure.in b/configure.in | |
t@@ -137,10 +137,14 @@ else | |
dnl Check for socket and select even if networking gets manually | |
dnl disabled below, since select is used if available for | |
dnl millisecond sleeping | |
- AC_CHECK_FUNCS(socket select) | |
+ AC_SEARCH_LIBS(socket,socket) | |
+ AC_SEARCH_LIBS(gethostbyname,nsl socket) | |
+ AC_CHECK_FUNCS(socket gethostbyname select) | |
if test "$ac_cv_func_select" = "yes" ; then | |
if test "$ac_cv_func_socket" = "yes" ; then | |
- network="yes" | |
+ if test "$ac_cv_func_gethostbyname" = "yes" ; then | |
+ network="yes" | |
+ fi | |
fi | |
fi | |
fi |