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

Comparing ircd-hybrid/branches/8.2.x/configure (file contents):
Revision 4294 by michael, Sun Jul 20 10:33:10 2014 UTC vs.
Revision 4362 by michael, Sat Aug 2 20:52:06 2014 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 4181 2014-07-06 13:11:44Z michael .
2 > # From configure.ac Id: configure.ac 4359 2014-08-02 20:37:47Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4   # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.0rc1.
5   #
# Line 812 | Line 812 | enable_kqueue
812   enable_epoll
813   enable_devpoll
814   enable_poll
815 – enable_select
815   enable_debugging
816   enable_warnings
817   '
# Line 1468 | Line 1467 | Optional Features:
1467    --enable-epoll          Force epoll usage.
1468    --enable-devpoll        Force devpoll usage.
1469    --enable-poll           Force poll usage.
1471 –  --enable-select         Force select usage.
1470    --enable-debugging      Enable debugging.
1471    --enable-warnings       Enable compiler warnings.
1472  
# Line 1941 | Line 1939 | $as_echo "$ac_res" >&6; }
1939  
1940   } # ac_fn_c_check_type
1941  
1944 – # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
1945 – # ----------------------------------------------------
1946 – # Tries to find if the field MEMBER exists in type AGGR, after including
1947 – # INCLUDES, setting cache variable VAR accordingly.
1948 – ac_fn_c_check_member ()
1949 – {
1950 –  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1951 –  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
1952 – $as_echo_n "checking for $2.$3... " >&6; }
1953 – if eval \${$4+:} false; then :
1954 –  $as_echo_n "(cached) " >&6
1955 – else
1956 –  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1957 – /* end confdefs.h.  */
1958 – $5
1959 – int
1960 – main ()
1961 – {
1962 – static $2 ac_aggr;
1963 – if (ac_aggr.$3)
1964 – return 0;
1965 –  ;
1966 –  return 0;
1967 – }
1968 – _ACEOF
1969 – if ac_fn_c_try_compile "$LINENO"; then :
1970 –  eval "$4=yes"
1971 – else
1972 –  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1973 – /* end confdefs.h.  */
1974 – $5
1975 – int
1976 – main ()
1977 – {
1978 – static $2 ac_aggr;
1979 – if (sizeof ac_aggr.$3)
1980 – return 0;
1981 –  ;
1982 –  return 0;
1983 – }
1984 – _ACEOF
1985 – if ac_fn_c_try_compile "$LINENO"; then :
1986 –  eval "$4=yes"
1987 – else
1988 –  eval "$4=no"
1989 – fi
1990 – rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1991 – fi
1992 – rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1993 – fi
1994 – eval ac_res=\$$4
1995 –               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1996 – $as_echo "$ac_res" >&6; }
1997 –  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1998 –
1999 – } # ac_fn_c_check_member
2000 –
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 13215 | Line 13156 | $as_echo "#define ENABLE_SSP_CC 1" >>con
13156    fi
13157  
13158  
13159 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libssp exists" >&5
13160 + $as_echo_n "checking whether libssp exists... " >&6; }
13161 + if ${ssp_cv_lib+:} false; then :
13162 +  $as_echo_n "(cached) " >&6
13163 + else
13164 +  ssp_old_libs="$LIBS"
13165 +     LIBS="$LIBS -lssp"
13166 +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13167 + /* end confdefs.h.  */
13168 +
13169 + int
13170 + main ()
13171 + {
13172 +
13173 +  ;
13174 +  return 0;
13175 + }
13176 + _ACEOF
13177 + if ac_fn_c_try_link "$LINENO"; then :
13178 +  ssp_cv_lib=yes
13179 + else
13180 +  ssp_cv_lib=no
13181 + fi
13182 + rm -f core conftest.err conftest.$ac_objext \
13183 +    conftest$ac_exeext conftest.$ac_ext
13184 +     LIBS="$ssp_old_libs"
13185 +
13186 + fi
13187 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssp_cv_lib" >&5
13188 + $as_echo "$ssp_cv_lib" >&6; }
13189 +  if test $ssp_cv_lib = yes; then
13190 +    LIBS="$LIBS -lssp"
13191 +  fi
13192 +
13193 +
13194  
13195  
13196  
# Line 13281 | Line 13257 | fi
13257   done
13258  
13259  
13284 –
13260    ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13261   if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13262  
# Line 13464 | 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 13504 | Line 13487 | _ACEOF
13487  
13488   fi
13489  
13507 –  ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#include <sys/types.h>
13508 –  <sys/socket.h>
13509 – "
13510 – if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then :
13511 –
13512 – cat >>confdefs.h <<_ACEOF
13513 – #define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
13514 – _ACEOF
13515 –
13516 –
13517 – fi
13518 –
13519 –
13520 –
13521 –  ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include <netinet/in.h>
13522 – "
13523 – if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
13524 –
13525 – $as_echo "#define IPV6 1" >>confdefs.h
13526 –
13527 – fi
13528 –
13490  
13491  
13492   # Checks for typedefs, structures, and compiler characteristics.
# Line 13996 | Line 13957 | $as_echo "disabled" >&6; }
13957   fi
13958  
13959   if test "$cf_enable_openssl" != "no"; then :
13960 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8m or above" >&5
13961 < $as_echo_n "checking for OpenSSL 0.9.8m or above... " >&6; }
13960 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8o or above" >&5
13961 > $as_echo_n "checking for OpenSSL 0.9.8o or above... " >&6; }
13962    if test "$cross_compiling" = yes; then :
13963    cf_openssl_version_ok=no
13964   else
# Line 14010 | Line 13971 | else
13971   int
13972   main ()
13973   {
13974 < exit(!(OPENSSL_VERSION_NUMBER >= 0x009080dfL));
13974 > exit(!(OPENSSL_VERSION_NUMBER >= 0x009080ffL));
13975    ;
13976    return 0;
13977   }
# Line 14198 | 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 14219 | Line 14181 | if test "${enable_poll+set}" = set; then
14181    enableval=$enable_poll; desired_iopoll_mechanism="poll"
14182   fi
14183  
14222 –  # Check whether --enable-select was given.
14223 – if test "${enable_select+set}" = set; then :
14224 –  enableval=$enable_select; desired_iopoll_mechanism="select"
14225 – fi
14184  
14185 <      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimal/desired iopoll mechanism" >&5
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 14286 | 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
14254   _ACEOF
14255  
14295 –  if test "$cross_compiling" = yes; then :
14296 –  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14297 – $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14298 – as_fn_error $? "cannot run test program while cross compiling
14299 – See \`config.log' for more details" "$LINENO" 5; }
14300 – else
14256    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14257   /* end confdefs.h.  */
14303 –
14258   #include <sys/epoll.h>
14305 – #include <sys/syscall.h>
14306 – #if defined(__stub_epoll_create) || defined(__stub___epoll_create) || defined(EPOLL_NEED_BODY)
14307 – #if !defined(__NR_epoll_create)
14308 – #if defined(__ia64__)
14309 – #define __NR_epoll_create 1243
14310 – #elif defined(__x86_64__)
14311 – #define __NR_epoll_create 214
14312 – #elif defined(__sparc64__) || defined(__sparc__)
14313 – #define __NR_epoll_create 193
14314 – #elif defined(__s390__) || defined(__m68k__)
14315 – #define __NR_epoll_create 249
14316 – #elif defined(__ppc64__) || defined(__ppc__)
14317 – #define __NR_epoll_create 236
14318 – #elif defined(__parisc__) || defined(__arm26__) || defined(__arm__)
14319 – #define __NR_epoll_create 224
14320 – #elif defined(__alpha__)
14321 – #define __NR_epoll_create 407
14322 – #elif defined(__sh64__)
14323 – #define __NR_epoll_create 282
14324 – #elif defined(__i386__) || defined(__sh__) || defined(__m32r__) || defined(__h8300__) || defined(__frv__)
14325 – #define __NR_epoll_create 254
14326 – #else
14327 – #error No system call numbers defined for epoll family.
14328 – #endif
14329 – #endif
14330 – _syscall1(int, epoll_create, int, size)
14331 – #endif
14332 –
14259   int
14260   main ()
14261   {
14262 < return epoll_create(256) == -1 ? 1 : 0
14262 > epoll_create(256);
14263    ;
14264    return 0;
14265   }
14266   _ACEOF
14267 < if ac_fn_c_try_run "$LINENO"; then :
14267 > if ac_fn_c_try_link "$LINENO"; then :
14268    is_epoll_mechanism_available="yes"
14269   else
14270    is_epoll_mechanism_available="no"
14271   fi
14272 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14273 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
14348 < fi
14272 > rm -f core conftest.err conftest.$ac_objext \
14273 >    conftest$ac_exeext conftest.$ac_ext
14274  
14275 <      iopoll_mechanism_devpoll=3
14275 >  iopoll_mechanism_devpoll=3
14276  
14277   cat >>confdefs.h <<_ACEOF
14278   #define __IOPOLL_MECHANISM_DEVPOLL $iopoll_mechanism_devpoll
# Line 14397 | 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 14451 | Line 14377 | else
14377   fi
14378   rm -f core conftest.err conftest.$ac_objext \
14379      conftest$ac_exeext conftest.$ac_ext
14454 –      iopoll_mechanism_select=5
14455 –
14456 – cat >>confdefs.h <<_ACEOF
14457 – #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
14458 – _ACEOF
14459 –
14460 –  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14461 – /* end confdefs.h.  */
14462 – /* Define select to an innocuous variant, in case <limits.h> declares select.
14463 –   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
14464 – #define select innocuous_select
14380  
14381 < /* System header to define __stub macros and hopefully few prototypes,
14382 <    which can conflict with char select (); below.
14468 <    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
14469 <    <limits.h> exists even on freestanding compilers.  */
14470 <
14471 < #ifdef __STDC__
14472 < # include <limits.h>
14473 < #else
14474 < # include <assert.h>
14475 < #endif
14476 <
14477 < #undef select
14478 <
14479 < /* Override any GCC internal prototype to avoid an error.
14480 <   Use char because int might match the return type of a GCC
14481 <   builtin and then its argument prototype would still apply.  */
14482 < #ifdef __cplusplus
14483 < extern "C"
14484 < #endif
14485 < char select ();
14486 < /* The GNU C library defines this for functions which it implements
14487 <    to always fail with ENOSYS.  Some functions are actually named
14488 <    something starting with __ and the normal name is an alias.  */
14489 < #if defined __stub_select || defined __stub___select
14490 < choke me
14491 < #endif
14492 <
14493 < int
14494 < main ()
14495 < {
14496 < return select ();
14497 <  ;
14498 <  return 0;
14499 < }
14500 < _ACEOF
14501 < if ac_fn_c_try_link "$LINENO"; then :
14502 <  is_select_mechanism_available="yes"
14503 < else
14504 <  is_select_mechanism_available="no"
14505 < fi
14506 < rm -f core conftest.err conftest.$ac_objext \
14507 <    conftest$ac_exeext conftest.$ac_ext
14508 <      optimal_iopoll_mechanism="none"
14509 <  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
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
14385        optimal_iopoll_mechanism="$mechanism"
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 14535 | 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 14562 | 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)