ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/configure
(Generate patch)

Comparing ircd-hybrid/trunk/configure (file contents):
Revision 4357 by michael, Sat Aug 2 18:31:44 2014 UTC vs.
Revision 4361 by michael, Sat Aug 2 20:51:40 2014 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 3724 2014-05-31 16:27:09Z michael .
2 > # From configure.ac Id: configure.ac 4360 2014-08-02 20:40:29Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4   # Generated by GNU Autoconf 2.69 for ircd-hybrid TRUNK.
5   #
# Line 1939 | Line 1939 | $as_echo "$ac_res" >&6; }
1939  
1940   } # ac_fn_c_check_type
1941  
1942 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
1943 # ----------------------------------------------------
1944 # Tries to find if the field MEMBER exists in type AGGR, after including
1945 # INCLUDES, setting cache variable VAR accordingly.
1946 ac_fn_c_check_member ()
1947 {
1948  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1949  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
1950 $as_echo_n "checking for $2.$3... " >&6; }
1951 if eval \${$4+:} false; then :
1952  $as_echo_n "(cached) " >&6
1953 else
1954  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1955 /* end confdefs.h.  */
1956 $5
1957 int
1958 main ()
1959 {
1960 static $2 ac_aggr;
1961 if (ac_aggr.$3)
1962 return 0;
1963  ;
1964  return 0;
1965 }
1966 _ACEOF
1967 if ac_fn_c_try_compile "$LINENO"; then :
1968  eval "$4=yes"
1969 else
1970  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1971 /* end confdefs.h.  */
1972 $5
1973 int
1974 main ()
1975 {
1976 static $2 ac_aggr;
1977 if (sizeof ac_aggr.$3)
1978 return 0;
1979  ;
1980  return 0;
1981 }
1982 _ACEOF
1983 if ac_fn_c_try_compile "$LINENO"; then :
1984  eval "$4=yes"
1985 else
1986  eval "$4=no"
1987 fi
1988 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1989 fi
1990 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1991 fi
1992 eval ac_res=\$$4
1993               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1994 $as_echo "$ac_res" >&6; }
1995  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1996
1997 } # ac_fn_c_check_member
1998
1942   # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1943   # -------------------------------------------------------
1944   # Tests whether HEADER exists, giving a warning if it cannot be compiled using
# Line 13314 | Line 13257 | fi
13257   done
13258  
13259  
13317
13260    ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13261   if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13262  
# Line 13497 | Line 13439 | else
13439    as_fn_error $? "socket library not found" "$LINENO" 5
13440   fi
13441  
13442 +  ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include <netinet/in.h>
13443 + "
13444 + if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
13445 +
13446 + $as_echo "#define IPV6 1" >>confdefs.h
13447 +
13448 + fi
13449 +
13450    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13451     #include <sys/socket.h>
13452     #include <netdb.h>
# Line 13537 | Line 13487 | _ACEOF
13487  
13488   fi
13489  
13540  ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#include <sys/types.h>
13541  <sys/socket.h>
13542 "
13543 if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then :
13544
13545 cat >>confdefs.h <<_ACEOF
13546 #define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
13547 _ACEOF
13548
13549
13550 fi
13551
13552
13553
13554  ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include <netinet/in.h>
13555 "
13556 if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
13557
13558 $as_echo "#define IPV6 1" >>confdefs.h
13559
13560 fi
13561
13490  
13491  
13492   # Checks for typedefs, structures, and compiler characteristics.
# Line 14231 | Line 14159 | $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY
14159  
14160   # Argument processing.
14161  
14162 <    desired_iopoll_mechanism="none"
14163 <    # Check whether --enable-kqueue was given.
14162 >  desired_iopoll_mechanism="none"
14163 >
14164 >  # Check whether --enable-kqueue was given.
14165   if test "${enable_kqueue+set}" = set; then :
14166    enableval=$enable_kqueue; desired_iopoll_mechanism="kqueue"
14167   fi
# Line 14252 | Line 14181 | if test "${enable_poll+set}" = set; then
14181    enableval=$enable_poll; desired_iopoll_mechanism="poll"
14182   fi
14183  
14184 <      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimal/desired iopoll mechanism" >&5
14184 >
14185 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimal/desired iopoll mechanism" >&5
14186   $as_echo_n "checking for optimal/desired iopoll mechanism... " >&6; }
14187 +
14188    iopoll_mechanism_none=0
14189  
14190   cat >>confdefs.h <<_ACEOF
14191   #define __IOPOLL_MECHANISM_NONE $iopoll_mechanism_none
14192   _ACEOF
14193  
14194 <      iopoll_mechanism_kqueue=1
14194 >
14195 >  iopoll_mechanism_kqueue=1
14196  
14197   cat >>confdefs.h <<_ACEOF
14198   #define __IOPOLL_MECHANISM_KQUEUE $iopoll_mechanism_kqueue
# Line 14314 | Line 14246 | else
14246   fi
14247   rm -f core conftest.err conftest.$ac_objext \
14248      conftest$ac_exeext conftest.$ac_ext
14249 <      iopoll_mechanism_epoll=2
14249 >
14250 >  iopoll_mechanism_epoll=2
14251  
14252   cat >>confdefs.h <<_ACEOF
14253   #define __IOPOLL_MECHANISM_EPOLL $iopoll_mechanism_epoll
# Line 14338 | Line 14271 | else
14271   fi
14272   rm -f core conftest.err conftest.$ac_objext \
14273      conftest$ac_exeext conftest.$ac_ext
14274 <      iopoll_mechanism_devpoll=3
14274 >
14275 >  iopoll_mechanism_devpoll=3
14276  
14277   cat >>confdefs.h <<_ACEOF
14278   #define __IOPOLL_MECHANISM_DEVPOLL $iopoll_mechanism_devpoll
# Line 14388 | Line 14322 | rm -f core conftest.err conftest.$ac_obj
14322   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14323  
14324    fi
14325 <      iopoll_mechanism_poll=4
14325 >
14326 >  iopoll_mechanism_poll=4
14327  
14328   cat >>confdefs.h <<_ACEOF
14329   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14442 | Line 14377 | else
14377   fi
14378   rm -f core conftest.err conftest.$ac_objext \
14379      conftest$ac_exeext conftest.$ac_ext
14380 <      optimal_iopoll_mechanism="none"
14380 >
14381 >  optimal_iopoll_mechanism="none"
14382    for mechanism in "kqueue" "epoll" "devpoll" "poll" ; do # order is important
14383      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14384      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
# Line 14450 | Line 14386 | rm -f core conftest.err conftest.$ac_obj
14386        break
14387      fi
14388    done
14389 <      if test "$desired_iopoll_mechanism" = "none" ; then
14389 >
14390 >  if test "$desired_iopoll_mechanism" = "none" ; then
14391      if test "$optimal_iopoll_mechanism" = "none" ; then
14392        { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
14393   $as_echo "none" >&6; }
# Line 14472 | Line 14409 | $as_echo "none" >&6; }
14409        as_fn_error $? "desired iopoll mechanism, $desired_iopoll_mechanism, is not available" "$LINENO" 5
14410      fi
14411    fi
14412 <      eval "use_iopoll_mechanism=\$iopoll_mechanism_${selected_iopoll_mechanism}"
14412 >
14413 >  eval "use_iopoll_mechanism=\$iopoll_mechanism_${selected_iopoll_mechanism}"
14414  
14415   cat >>confdefs.h <<_ACEOF
14416   #define USE_IOPOLL_MECHANISM $use_iopoll_mechanism
# Line 14499 | Line 14437 | else
14437    warnings="no"
14438   fi
14439  
14440 +
14441    if test "$warnings" = "yes" ; then
14442  
14443  

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)