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/trunk/configure (file contents):
Revision 1908 by michael, Sat Apr 27 21:25:11 2013 UTC vs.
Revision 2334 by michael, Sun Jun 23 17:32:44 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 1856 2013-04-24 19:43:22Z michael .
2 > # From configure.ac Id: configure.ac 2318 2013-06-21 17:47:52Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4   # Generated by GNU Autoconf 2.69 for ircd-hybrid TRUNK.
5   #
# Line 805 | Line 805 | with_included_ltdl
805   with_ltdl_include
806   with_ltdl_lib
807   enable_ltdl_install
808 < enable_libpcre
809 < enable_libGeoIP
808 > enable_libgeoip
809   enable_openssl
810   enable_assert
811   enable_kqueue
# Line 1462 | Line 1461 | Optional Features:
1461                            optimize for fast installation [default=yes]
1462    --disable-libtool-lock  avoid locking (might break parallel builds)
1463    --enable-ltdl-install   install libltdl
1465  --disable-libpcre       Disable PCRE support
1464    --disable-libgeoip      Disable GeoIP support
1465    --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
1466    --disable-openssl            Disable OpenSSL support.
# Line 1945 | Line 1943 | $as_echo "$ac_res" >&6; }
1943  
1944   } # ac_fn_c_check_type
1945  
1946 + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
1947 + # --------------------------------------------
1948 + # Tries to find the compile-time value of EXPR in a program that includes
1949 + # INCLUDES, setting VAR accordingly. Returns whether the value could be
1950 + # computed
1951 + ac_fn_c_compute_int ()
1952 + {
1953 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1954 +  if test "$cross_compiling" = yes; then
1955 +    # Depending upon the size, compute the lo and hi bounds.
1956 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1957 + /* end confdefs.h.  */
1958 + $4
1959 + int
1960 + main ()
1961 + {
1962 + static int test_array [1 - 2 * !(($2) >= 0)];
1963 + test_array [0] = 0;
1964 + return test_array [0];
1965 +
1966 +  ;
1967 +  return 0;
1968 + }
1969 + _ACEOF
1970 + if ac_fn_c_try_compile "$LINENO"; then :
1971 +  ac_lo=0 ac_mid=0
1972 +  while :; do
1973 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1974 + /* end confdefs.h.  */
1975 + $4
1976 + int
1977 + main ()
1978 + {
1979 + static int test_array [1 - 2 * !(($2) <= $ac_mid)];
1980 + test_array [0] = 0;
1981 + return test_array [0];
1982 +
1983 +  ;
1984 +  return 0;
1985 + }
1986 + _ACEOF
1987 + if ac_fn_c_try_compile "$LINENO"; then :
1988 +  ac_hi=$ac_mid; break
1989 + else
1990 +  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
1991 +                        if test $ac_lo -le $ac_mid; then
1992 +                          ac_lo= ac_hi=
1993 +                          break
1994 +                        fi
1995 +                        as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
1996 + fi
1997 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1998 +  done
1999 + else
2000 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2001 + /* end confdefs.h.  */
2002 + $4
2003 + int
2004 + main ()
2005 + {
2006 + static int test_array [1 - 2 * !(($2) < 0)];
2007 + test_array [0] = 0;
2008 + return test_array [0];
2009 +
2010 +  ;
2011 +  return 0;
2012 + }
2013 + _ACEOF
2014 + if ac_fn_c_try_compile "$LINENO"; then :
2015 +  ac_hi=-1 ac_mid=-1
2016 +  while :; do
2017 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2018 + /* end confdefs.h.  */
2019 + $4
2020 + int
2021 + main ()
2022 + {
2023 + static int test_array [1 - 2 * !(($2) >= $ac_mid)];
2024 + test_array [0] = 0;
2025 + return test_array [0];
2026 +
2027 +  ;
2028 +  return 0;
2029 + }
2030 + _ACEOF
2031 + if ac_fn_c_try_compile "$LINENO"; then :
2032 +  ac_lo=$ac_mid; break
2033 + else
2034 +  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
2035 +                        if test $ac_mid -le $ac_hi; then
2036 +                          ac_lo= ac_hi=
2037 +                          break
2038 +                        fi
2039 +                        as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
2040 + fi
2041 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2042 +  done
2043 + else
2044 +  ac_lo= ac_hi=
2045 + fi
2046 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2047 + fi
2048 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2049 + # Binary search between lo and hi bounds.
2050 + while test "x$ac_lo" != "x$ac_hi"; do
2051 +  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
2052 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2053 + /* end confdefs.h.  */
2054 + $4
2055 + int
2056 + main ()
2057 + {
2058 + static int test_array [1 - 2 * !(($2) <= $ac_mid)];
2059 + test_array [0] = 0;
2060 + return test_array [0];
2061 +
2062 +  ;
2063 +  return 0;
2064 + }
2065 + _ACEOF
2066 + if ac_fn_c_try_compile "$LINENO"; then :
2067 +  ac_hi=$ac_mid
2068 + else
2069 +  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
2070 + fi
2071 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2072 + done
2073 + case $ac_lo in #((
2074 + ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
2075 + '') ac_retval=1 ;;
2076 + esac
2077 +  else
2078 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2079 + /* end confdefs.h.  */
2080 + $4
2081 + static long int longval () { return $2; }
2082 + static unsigned long int ulongval () { return $2; }
2083 + #include <stdio.h>
2084 + #include <stdlib.h>
2085 + int
2086 + main ()
2087 + {
2088 +
2089 +  FILE *f = fopen ("conftest.val", "w");
2090 +  if (! f)
2091 +    return 1;
2092 +  if (($2) < 0)
2093 +    {
2094 +      long int i = longval ();
2095 +      if (i != ($2))
2096 +        return 1;
2097 +      fprintf (f, "%ld", i);
2098 +    }
2099 +  else
2100 +    {
2101 +      unsigned long int i = ulongval ();
2102 +      if (i != ($2))
2103 +        return 1;
2104 +      fprintf (f, "%lu", i);
2105 +    }
2106 +  /* Do not output a trailing newline, as this causes \r\n confusion
2107 +     on some platforms.  */
2108 +  return ferror (f) || fclose (f) != 0;
2109 +
2110 +  ;
2111 +  return 0;
2112 + }
2113 + _ACEOF
2114 + if ac_fn_c_try_run "$LINENO"; then :
2115 +  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
2116 + else
2117 +  ac_retval=1
2118 + fi
2119 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
2120 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
2121 + rm -f conftest.val
2122 +
2123 +  fi
2124 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2125 +  as_fn_set_status $ac_retval
2126 +
2127 + } # ac_fn_c_compute_int
2128 +
2129   # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
2130   # ----------------------------------------------------
2131   # Tries to find if the field MEMBER exists in type AGGR, after including
# Line 3010 | Line 3191 | mkdir_p='$(MKDIR_P)'
3191   # in the wild :-(  We should find a proper way to deprecate it ...
3192   AMTAR='$${TAR-tar}'
3193  
3194 +
3195 + # We'll loop over all known methods to create a tar archive until one works.
3196 + _am_tools='gnutar  pax cpio none'
3197 +
3198   am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
3199  
3200  
# Line 3017 | Line 3202 | am__tar='$${TAR-tar} chof - "$$tardir"'
3202  
3203  
3204  
3205 +
3206   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3207   $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3208      # Check whether --enable-maintainer-mode was given.
# Line 13067 | Line 13253 | eval "LTDLOPEN=\"$libname_spec\""
13253  
13254   LIBTOOL="$LIBTOOL --silent"
13255  
13256 + # The cast to long int works around a bug in the HP C Compiler
13257 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
13258 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
13259 + # This bug is HP SR number 8606223364.
13260 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
13261 + $as_echo_n "checking size of short... " >&6; }
13262 + if ${ac_cv_sizeof_short+:} false; then :
13263 +  $as_echo_n "(cached) " >&6
13264 + else
13265 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
13266 +
13267 + else
13268 +  if test "$ac_cv_type_short" = yes; then
13269 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13270 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13271 + as_fn_error 77 "cannot compute sizeof (short)
13272 + See \`config.log' for more details" "$LINENO" 5; }
13273 +   else
13274 +     ac_cv_sizeof_short=0
13275 +   fi
13276 + fi
13277 +
13278 + fi
13279 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
13280 + $as_echo "$ac_cv_sizeof_short" >&6; }
13281 +
13282 +
13283 +
13284 + cat >>confdefs.h <<_ACEOF
13285 + #define SIZEOF_SHORT $ac_cv_sizeof_short
13286 + _ACEOF
13287 +
13288 +
13289 + # The cast to long int works around a bug in the HP C Compiler
13290 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
13291 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
13292 + # This bug is HP SR number 8606223364.
13293 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
13294 + $as_echo_n "checking size of int... " >&6; }
13295 + if ${ac_cv_sizeof_int+:} false; then :
13296 +  $as_echo_n "(cached) " >&6
13297 + else
13298 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
13299 +
13300 + else
13301 +  if test "$ac_cv_type_int" = yes; then
13302 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13303 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13304 + as_fn_error 77 "cannot compute sizeof (int)
13305 + See \`config.log' for more details" "$LINENO" 5; }
13306 +   else
13307 +     ac_cv_sizeof_int=0
13308 +   fi
13309 + fi
13310 +
13311 + fi
13312 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
13313 + $as_echo "$ac_cv_sizeof_int" >&6; }
13314 +
13315 +
13316 +
13317 + cat >>confdefs.h <<_ACEOF
13318 + #define SIZEOF_INT $ac_cv_sizeof_int
13319 + _ACEOF
13320 +
13321 +
13322 + # The cast to long int works around a bug in the HP C Compiler
13323 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
13324 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
13325 + # This bug is HP SR number 8606223364.
13326 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
13327 + $as_echo_n "checking size of long... " >&6; }
13328 + if ${ac_cv_sizeof_long+:} false; then :
13329 +  $as_echo_n "(cached) " >&6
13330 + else
13331 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
13332 +
13333 + else
13334 +  if test "$ac_cv_type_long" = yes; then
13335 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13336 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13337 + as_fn_error 77 "cannot compute sizeof (long)
13338 + See \`config.log' for more details" "$LINENO" 5; }
13339 +   else
13340 +     ac_cv_sizeof_long=0
13341 +   fi
13342 + fi
13343 +
13344 + fi
13345 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
13346 + $as_echo "$ac_cv_sizeof_long" >&6; }
13347 +
13348 +
13349 +
13350 + cat >>confdefs.h <<_ACEOF
13351 + #define SIZEOF_LONG $ac_cv_sizeof_long
13352 + _ACEOF
13353 +
13354 +
13355 + # The cast to long int works around a bug in the HP C Compiler
13356 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
13357 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
13358 + # This bug is HP SR number 8606223364.
13359 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
13360 + $as_echo_n "checking size of void *... " >&6; }
13361 + if ${ac_cv_sizeof_void_p+:} false; then :
13362 +  $as_echo_n "(cached) " >&6
13363 + else
13364 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
13365 +
13366 + else
13367 +  if test "$ac_cv_type_void_p" = yes; then
13368 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13369 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13370 + as_fn_error 77 "cannot compute sizeof (void *)
13371 + See \`config.log' for more details" "$LINENO" 5; }
13372 +   else
13373 +     ac_cv_sizeof_void_p=0
13374 +   fi
13375 + fi
13376 +
13377 + fi
13378 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
13379 + $as_echo "$ac_cv_sizeof_void_p" >&6; }
13380 +
13381 +
13382 +
13383 + cat >>confdefs.h <<_ACEOF
13384 + #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
13385 + _ACEOF
13386 +
13387 +
13388 + # The cast to long int works around a bug in the HP C Compiler
13389 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
13390 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
13391 + # This bug is HP SR number 8606223364.
13392 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int64_t" >&5
13393 + $as_echo_n "checking size of int64_t... " >&6; }
13394 + if ${ac_cv_sizeof_int64_t+:} false; then :
13395 +  $as_echo_n "(cached) " >&6
13396 + else
13397 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int64_t))" "ac_cv_sizeof_int64_t"        "$ac_includes_default"; then :
13398 +
13399 + else
13400 +  if test "$ac_cv_type_int64_t" = yes; then
13401 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13402 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13403 + as_fn_error 77 "cannot compute sizeof (int64_t)
13404 + See \`config.log' for more details" "$LINENO" 5; }
13405 +   else
13406 +     ac_cv_sizeof_int64_t=0
13407 +   fi
13408 + fi
13409 +
13410 + fi
13411 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int64_t" >&5
13412 + $as_echo "$ac_cv_sizeof_int64_t" >&6; }
13413 +
13414 +
13415 +
13416 + cat >>confdefs.h <<_ACEOF
13417 + #define SIZEOF_INT64_T $ac_cv_sizeof_int64_t
13418 + _ACEOF
13419 +
13420 +
13421 + # The cast to long int works around a bug in the HP C Compiler
13422 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
13423 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
13424 + # This bug is HP SR number 8606223364.
13425 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
13426 + $as_echo_n "checking size of long long... " >&6; }
13427 + if ${ac_cv_sizeof_long_long+:} false; then :
13428 +  $as_echo_n "(cached) " >&6
13429 + else
13430 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
13431 +
13432 + else
13433 +  if test "$ac_cv_type_long_long" = yes; then
13434 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13435 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13436 + as_fn_error 77 "cannot compute sizeof (long long)
13437 + See \`config.log' for more details" "$LINENO" 5; }
13438 +   else
13439 +     ac_cv_sizeof_long_long=0
13440 +   fi
13441 + fi
13442 +
13443 + fi
13444 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
13445 + $as_echo "$ac_cv_sizeof_long_long" >&6; }
13446 +
13447 +
13448 +
13449 + cat >>confdefs.h <<_ACEOF
13450 + #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
13451 + _ACEOF
13452 +
13453 +
13454 +
13455 + if test "$ac_cv_sizeof_int" = 2 ; then
13456 +  ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
13457 + if test "x$ac_cv_type_int16_t" = xyes; then :
13458 +
13459 + else
13460 +
13461 + cat >>confdefs.h <<_ACEOF
13462 + #define int16_t int
13463 + _ACEOF
13464 +
13465 + fi
13466 +
13467 +  ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
13468 + if test "x$ac_cv_type_uint16_t" = xyes; then :
13469 +
13470 + else
13471 +
13472 + cat >>confdefs.h <<_ACEOF
13473 + #define uint16_t unsigned int
13474 + _ACEOF
13475 +
13476 + fi
13477 +
13478 + elif test "$ac_cv_sizeof_short" = 2 ; then
13479 +  ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
13480 + if test "x$ac_cv_type_int16_t" = xyes; then :
13481 +
13482 + else
13483 +
13484 + cat >>confdefs.h <<_ACEOF
13485 + #define int16_t short
13486 + _ACEOF
13487 +
13488 + fi
13489 +
13490 +  ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
13491 + if test "x$ac_cv_type_uint16_t" = xyes; then :
13492 +
13493 + else
13494 +
13495 + cat >>confdefs.h <<_ACEOF
13496 + #define uint16_t unsigned short
13497 + _ACEOF
13498 +
13499 + fi
13500 +
13501 + else
13502 +  as_fn_error $? "Cannot find a type with size of 16 bits" "$LINENO" 5
13503 + fi
13504 + if test "$ac_cv_sizeof_int" = 4 ; then
13505 +  ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
13506 + if test "x$ac_cv_type_int32_t" = xyes; then :
13507 +
13508 + else
13509 +
13510 + cat >>confdefs.h <<_ACEOF
13511 + #define int32_t int
13512 + _ACEOF
13513 +
13514 + fi
13515 +
13516 +  ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
13517 + if test "x$ac_cv_type_uint32_t" = xyes; then :
13518 +
13519 + else
13520 +
13521 + cat >>confdefs.h <<_ACEOF
13522 + #define uint32_t unsigned int
13523 + _ACEOF
13524 +
13525 + fi
13526 +
13527 + elif test "$ac_cv_sizeof_short" = 4 ; then
13528 +  ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
13529 + if test "x$ac_cv_type_int32_t" = xyes; then :
13530 +
13531 + else
13532 +
13533 + cat >>confdefs.h <<_ACEOF
13534 + #define int32_t short
13535 + _ACEOF
13536 +
13537 + fi
13538 +
13539 +  ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
13540 + if test "x$ac_cv_type_uint32_t" = xyes; then :
13541 +
13542 + else
13543 +
13544 + cat >>confdefs.h <<_ACEOF
13545 + #define uint32_t unsigned short
13546 + _ACEOF
13547 +
13548 + fi
13549 +
13550 + elif test "$ac_cv_sizeof_long" = 4 ; then
13551 +  ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
13552 + if test "x$ac_cv_type_int32_t" = xyes; then :
13553 +
13554 + else
13555 +
13556 + cat >>confdefs.h <<_ACEOF
13557 + #define int32_t long
13558 + _ACEOF
13559 +
13560 + fi
13561 +
13562 +  ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
13563 + if test "x$ac_cv_type_uint32_t" = xyes; then :
13564 +
13565 + else
13566 +
13567 + cat >>confdefs.h <<_ACEOF
13568 + #define uint32_t unsigned long
13569 + _ACEOF
13570 +
13571 + fi
13572 +
13573 + else
13574 +  as_fn_error $? "Cannot find a type with size of 32 bits" "$LINENO" 5
13575 + fi
13576 + if test "$ac_cv_sizeof_int64_t" = 8 ; then
13577 +  ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
13578 + if test "x$ac_cv_type_int64_t" = xyes; then :
13579 +
13580 + fi
13581 +
13582 +  ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
13583 + if test "x$ac_cv_type_uint64_t" = xyes; then :
13584 +
13585 + fi
13586 +
13587 + elif test "$ac_cv_sizeof_long_long" = 8 ; then
13588 +  ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
13589 + if test "x$ac_cv_type_int64_t" = xyes; then :
13590 +
13591 + else
13592 +
13593 + cat >>confdefs.h <<_ACEOF
13594 + #define int64_t long long
13595 + _ACEOF
13596 +
13597 + fi
13598 +
13599 +  ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
13600 + if test "x$ac_cv_type_uint64_t" = xyes; then :
13601 +
13602 + else
13603 +
13604 + cat >>confdefs.h <<_ACEOF
13605 + #define uint64_t unsigned long long
13606 + _ACEOF
13607 +
13608 + fi
13609 +
13610 + else
13611 +  as_fn_error $? "Cannot find a type with size of 64 bits" "$LINENO" 5
13612 + fi
13613 +
13614 +
13615   # Checks for libraries.
13616  
13617    ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
# Line 13658 | Line 14203 | if test "$ac_res" != no; then :
14203   fi
14204  
14205  
14206 < # Check whether --enable-libpcre was given.
14207 < if test "${enable_libpcre+set}" = set; then :
14208 <  enableval=$enable_libpcre;
13664 < else
13665 <  ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
13666 < if test "x$ac_cv_header_pcre_h" = xyes; then :
13667 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pcre_study" >&5
13668 < $as_echo_n "checking for library containing pcre_study... " >&6; }
13669 < if ${ac_cv_search_pcre_study+:} false; then :
13670 <  $as_echo_n "(cached) " >&6
13671 < else
13672 <  ac_func_search_save_LIBS=$LIBS
13673 < cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13674 < /* end confdefs.h.  */
13675 <
13676 < /* Override any GCC internal prototype to avoid an error.
13677 <   Use char because int might match the return type of a GCC
13678 <   builtin and then its argument prototype would still apply.  */
13679 < #ifdef __cplusplus
13680 < extern "C"
13681 < #endif
13682 < char pcre_study ();
13683 < int
13684 < main ()
13685 < {
13686 < return pcre_study ();
13687 <  ;
13688 <  return 0;
13689 < }
13690 < _ACEOF
13691 < for ac_lib in '' pcre; do
13692 <  if test -z "$ac_lib"; then
13693 <    ac_res="none required"
13694 <  else
13695 <    ac_res=-l$ac_lib
13696 <    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13697 <  fi
13698 <  if ac_fn_c_try_link "$LINENO"; then :
13699 <  ac_cv_search_pcre_study=$ac_res
13700 < fi
13701 < rm -f core conftest.err conftest.$ac_objext \
13702 <    conftest$ac_exeext
13703 <  if ${ac_cv_search_pcre_study+:} false; then :
13704 <  break
13705 < fi
13706 < done
13707 < if ${ac_cv_search_pcre_study+:} false; then :
13708 <
13709 < else
13710 <  ac_cv_search_pcre_study=no
13711 < fi
13712 < rm conftest.$ac_ext
13713 < LIBS=$ac_func_search_save_LIBS
13714 < fi
13715 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pcre_study" >&5
13716 < $as_echo "$ac_cv_search_pcre_study" >&6; }
13717 < ac_res=$ac_cv_search_pcre_study
13718 < if test "$ac_res" != no; then :
13719 <  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13720 <
13721 < $as_echo "#define HAVE_LIBPCRE 1" >>confdefs.h
13722 <
13723 < fi
13724 <
13725 < fi
13726 <
13727 <
13728 < fi
13729 <
13730 <
13731 < # Check whether --enable-libGeoIP was given.
13732 < if test "${enable_libGeoIP+set}" = set; then :
13733 <  enableval=$enable_libGeoIP;
14206 > # Check whether --enable-libgeoip was given.
14207 > if test "${enable_libgeoip+set}" = set; then :
14208 >  enableval=$enable_libgeoip;
14209   else
14210    ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
14211   if test "x$ac_cv_header_GeoIP_h" = xyes; then :
# Line 13852 | Line 14327 | $as_echo "disabled" >&6; }
14327   fi
14328  
14329   if test "$cf_enable_openssl" != "no"; then :
14330 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8s or above" >&5
14331 < $as_echo_n "checking for OpenSSL 0.9.8s or above... " >&6; }
14330 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
14331 > $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
14332    if test "$cross_compiling" = yes; then :
14333    cf_openssl_version_ok=no
14334   else
# Line 13866 | Line 14341 | else
14341   int
14342   main ()
14343   {
14344 < exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f));
14344 > exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
14345    ;
14346    return 0;
14347   }
# Line 14010 | Line 14485 | $as_echo "#define NDEBUG 1" >>confdefs.h
14485   fi
14486  
14487  
14013
14488   $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
14489  
14490  
14491 < $as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h
14491 > $as_echo "#define MP_CHUNK_SIZE_CHANNEL 1024*1024" >>confdefs.h
14492  
14493  
14494 < $as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h
14494 > $as_echo "#define MP_CHUNK_SIZE_MEMBER 2048*1024" >>confdefs.h
14495  
14496  
14497 < $as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h
14497 > $as_echo "#define MP_CHUNK_SIZE_BAN 1024*1024" >>confdefs.h
14498  
14499  
14500 < $as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h
14500 > $as_echo "#define MP_CHUNK_SIZE_CLIENT 1024*1024" >>confdefs.h
14501  
14502  
14503 < $as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h
14503 > $as_echo "#define MP_CHUNK_SIZE_LCLIENT 512*1024" >>confdefs.h
14504  
14505  
14506 < $as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h
14506 > $as_echo "#define MP_CHUNK_SIZE_DNODE 32*1024" >>confdefs.h
14507  
14508  
14509   $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
14510  
14511  
14512 < $as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h
14512 > $as_echo "#define MP_CHUNK_SIZE_AUTH 128*1024" >>confdefs.h
14513 >
14514 >
14515 > $as_echo "#define MP_CHUNK_SIZE_DNS 64*1024" >>confdefs.h
14516 >
14517 >
14518 > $as_echo "#define MP_CHUNK_SIZE_WATCH 8*1024" >>confdefs.h
14519 >
14520 >
14521 > $as_echo "#define MP_CHUNK_SIZE_NAMEHOST 64*1024" >>confdefs.h
14522  
14523  
14524 < $as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h
14524 > $as_echo "#define MP_CHUNK_SIZE_USERHOST 128*1024" >>confdefs.h
14525  
14526  
14527 < $as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h
14527 > $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY 128*1024" >>confdefs.h
14528  
14529  
14530   # Argument processing.
# Line 14515 | Line 14998 | _ACEOF
14998    test "$exec_prefix_NONE" && exec_prefix=NONE
14999  
15000  
15001 < ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile help/opers/Makefile help/users/Makefile tools/Makefile"
15001 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile tools/Makefile"
15002  
15003  
15004   cat >confcache <<\_ACEOF
# Line 15564 | Line 16047 | do
16047      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
16048      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
16049      "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
15567    "help/opers/Makefile") CONFIG_FILES="$CONFIG_FILES help/opers/Makefile" ;;
15568    "help/users/Makefile") CONFIG_FILES="$CONFIG_FILES help/users/Makefile" ;;
16050      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
16051  
16052    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
# Line 16214 | Line 16695 | $as_echo X"$mf" |
16695      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
16696      test -z "$DEPDIR" && continue
16697      am__include=`sed -n 's/^am__include = //p' < "$mf"`
16698 <    test -z "am__include" && continue
16698 >    test -z "$am__include" && continue
16699      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
16700      # Find all dependency output files, they are included files with
16701      # $(DEPDIR) in their names.  We invoke sed twice because it is the

Diff Legend

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