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 2064 by michael, Thu May 16 09:56:02 2013 UTC vs.
Revision 2481 by michael, Wed Oct 23 16:38:58 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 2030 2013-05-14 18:24:55Z michael .
2 > # From configure.ac Id: configure.ac 2480 2013-10-23 16:05:41Z 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 3019 | 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; }
# Line 3042 | Line 3083 | fi
3083    MAINT=$MAINTAINER_MODE_TRUE
3084  
3085  
3086 +
3087   ac_config_headers="$ac_config_headers config.h"
3088  
3089  
# Line 3899 | Line 3941 | ac_compile='$CC -c $CFLAGS $CPPFLAGS con
3941   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3942   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3943  
3944 + ac_ext=c
3945 + ac_cpp='$CPP $CPPFLAGS'
3946 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3947 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3948 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3949 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
3950 + $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
3951 + if ${am_cv_prog_cc_c_o+:} false; then :
3952 +  $as_echo_n "(cached) " >&6
3953 + else
3954 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3955 + /* end confdefs.h.  */
3956 +
3957 + int
3958 + main ()
3959 + {
3960 +
3961 +  ;
3962 +  return 0;
3963 + }
3964 + _ACEOF
3965 +  # Make sure it works both with $CC and with simple cc.
3966 +  # Following AC_PROG_CC_C_O, we do the test twice because some
3967 +  # compilers refuse to overwrite an existing .o file with -o,
3968 +  # though they will create one.
3969 +  am_cv_prog_cc_c_o=yes
3970 +  for am_i in 1 2; do
3971 +    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
3972 +   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
3973 +   ac_status=$?
3974 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3975 +   (exit $ac_status); } \
3976 +         && test -f conftest2.$ac_objext; then
3977 +      : OK
3978 +    else
3979 +      am_cv_prog_cc_c_o=no
3980 +      break
3981 +    fi
3982 +  done
3983 +  rm -f core conftest*
3984 +  unset am_i
3985 + fi
3986 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
3987 + $as_echo "$am_cv_prog_cc_c_o" >&6; }
3988 + if test "$am_cv_prog_cc_c_o" != yes; then
3989 +   # Losing compiler, so override with the script.
3990 +   # FIXME: It is wrong to rewrite CC.
3991 +   # But if we don't then we get into trouble of one sort or another.
3992 +   # A longer-term fix would be to have automake use am__CC in this case,
3993 +   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3994 +   CC="$am_aux_dir/compile $CC"
3995 + fi
3996 + ac_ext=c
3997 + ac_cpp='$CPP $CPPFLAGS'
3998 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3999 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4000 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
4001 +
4002 +
4003   depcc="$CC"   am_compiler_list=
4004  
4005   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
# Line 8459 | Line 8560 | _lt_linker_boilerplate=`cat conftest.err
8560   $RM -r conftest*
8561  
8562  
8563 + ## CAVEAT EMPTOR:
8564 + ## There is no encapsulation within the following macros, do not change
8565 + ## the running order or otherwise move them around unless you know exactly
8566 + ## what you are doing...
8567   if test -n "$compiler"; then
8568  
8569   lt_prog_compiler_no_builtin_flag=
# Line 13072 | Line 13177 | LIBTOOL="$LIBTOOL --silent"
13177  
13178   # Checks for libraries.
13179  
13180 +
13181 +  if test "X$CC" != "X"; then
13182 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -fstack-protector" >&5
13183 + $as_echo_n "checking whether ${CC} accepts -fstack-protector... " >&6; }
13184 + if ${ssp_cv_cc+:} false; then :
13185 +  $as_echo_n "(cached) " >&6
13186 + else
13187 +  ssp_old_cflags="$CFLAGS"
13188 +       CFLAGS="$CFLAGS -fstack-protector"
13189 +       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13190 + /* end confdefs.h.  */
13191 +
13192 + int
13193 + main ()
13194 + {
13195 +
13196 +  ;
13197 +  return 0;
13198 + }
13199 + _ACEOF
13200 + if ac_fn_c_try_compile "$LINENO"; then :
13201 +  ssp_cv_cc=yes
13202 + else
13203 +  ssp_cv_cc=no
13204 + fi
13205 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13206 +       CFLAGS="$ssp_old_cflags"
13207 +
13208 + fi
13209 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssp_cv_cc" >&5
13210 + $as_echo "$ssp_cv_cc" >&6; }
13211 +    if test $ssp_cv_cc = yes; then
13212 +      CFLAGS="$CFLAGS -fstack-protector"
13213 +
13214 + $as_echo "#define ENABLE_SSP_CC 1" >>confdefs.h
13215 +
13216 +    fi
13217 +  fi
13218 +
13219 +
13220 +
13221    ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13222   if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13223  
# Line 13661 | Line 13807 | if test "$ac_res" != no; then :
13807   fi
13808  
13809  
13810 < # Check whether --enable-libGeoIP was given.
13811 < if test "${enable_libGeoIP+set}" = set; then :
13812 <  enableval=$enable_libGeoIP;
13810 > # Check whether --enable-libgeoip was given.
13811 > if test "${enable_libgeoip+set}" = set; then :
13812 >  enableval=$enable_libgeoip;
13813   else
13814    ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13815   if test "x$ac_cv_header_GeoIP_h" = xyes; then :
# Line 13731 | Line 13877 | fi
13877   fi
13878  
13879  
13880 +
13881   # Check whether --enable-openssl was given.
13882   if test "${enable_openssl+set}" = set; then :
13883    enableval=$enable_openssl;  cf_enable_openssl=$enableval
# Line 13785 | Line 13932 | $as_echo "disabled" >&6; }
13932   fi
13933  
13934   if test "$cf_enable_openssl" != "no"; then :
13935 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8s or above" >&5
13936 < $as_echo_n "checking for OpenSSL 0.9.8s or above... " >&6; }
13935 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
13936 > $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
13937    if test "$cross_compiling" = yes; then :
13938    cf_openssl_version_ok=no
13939   else
# Line 13799 | Line 13946 | else
13946   int
13947   main ()
13948   {
13949 < exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f));
13949 > exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
13950    ;
13951    return 0;
13952   }

Diff Legend

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