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 1921 by michael, Tue Apr 30 14:54:20 2013 UTC vs.
Revision 2382 by michael, Sat Jul 6 16:31:07 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 1908 2013-04-27 21:25:11Z michael .
2 > # From configure.ac Id: configure.ac 2347 2013-07-03 19:09:32Z 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_libGeoIP
808 > enable_libgeoip
809   enable_openssl
810   enable_assert
811   enable_kqueue
# Line 2453 | Line 2453 | ac_link='$CC -o conftest$ac_exeext $CFLA
2453   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2454  
2455  
2456 < am__api_version='1.13'
2456 > am__api_version='1.14'
2457  
2458   ac_aux_dir=
2459   for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
# Line 3008 | Line 3008 | mkdir_p='$(MKDIR_P)'
3008   # in the wild :-(  We should find a proper way to deprecate it ...
3009   AMTAR='$${TAR-tar}'
3010  
3011 +
3012 + # We'll loop over all known methods to create a tar archive until one works.
3013 + _am_tools='gnutar  pax cpio none'
3014 +
3015   am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
3016  
3017  
# Line 3015 | Line 3019 | am__tar='$${TAR-tar} chof - "$$tardir"'
3019  
3020  
3021  
3022 + # POSIX will say in a future version that running "rm -f" with no argument
3023 + # is OK; and we want to be able to make that assumption in our Makefile
3024 + # recipes.  So use an aggressive probe to check that the usage we want is
3025 + # actually supported "in the wild" to an acceptable degree.
3026 + # See automake bug#10828.
3027 + # To make any issue more visible, cause the running configure to be aborted
3028 + # by default if the 'rm' program in use doesn't match our expectations; the
3029 + # user can still override this though.
3030 + if rm -f && rm -fr && rm -rf; then : OK; else
3031 +  cat >&2 <<'END'
3032 + Oops!
3033 +
3034 + Your 'rm' program seems unable to run without file operands specified
3035 + on the command line, even when the '-f' option is present.  This is contrary
3036 + to the behaviour of most rm programs out there, and not conforming with
3037 + the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3038 +
3039 + Please tell bug-automake@gnu.org about your system, including the value
3040 + of your $PATH and any error possibly output before this message.  This
3041 + can help us improve future automake versions.
3042 +
3043 + END
3044 +  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3045 +    echo 'Configuration will proceed anyway, since you have set the' >&2
3046 +    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3047 +    echo >&2
3048 +  else
3049 +    cat >&2 <<'END'
3050 + Aborting the configuration process, to ensure you take notice of the issue.
3051 +
3052 + You can download and install GNU coreutils to get an 'rm' implementation
3053 + that behaves properly: <http://www.gnu.org/software/coreutils/>.
3054 +
3055 + If you want to complete the configuration process using your problematic
3056 + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3057 + to "yes", and re-run configure.
3058 +
3059 + END
3060 +    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3061 +  fi
3062 + fi
3063 +
3064   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3065   $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3066      # Check whether --enable-maintainer-mode was given.
# Line 3894 | Line 3940 | ac_compile='$CC -c $CFLAGS $CPPFLAGS con
3940   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3941   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3942  
3943 + ac_ext=c
3944 + ac_cpp='$CPP $CPPFLAGS'
3945 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3946 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3947 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3948 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
3949 + $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
3950 + if ${am_cv_prog_cc_c_o+:} false; then :
3951 +  $as_echo_n "(cached) " >&6
3952 + else
3953 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3954 + /* end confdefs.h.  */
3955 +
3956 + int
3957 + main ()
3958 + {
3959 +
3960 +  ;
3961 +  return 0;
3962 + }
3963 + _ACEOF
3964 +  # Make sure it works both with $CC and with simple cc.
3965 +  # Following AC_PROG_CC_C_O, we do the test twice because some
3966 +  # compilers refuse to overwrite an existing .o file with -o,
3967 +  # though they will create one.
3968 +  am_cv_prog_cc_c_o=yes
3969 +  for am_i in 1 2; do
3970 +    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
3971 +   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
3972 +   ac_status=$?
3973 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3974 +   (exit $ac_status); } \
3975 +         && test -f conftest2.$ac_objext; then
3976 +      : OK
3977 +    else
3978 +      am_cv_prog_cc_c_o=no
3979 +      break
3980 +    fi
3981 +  done
3982 +  rm -f core conftest*
3983 +  unset am_i
3984 + fi
3985 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
3986 + $as_echo "$am_cv_prog_cc_c_o" >&6; }
3987 + if test "$am_cv_prog_cc_c_o" != yes; then
3988 +   # Losing compiler, so override with the script.
3989 +   # FIXME: It is wrong to rewrite CC.
3990 +   # But if we don't then we get into trouble of one sort or another.
3991 +   # A longer-term fix would be to have automake use am__CC in this case,
3992 +   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3993 +   CC="$am_aux_dir/compile $CC"
3994 + fi
3995 + ac_ext=c
3996 + ac_cpp='$CPP $CPPFLAGS'
3997 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3998 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3999 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
4000 +
4001 +
4002   depcc="$CC"   am_compiler_list=
4003  
4004   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
# Line 13656 | Line 13761 | if test "$ac_res" != no; then :
13761   fi
13762  
13763  
13764 < # Check whether --enable-libGeoIP was given.
13765 < if test "${enable_libGeoIP+set}" = set; then :
13766 <  enableval=$enable_libGeoIP;
13764 > # Check whether --enable-libgeoip was given.
13765 > if test "${enable_libgeoip+set}" = set; then :
13766 >  enableval=$enable_libgeoip;
13767   else
13768    ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13769   if test "x$ac_cv_header_GeoIP_h" = xyes; then :
# Line 13780 | Line 13885 | $as_echo "disabled" >&6; }
13885   fi
13886  
13887   if test "$cf_enable_openssl" != "no"; then :
13888 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8s or above" >&5
13889 < $as_echo_n "checking for OpenSSL 0.9.8s or above... " >&6; }
13888 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
13889 > $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
13890    if test "$cross_compiling" = yes; then :
13891    cf_openssl_version_ok=no
13892   else
# Line 13794 | Line 13899 | else
13899   int
13900   main ()
13901   {
13902 < exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f));
13902 > exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
13903    ;
13904    return 0;
13905   }
# Line 13938 | Line 14043 | $as_echo "#define NDEBUG 1" >>confdefs.h
14043   fi
14044  
14045  
13941
14046   $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
14047  
14048  
14049 < $as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h
14049 > $as_echo "#define MP_CHUNK_SIZE_CHANNEL 1024*1024" >>confdefs.h
14050  
14051  
14052 < $as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h
14052 > $as_echo "#define MP_CHUNK_SIZE_MEMBER 2048*1024" >>confdefs.h
14053  
14054  
14055 < $as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h
14055 > $as_echo "#define MP_CHUNK_SIZE_BAN 1024*1024" >>confdefs.h
14056  
14057  
14058 < $as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h
14058 > $as_echo "#define MP_CHUNK_SIZE_CLIENT 1024*1024" >>confdefs.h
14059  
14060  
14061 < $as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h
14061 > $as_echo "#define MP_CHUNK_SIZE_LCLIENT 512*1024" >>confdefs.h
14062  
14063  
14064 < $as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h
14064 > $as_echo "#define MP_CHUNK_SIZE_DNODE 32*1024" >>confdefs.h
14065  
14066  
14067   $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
14068  
14069  
14070 < $as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h
14070 > $as_echo "#define MP_CHUNK_SIZE_AUTH 128*1024" >>confdefs.h
14071 >
14072 >
14073 > $as_echo "#define MP_CHUNK_SIZE_DNS 64*1024" >>confdefs.h
14074 >
14075 >
14076 > $as_echo "#define MP_CHUNK_SIZE_WATCH 8*1024" >>confdefs.h
14077 >
14078 >
14079 > $as_echo "#define MP_CHUNK_SIZE_NAMEHOST 64*1024" >>confdefs.h
14080  
14081  
14082 < $as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h
14082 > $as_echo "#define MP_CHUNK_SIZE_USERHOST 128*1024" >>confdefs.h
14083  
14084  
14085 < $as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h
14085 > $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY 128*1024" >>confdefs.h
14086  
14087  
14088   # Argument processing.
# Line 14443 | Line 14556 | _ACEOF
14556    test "$exec_prefix_NONE" && exec_prefix=NONE
14557  
14558  
14559 < 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"
14559 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile tools/Makefile"
14560  
14561  
14562   cat >confcache <<\_ACEOF
# Line 15492 | Line 15605 | do
15605      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
15606      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
15607      "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
15495    "help/opers/Makefile") CONFIG_FILES="$CONFIG_FILES help/opers/Makefile" ;;
15496    "help/users/Makefile") CONFIG_FILES="$CONFIG_FILES help/users/Makefile" ;;
15608      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
15609  
15610    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
# Line 16142 | Line 16253 | $as_echo X"$mf" |
16253      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
16254      test -z "$DEPDIR" && continue
16255      am__include=`sed -n 's/^am__include = //p' < "$mf"`
16256 <    test -z "am__include" && continue
16256 >    test -z "$am__include" && continue
16257      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
16258      # Find all dependency output files, they are included files with
16259      # $(DEPDIR) in their names.  We invoke sed twice because it is the

Diff Legend

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