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 1832 by michael, Fri Apr 19 19:16:09 2013 UTC vs.
Revision 2228 by michael, Thu Jun 13 19:46:30 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 1751 2013-01-16 18:30:52Z michael .
2 > # From configure.ac Id: configure.ac 2030 2013-05-14 18:24:55Z 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
808 > enable_libGeoIP
809   enable_openssl
810   enable_assert
811   enable_kqueue
# Line 1461 | 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
1464 <  --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.
1467    --enable-assert         Enable assert() statements
# 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 +
3023   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3024   $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3025      # Check whether --enable-maintainer-mode was given.
# Line 13656 | Line 13661 | if test "$ac_res" != no; then :
13661   fi
13662  
13663  
13664 < # Check whether --enable-libpcre was given.
13665 < if test "${enable_libpcre+set}" = set; then :
13666 <  enableval=$enable_libpcre;
13667 < else
13668 <  ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
13669 < if test "x$ac_cv_header_pcre_h" = xyes; then :
13670 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pcre_study" >&5
13671 < $as_echo_n "checking for library containing pcre_study... " >&6; }
13672 < if ${ac_cv_search_pcre_study+:} false; then :
13664 > # Check whether --enable-libGeoIP was given.
13665 > if test "${enable_libGeoIP+set}" = set; then :
13666 >  enableval=$enable_libGeoIP;
13667 > else
13668 >  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13669 > if test "x$ac_cv_header_GeoIP_h" = xyes; then :
13670 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
13671 > $as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
13672 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13673    $as_echo_n "(cached) " >&6
13674   else
13675    ac_func_search_save_LIBS=$LIBS
# Line 13677 | Line 13682 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13682   #ifdef __cplusplus
13683   extern "C"
13684   #endif
13685 < char pcre_study ();
13685 > char GeoIP_id_by_ipnum_v6_gl ();
13686   int
13687   main ()
13688   {
13689 < return pcre_study ();
13689 > return GeoIP_id_by_ipnum_v6_gl ();
13690    ;
13691    return 0;
13692   }
13693   _ACEOF
13694 < for ac_lib in '' pcre; do
13694 > for ac_lib in '' GeoIP; do
13695    if test -z "$ac_lib"; then
13696      ac_res="none required"
13697    else
# Line 13694 | Line 13699 | for ac_lib in '' pcre; do
13699      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13700    fi
13701    if ac_fn_c_try_link "$LINENO"; then :
13702 <  ac_cv_search_pcre_study=$ac_res
13702 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
13703   fi
13704   rm -f core conftest.err conftest.$ac_objext \
13705      conftest$ac_exeext
13706 <  if ${ac_cv_search_pcre_study+:} false; then :
13706 >  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13707    break
13708   fi
13709   done
13710 < if ${ac_cv_search_pcre_study+:} false; then :
13710 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13711  
13712   else
13713 <  ac_cv_search_pcre_study=no
13713 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
13714   fi
13715   rm conftest.$ac_ext
13716   LIBS=$ac_func_search_save_LIBS
13717   fi
13718 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pcre_study" >&5
13719 < $as_echo "$ac_cv_search_pcre_study" >&6; }
13720 < ac_res=$ac_cv_search_pcre_study
13718 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
13719 > $as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
13720 > ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
13721   if test "$ac_res" != no; then :
13722    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13723  
13724 < $as_echo "#define HAVE_LIBPCRE 1" >>confdefs.h
13724 > $as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
13725  
13726   fi
13727  
# Line 13780 | Line 13785 | $as_echo "disabled" >&6; }
13785   fi
13786  
13787   if test "$cf_enable_openssl" != "no"; then :
13788 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8s or above" >&5
13789 < $as_echo_n "checking for OpenSSL 0.9.8s or above... " >&6; }
13788 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
13789 > $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
13790    if test "$cross_compiling" = yes; then :
13791    cf_openssl_version_ok=no
13792   else
# Line 13794 | Line 13799 | else
13799   int
13800   main ()
13801   {
13802 < exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f));
13802 > exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
13803    ;
13804    return 0;
13805   }
# Line 13938 | Line 13943 | $as_echo "#define NDEBUG 1" >>confdefs.h
13943   fi
13944  
13945  
13946 + $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
13947  
13942 $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h
13948  
13949 + $as_echo "#define MP_CHUNK_SIZE_CHANNEL 1024*1024" >>confdefs.h
13950  
13945 $as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h
13951  
13952 + $as_echo "#define MP_CHUNK_SIZE_MEMBER 2048*1024" >>confdefs.h
13953  
13948 $as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h
13954  
13955 + $as_echo "#define MP_CHUNK_SIZE_BAN 1024*1024" >>confdefs.h
13956  
13951 $as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h
13957  
13958 + $as_echo "#define MP_CHUNK_SIZE_CLIENT 1024*1024" >>confdefs.h
13959  
13954 $as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h
13960  
13961 + $as_echo "#define MP_CHUNK_SIZE_LCLIENT 512*1024" >>confdefs.h
13962  
13957 $as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h
13963  
13964 <
13960 < $as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h
13964 > $as_echo "#define MP_CHUNK_SIZE_DNODE 32*1024" >>confdefs.h
13965  
13966  
13967   $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
13968  
13969  
13970 < $as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h
13970 > $as_echo "#define MP_CHUNK_SIZE_AUTH 128*1024" >>confdefs.h
13971 >
13972 >
13973 > $as_echo "#define MP_CHUNK_SIZE_DNS 64*1024" >>confdefs.h
13974 >
13975 >
13976 > $as_echo "#define MP_CHUNK_SIZE_WATCH 8*1024" >>confdefs.h
13977 >
13978 >
13979 > $as_echo "#define MP_CHUNK_SIZE_NAMEHOST 64*1024" >>confdefs.h
13980  
13981  
13982 < $as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h
13982 > $as_echo "#define MP_CHUNK_SIZE_USERHOST 128*1024" >>confdefs.h
13983  
13984  
13985 < $as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h
13985 > $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY 128*1024" >>confdefs.h
13986  
13987  
13988   # Argument processing.
# Line 14443 | Line 14456 | _ACEOF
14456    test "$exec_prefix_NONE" && exec_prefix=NONE
14457  
14458  
14459 < 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"
14459 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile tools/Makefile"
14460  
14461  
14462   cat >confcache <<\_ACEOF
# Line 15492 | Line 15505 | do
15505      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
15506      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
15507      "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" ;;
15508      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
15509  
15510    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
# Line 16142 | Line 16153 | $as_echo X"$mf" |
16153      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
16154      test -z "$DEPDIR" && continue
16155      am__include=`sed -n 's/^am__include = //p' < "$mf"`
16156 <    test -z "am__include" && continue
16156 >    test -z "$am__include" && continue
16157      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
16158      # Find all dependency output files, they are included files with
16159      # $(DEPDIR) in their names.  We invoke sed twice because it is the

Diff Legend

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