Clean up some obsolete Autoconf code

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 8aafc16..4eec8ac 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -6,10 +6,7 @@ dnl parameters must be done like $[]1 instead of $1
 
 AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[
 AH_VERBATIM([OPENAFS_HEADER],
-[#undef HAVE_CONNECT
-#undef HAVE_GETHOSTBYNAME
-#undef HAVE_RES_SEARCH
-#undef HAVE_SOCKET
+[#undef HAVE_RES_SEARCH
 #undef STRUCT_SOCKADDR_HAS_SA_LEN
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
 # if ENDIANESS_IN_SYS_PARAM_H
@@ -471,7 +468,11 @@ case $system in
                MKAFS_OSTYPE=NBSD
                AC_MSG_RESULT(nbsd)
                ;;
-       *-openbsd*)
+       x86_64-*-openbsd*)
+               MKAFS_OSTYPE=OBSD
+               AC_MSG_RESULT(amd64_obsd)
+               ;;
+       i386-openbsd*)
                MKAFS_OSTYPE=OBSD
                AC_MSG_RESULT(i386_obsd)
                ;;
@@ -501,6 +502,12 @@ else
                        vm=${v#*.}
                        AFS_SYSNAME="sparc64_obsd${vM}${vm}"
                        ;;
+               x86_64-*-openbsd?.?)
+                       v=${host#*openbsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="amd64_obsd${vM}${vm}"
+                       ;;
                i?86-*-freebsd?.*)
                        v=${host#*freebsd}
                        vM=${v%.*}
@@ -538,10 +545,12 @@ else
                        AFS_SYSNAME="amd64_nbsd20"
                        ;;
                x86_64-*-netbsd*3.[[0-8]]*)
+# XXX AFS_PARAM_COMMON handled separately, redundant?
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="amd64_nbsd30"
                        ;;
                x86_64-*-netbsd*4.[[0-8]]*)
+# XXX AFS_PARAM_COMMON handled separately, redundant?
                        AFS_PARAM_COMMON=param.nbsd40.h
                        AFS_SYSNAME="amd64_nbsd40"
                        ;;
@@ -822,6 +831,21 @@ case $AFS_SYSNAME in
     *_nbsd21)   AFS_PARAM_COMMON=param.nbsd21.h  ;;
     *_nbsd30)   AFS_PARAM_COMMON=param.nbsd30.h  ;;
     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
+    *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
+    *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
+    *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
+    *_obsd34)   AFS_PARAM_COMMON=param.obsd34.h  ;;
+    *_obsd35)   AFS_PARAM_COMMON=param.obsd35.h  ;;
+    *_obsd36)   AFS_PARAM_COMMON=param.obsd36.h  ;;
+    *_obsd37)   AFS_PARAM_COMMON=param.obsd37.h  ;;
+    *_obsd38)   AFS_PARAM_COMMON=param.obsd38.h  ;;
+    *_obsd39)   AFS_PARAM_COMMON=param.obsd39.h  ;;
+    *_obsd40)   AFS_PARAM_COMMON=param.obsd40.h  ;;
+    *_obsd41)   AFS_PARAM_COMMON=param.obsd41.h  ;;
+    *_obsd42)   AFS_PARAM_COMMON=param.obsd42.h  ;;
+    *_obsd43)   AFS_PARAM_COMMON=param.obsd43.h  ;;
+    *_obsd44)   AFS_PARAM_COMMON=param.obsd44.h  ;;
+    *_obsd45)   AFS_PARAM_COMMON=param.obsd45.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
@@ -1275,34 +1299,9 @@ fi
 if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
         echo Skipping library tests because they confuse Irix.
 else
-  AC_CHECK_FUNCS(socket)
-
-  if test "$ac_cv_func_socket" = no; then
-    for lib in socket inet; do
-        if test "$HAVE_SOCKET" != 1; then
-                AC_CHECK_LIB(${lib}, socket,LIBS="$LIBS -l$lib";HAVE_SOCKET=1;AC_DEFINE(HAVE_SOCKET, 1, [define if you have socket]))
-        fi
-    done
-  fi
-  
-  AC_CHECK_FUNCS(connect)       
-
-  if test "$ac_cv_func_connect" = no; then
-    for lib in nsl; do
-        if test "$HAVE_CONNECT" != 1; then
-                AC_CHECK_LIB(${lib}, connect,LIBS="$LIBS -l$lib";HAVE_CONNECT=1;AC_DEFINE(HAVE_CONNECT, 1, [define if you have connect]))
-        fi
-    done
-  fi
-
-  AC_CHECK_FUNCS(gethostbyname)
-  if test "$ac_cv_func_gethostbyname" = no; then
-        for lib in dns nsl resolv; do
-          if test "$HAVE_GETHOSTBYNAME" != 1; then
-            AC_CHECK_LIB(${lib}, gethostbyname, LIBS="$LIBS -l$lib";HAVE_GETHOSTBYNAME=1;AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [define if you have gethostbyname]))
-          fi
-        done    
-  fi    
+  AC_SEARCH_LIBS([socket], [socket inet])
+  AC_SEARCH_LIBS([connect], [nsl])
+  AC_SEARCH_LIBS([gethostbyname], [dns nsl resolv])
 
   dnl darwin wants it, aix hates it
   AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h)
@@ -1593,7 +1592,6 @@ AC_SUBST(BUILD_LOGIN)
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec flock)
 AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr)
 AC_CHECK_FUNCS(setvbuf vsyslog getcwd)
-AC_FUNC_SETVBUF_REVERSED
 AC_CHECK_FUNCS(regcomp regexec regerror)
 AC_MSG_CHECKING([for POSIX regex library])
 if test "$ac_cv_header_regex_h" = "yes" && \