# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ kfreebsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ linux*)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
hpux9*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
# at 6.2 and later dlopen does load deplibs.
libltdl_cv_sys_dlopen_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
libltdl_cv_sys_dlopen_deplibs=yes
;;
openbsd*)
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4575 "configure"' > conftest.$ac_ext
+ echo '#line 4565 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
# Provide some information about the compiler.
-echo "$as_me:5710:" \
+echo "$as_me:5696:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6773: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6777: \$? = $ac_status" >&5
+ echo "$as_me:6761: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7041: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7025: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7045: \$? = $ac_status" >&5
+ echo "$as_me:7029: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7145: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7129: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7149: \$? = $ac_status" >&5
+ echo "$as_me:7133: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ link_all_deplibs=no
;;
hpux9*)
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9490 "configure"
+#line 9487 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9590 "configure"
+#line 9587 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11930: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11925: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11934: \$? = $ac_status" >&5
+ echo "$as_me:11929: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12034: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12029: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12038: \$? = $ac_status" >&5
+ echo "$as_me:12033: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ kfreebsd*-gnu)
+ link_all_deplibs_CXX=no
+ ;;
+ linux*)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13604: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13617: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13608: \$? = $ac_status" >&5
+ echo "$as_me:13621: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13708: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13721: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13712: \$? = $ac_status" >&5
+ echo "$as_me:13725: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
;;
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_F77='-R$libdir'
+ hardcode_direct_F77=yes
+ hardcode_shlibpath_var_F77=no
+ link_all_deplibs_F77=no
+ ;;
+
hpux9*)
if test "$GCC" = yes; then
archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
link_all_deplibs_F77=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15911: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15944: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15915: \$? = $ac_status" >&5
+ echo "$as_me:15948: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16212: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16183: \$? = $ac_status" >&5
+ echo "$as_me:16216: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16283: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16316: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16287: \$? = $ac_status" >&5
+ echo "$as_me:16320: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ hardcode_direct_GCJ=yes
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
+ link_all_deplibs_GCJ=no
;;
hpux9*)
link_all_deplibs_GCJ=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
# Remove --cache-file and --srcdir arguments so they do not pile up.
ac_sub_configure_args=
- # Add --quiet option if used
- test "$silent" = yes &&
- ac_sub_configure_args="$ac_sub_configure_args --quiet"
ac_prev=
for ac_arg in $ac_configure_args; do
if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
/*
- * $Id: ACLDomainData.cc,v 1.11 2005/05/08 22:35:03 hno Exp $
+ * $Id: ACLDomainData.cc,v 1.12 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "ACLDomainData.h"
#include "authenticate.h"
#include "ACLChecklist.h"
+#include "wordlist.h"
template<class T>
inline void
/*
- * $Id: ACLHTTPStatus.cc,v 1.1 2005/09/25 20:58:23 hno Exp $
+ * $Id: ACLHTTPStatus.cc,v 1.2 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "ACLHTTPStatus.h"
#include "HttpReply.h"
+#include "wordlist.h"
static void aclParseHTTPStatusList(SplayNode<acl_httpstatus_data *> **curlist);
static int aclHTTPStatusCompare(acl_httpstatus_data * const &a, acl_httpstatus_data * const &b);
#include "ACLIP.h"
#include "ACLChecklist.h"
#include "MemBuf.h"
+#include "wordlist.h"
void *
ACLIP::operator new (size_t byteCount)
/*
- * $Id: ACLIntRange.cc,v 1.6 2005/05/08 23:31:06 hno Exp $
+ * $Id: ACLIntRange.cc,v 1.7 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Robert Collins
#include "squid.h"
#include "ACLIntRange.h"
+#include "wordlist.h"
/* explicit instantiation required for some systems */
/*
- * $Id: ACLMaxConnection.cc,v 1.5 2005/05/06 01:57:55 hno Exp $
+ * $Id: ACLMaxConnection.cc,v 1.6 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "squid.h"
#include "ACLMaxConnection.h"
+#include "wordlist.h"
ACL::Prototype ACLMaxConnection::RegistryProtoype(&ACLMaxConnection::RegistryEntry_, "maxconn");
/*
- * $Id: ACLMaxUserIP.cc,v 1.9 2006/03/10 22:40:24 hno Exp $
+ * $Id: ACLMaxUserIP.cc,v 1.10 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "ACLMaxUserIP.h"
#include "AuthUserRequest.h"
#include "authenticate.h"
+#include "wordlist.h"
+#include "ConfigParser.h"
ACL::Prototype ACLMaxUserIP::RegistryProtoype(&ACLMaxUserIP::RegistryEntry_, "max_user_ip");
return new ACLMaxUserIP(*this);
}
-ACLMaxUserIP::ACLMaxUserIP (char const *theClass) : class_ (theClass), maximum(-1)
+ACLMaxUserIP::ACLMaxUserIP (char const *theClass) : class_ (theClass), maximum(0)
{}
ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) :class_ (old.class_), maximum (old.maximum), flags (old.flags)
return;
}
- char *t = strtokFile();
+ char *t = ConfigParser::strtokFile();
if (!t)
return;
if (strcmp("-s", t) == 0) {
debug(28, 5) ("aclParseUserMaxIP: Going strict\n");
flags.strict = 1;
- t = strtokFile();
+ t = ConfigParser::strtokFile();
}
if (!t)
/*
- * $Id: ACLMaxUserIP.h,v 1.7 2005/05/06 02:37:36 hno Exp $
+ * $Id: ACLMaxUserIP.h,v 1.8 2006/04/23 11:10:31 robertc Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
virtual bool valid () const;
virtual bool requiresRequest() const {return true;}
+ int getMaximum() const {return maximum;}
+
+ int getStrict() const {return flags.strict;}
+
private:
static Prototype RegistryProtoype;
static ACLMaxUserIP RegistryEntry_;
/*
- * $Id: ACLMethodData.cc,v 1.7 2005/05/08 09:15:39 serassio Exp $
+ * $Id: ACLMethodData.cc,v 1.8 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "squid.h"
#include "ACLMethodData.h"
#include "ACLChecklist.h"
+#include "wordlist.h"
ACLMethodData::ACLMethodData() : values (NULL)
{}
/*
- * $Id: ACLProtocolData.cc,v 1.6 2005/05/08 06:36:45 hno Exp $
+ * $Id: ACLProtocolData.cc,v 1.7 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "squid.h"
#include "ACLProtocolData.h"
#include "ACLChecklist.h"
+#include "wordlist.h"
ACLProtocolData::ACLProtocolData() : values (NULL)
{}
/*
- * $Id: ACLRegexData.cc,v 1.8 2005/05/08 06:36:45 hno Exp $
+ * $Id: ACLRegexData.cc,v 1.9 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "authenticate.h"
#include "ACLChecklist.h"
#include "ACL.h"
+#include "wordlist.h"
+#include "ConfigParser.h"
static void aclDestroyRegexList(relist * data);
void
for (Tail = (relist **)curlist; *Tail; Tail = &((*Tail)->next))
;
- while ((t = strtokFile())) {
+ while ((t = ConfigParser::strtokFile())) {
if (strcmp(t, "-i") == 0) {
flags |= REG_ICASE;
continue;
/*
- * $Id: ACLStringData.cc,v 1.7 2005/05/08 22:35:03 hno Exp $
+ * $Id: ACLStringData.cc,v 1.8 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "squid.h"
#include "ACLStringData.h"
#include "ACLChecklist.h"
+#include "wordlist.h"
ACLStringData::ACLStringData() : values (NULL)
/*
- * $Id: ACLTimeData.cc,v 1.10 2005/05/08 06:36:45 hno Exp $
+ * $Id: ACLTimeData.cc,v 1.11 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "ACLTimeData.h"
#include "authenticate.h"
#include "ACLChecklist.h"
+#include "wordlist.h"
ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {}
#include "ACLUserData.h"
#include "authenticate.h"
#include "ACLChecklist.h"
+#include "wordlist.h"
+#include "ConfigParser.h"
template<class T>
inline void
debug(28, 2) ("aclParseUserList: parsing user list\n");
char *t = NULL;
- if ((t = strtokFile())) {
+ if ((t = ConfigParser::strtokFile())) {
debug(28, 5) ("aclParseUserList: First token is %s\n", t);
if (strcmp("-i", t) == 0) {
debug(28, 4) ("aclParseUserList: parsing user list\n");
- while ((t = strtokFile())) {
+ while ((t = ConfigParser::strtokFile())) {
debug(28, 6) ("aclParseUserList: Got token: %s\n", t);
if (flags.case_insensitive)
--- /dev/null
+
+/*
+ * $Id: ConfigParser.cc,v 1.1 2006/04/23 11:10:31 robertc Exp $
+ *
+ *
+ * SQUID Web Proxy Cache http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from
+ * the Internet community; see the CONTRIBUTORS file for full
+ * details. Many organizations have provided support for Squid's
+ * development; see the SPONSORS file for full details. Squid is
+ * Copyrighted (C) 2001 by the Regents of the University of
+ * California; see the COPYRIGHT file for full details. Squid
+ * incorporates software developed and/or copyrighted by other
+ * sources; see the CREDITS file for full details.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ *
+ * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ */
+
+#include "ConfigParser.h"
+#include "globals.h"
+
+void
+ConfigParser::Destruct()
+{
+ shutting_down = 1;
+ fatalf("Bungled %s line %d: %s",
+ cfg_filename, config_lineno, config_input_line);
+}
+
+char *
+ConfigParser::strtokFile(void)
+{
+ static int fromFile = 0;
+ static FILE *wordFile = NULL;
+
+ char *t, *fn;
+ LOCAL_ARRAY(char, buf, 256);
+
+strtok_again:
+
+ if (!fromFile) {
+ t = (strtok(NULL, w_space));
+
+ if (!t || *t == '#') {
+ return NULL;
+ } else if (*t == '\"' || *t == '\'') {
+ /* quote found, start reading from file */
+ fn = ++t;
+
+ while (*t && *t != '\"' && *t != '\'')
+ t++;
+
+ *t = '\0';
+
+ if ((wordFile = fopen(fn, "r")) == NULL) {
+ debug(28, 0) ("strtokFile: %s not found\n", fn);
+ return (NULL);
+ }
+
+#ifdef _SQUID_WIN32_
+ setmode(fileno(wordFile), O_TEXT);
+
+#endif
+
+ fromFile = 1;
+ } else {
+ return t;
+ }
+ }
+
+ /* fromFile */
+ if (fgets(buf, 256, wordFile) == NULL) {
+ /* stop reading from file */
+ fclose(wordFile);
+ wordFile = NULL;
+ fromFile = 0;
+ goto strtok_again;
+ } else {
+ char *t2, *t3;
+ t = buf;
+ /* skip leading and trailing white space */
+ t += strspn(buf, w_space);
+ t2 = t + strcspn(t, w_space);
+ t3 = t2 + strspn(t2, w_space);
+
+ while (*t3 && *t3 != '#') {
+ t2 = t3 + strcspn(t3, w_space);
+ t3 = t2 + strspn(t2, w_space);
+ }
+
+ *t2 = '\0';
+ /* skip comments */
+
+ if (*t == '#')
+ goto strtok_again;
+
+ /* skip blank lines */
+ if (!*t)
+ goto strtok_again;
+
+ return t;
+ }
+}
+
/*
- * $Id: ConfigParser.h,v 1.2 2005/11/21 23:10:22 wessels Exp $
+ * $Id: ConfigParser.h,v 1.3 2006/04/23 11:10:31 robertc Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#ifndef SQUID_CONFIGPARSER_H_
-#define SQUID_CONFIGPARSER_H_
+#ifndef SQUID_CONFIGPARSER_H
+#define SQUID_CONFIGPARSER_H
+
+#include "squid.h"
class ConfigParser
{
public:
+ static void Destruct();
static void ParseUShort(u_short *var);
static void ParseBool(bool *var);
static void ParseString(char **var);
static void ParseString(String *var);
static void ParseWordList(wordlist **list);
+ static char * strtokFile();
};
-#endif /* SQUID_CONFIGPARSER_H_ */
+#endif /* SQUID_CONFIGPARSER_H */
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.am,v 1.133 2006/04/23 09:18:30 serassio Exp $
+# $Id: Makefile.am,v 1.134 2006/04/23 11:10:31 robertc Exp $
#
# Uncomment and customize the following to suit your needs:
#
access_log.cc \
AccessLogEntry.h \
acl.cc \
+ acl_noncore.cc \
ACL.h \
ACLChecklist.cc \
ACLChecklist.h \
comm_kqueue.cc \
CommRead.h \
ConfigOption.cc \
+ ConfigParser.cc \
ConfigParser.h \
ConnectionDetail.h \
debug.cc \
wais.cc \
wccp.cc \
whois.cc \
+ wordlist.cc \
+ wordlist.h \
$(WIN32_SOURCE)
noinst_HEADERS = ACLChecklist.cci \
check_PROGRAMS+= \
tests/testAuth \
+ tests/testACLMaxUserIP \
tests/testBoilerplate \
tests/testHeaders \
tests/testStore \
tests_testAuth_SOURCES= tests/testAuth.cc tests/testMain.cc tests/testAuth.h $(TESTSOURCES) \
AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
+ ConfigParser.cc \
tests/stub_acl.cc tests/stub_cache_cf.cc \
tests/stub_helper.cc cbdata.cc String.cc tests/stub_cache_manager.cc \
tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
tests/stub_http.cc \
HttpMsg.cc \
tests/stub_mime.cc \
- tests/stub_access_log.cc
+ tests/stub_access_log.cc \
+ wordlist.cc
## acl.cc cache_cf.cc tools.cc \
## helper.cc String.cc cbdata.cc HttpHeaderTools.cc store.cc cache_manager.cc \
-## HttpHeader.cc url.cc event.cc mem.cc HttpRequest.cc Packer.cc access_log.cc \
+## HttpHeader.cc url.cc mem.cc HttpRequest.cc Packer.cc access_log.cc \
## MemBuf.cc StatHist.cc logfile.cc
tests_testAuth_LDADD= \
@AUTH_OBJS@ \
@SQUID_CPPUNIT_LA@
+## Tests for the ACLMaxUserIP class
+## acl needs wordlist. wordlist needs MemBug
+## MemBuf needs mem, MemBuf needs event,
+## event needs cbdata.
+## ACLMaxUserUP needs authenticate.cc
+## authenticate.cc needs AuthUser, AuthScheme, AuthUserRequest, AuthConfig
+## ACLMaxUserIP needs ACLChecklist
+## AuthUser request needs HttpHeader, which brings in
+## ETag.cc \
+## HttpHeader.cc \
+## HttpHeaderTools.cc \
+## HttpHdrContRange.cc \
+## HttpHdrCc.cc \
+## HttpHdrRange.cc \
+## HttpHdrSc.cc \
+## HttpHdrScTarget.cc \
+## Packer.cc \
+## StatHist.cc \
+## String.cc \
+tests_testACLMaxUserIP_SOURCES= \
+ acl.cc \
+ ACLChecklist.cc \
+ ACLMaxUserIP.cc \
+ ACLProxyAuth.cc \
+ ACLRegexData.cc \
+ ACLUserData.cc \
+ authenticate.cc \
+ AuthConfig.cc \
+ AuthUser.cc \
+ AuthUserRequest.cc \
+ AuthScheme.cc \
+ cbdata.cc \
+ ConfigParser.cc \
+ event.cc \
+ ETag.cc \
+ HttpHeader.cc \
+ HttpHeaderTools.cc \
+ HttpHdrContRange.cc \
+ HttpHdrRange.cc \
+ HttpHdrCc.cc \
+ HttpHdrSc.cc \
+ HttpHdrScTarget.cc \
+ Packer.cc \
+ StatHist.cc \
+ String.cc \
+ tests/stub_cache_manager.cc \
+ tests/stub_store.cc \
+ tests/testACLMaxUserIP.cc \
+ tests/testACLMaxUserIP.h \
+ tests/testMain.cc \
+ mem.cc \
+ MemBuf.cc \
+ wordlist.cc \
+ $(TESTSOURCES)
+tests_testACLMaxUserIP_LDADD= \
+ -L../lib -lmiscutil \
+ @SQUID_CPPUNIT_LA@ \
+ @SSLLIB@
+tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
+tests_testACLMaxUserIP_DEPENDENCIES = \
+ @SQUID_CPPUNIT_LA@
+
## a demonstration test that does nothing but shows the salient points
## involved in writing tests.
tests_testBoilerplate_SOURCES= tests/testBoilerplate.cc tests/testMain.cc tests/testBoilerplate.h $(TESTSOURCES)
## RBC 20060422.
HEADERS_TO_TEST = \
tests/testHeader_ACL.cc \
+ tests/testHeader_ConfigParser.cc \
tests/testHeader_dlink.cc \
tests/testHeader_HttpHeader.cc \
tests/testHeader_HttpHeaderRange.cc \
- tests/testHeader_HttpReply.cc
+ tests/testHeader_HttpReply.cc \
+ tests/testHeader_wordlist.cc
tests_testHeaders_SOURCES= tests/testMain.cc $(HEADERS_TO_TEST)
tests_testHeaders_LDADD= \
@SQUID_CPPUNIT_LA@ \
$(TESTSOURCES) \
$(DELAY_POOL_SOURCE) \
CacheDigest.cc \
+ ConfigParser.cc \
HttpMsg.cc \
store_dir.cc \
store.cc \
tests/stub_store_client.cc \
tests/stub_tools.cc \
HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+ acl_noncore.cc \
MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
- tests/stub_HttpRequest.cc tests/stub_access_log.cc
+ tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+ wordlist.cc
## why so many sources? well httpHeaderTools requites ACLChecklist & friends.
## first line - what we are testing.
tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@SQUID_CPPUNIT_LA@
-SWAP_TEST_SOURCES=\
+SWAP_TEST_SOURCES = \
tests/stub_store_rebuild.cc \
tests/stub_internal.cc \
fd.cc \
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.371 2006/04/23 09:22:41 serassio Exp $
+# $Id: Makefile.in,v 1.372 2006/04/23 11:10:31 robertc Exp $
#
# Uncomment and customize the following to suit your needs:
#
build_triplet = @build@
host_triplet = @host@
check_PROGRAMS = tests/testAuth$(EXEEXT) \
- tests/testBoilerplate$(EXEEXT) tests/testHeaders$(EXEEXT) \
- tests/testStore$(EXEEXT) @STORE_TESTS@
+ tests/testACLMaxUserIP$(EXEEXT) tests/testBoilerplate$(EXEEXT) \
+ tests/testHeaders$(EXEEXT) tests/testStore$(EXEEXT) \
+ @STORE_TESTS@ $(am__empty)
@USE_ICAP_CLIENT_TRUE@am__append_1 = ICAP
EXTRA_PROGRAMS = DiskIO/DiskDaemon/diskd$(EXEEXT) unlinkd$(EXEEXT) \
pinger$(EXEEXT) dnsserver$(EXEEXT) recv-announce$(EXEEXT) \
recv_announce_OBJECTS = $(am_recv_announce_OBJECTS)
recv_announce_LDADD = $(LDADD)
recv_announce_DEPENDENCIES =
-am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc ACL.h \
- ACLChecklist.cc ACLChecklist.h ACLARP.cc ACLARP.h ACLASN.cc \
- ACLASN.h ACLDestinationASN.h ACLSourceASN.h ACLBrowser.cc \
- ACLBrowser.h ACLData.h ACLDestinationDomain.cc \
+am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
+ acl_noncore.cc ACL.h ACLChecklist.cc ACLChecklist.h ACLARP.cc \
+ ACLARP.h ACLASN.cc ACLASN.h ACLDestinationASN.h ACLSourceASN.h \
+ ACLBrowser.cc ACLBrowser.h ACLData.h ACLDestinationDomain.cc \
ACLDestinationDomain.h ACLDestinationIP.cc ACLDestinationIP.h \
ACLDomainData.h ACLDomainData.cc ACLExtUser.h ACLExtUser.cc \
ACLHTTPStatus.h ACLHTTPStatus.cc ACLIntRange.cc ACLIntRange.h \
ClientBody.cc ClientRequestContext.h clientStream.cc \
clientStream.h comm.cc comm.h CommIO.h comm_select.cc \
comm_poll.cc comm_epoll.cc comm_kqueue.cc CommRead.h \
- ConfigOption.cc ConfigParser.h ConnectionDetail.h debug.cc \
- Debug.h defines.h CommonPool.h CompositePoolNode.h \
- delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
- DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
- DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
- DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
- DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
- disk.cc DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
- DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
- DiskIO/WriteRequest.h DiskIO/DiskFile.h \
+ ConfigOption.cc ConfigParser.cc ConfigParser.h \
+ ConnectionDetail.h debug.cc Debug.h defines.h CommonPool.h \
+ CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
+ DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
+ DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
+ DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
+ DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
+ NullDelayId.cc NullDelayId.h disk.cc DiskIO/DiskIOModule.cc \
+ DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \
+ DiskIO/WriteRequest.cc DiskIO/WriteRequest.h DiskIO/DiskFile.h \
DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \
DiskIO/DiskIOModule.h dlink.h dns_internal.cc dns.cc enums.h \
errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
StoreMetaURL.h StoreMetaVary.cc StoreMetaVary.h StoreSearch.h \
StoreSwapLogData.cc StoreSwapLogData.h Server.h Server.cc \
structs.h SwapDir.cc SwapDir.h tools.cc typedefs.h unlinkd.cc \
- url.cc urn.cc useragent.cc wais.cc wccp.cc whois.cc win32.cc
+ url.cc urn.cc useragent.cc wais.cc wccp.cc whois.cc \
+ wordlist.cc wordlist.h win32.cc
am__objects_1 = ACLARP.$(OBJEXT)
@ENABLE_ARP_ACL_TRUE@am__objects_2 = $(am__objects_1)
am__objects_3 = $(am__objects_2) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \
am__objects_20 = win32.$(OBJEXT)
@ENABLE_WIN32SPECIFIC_TRUE@am__objects_21 = $(am__objects_20)
am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \
- ACLChecklist.$(OBJEXT) $(am__objects_3) asn.$(OBJEXT) \
- authenticate.$(OBJEXT) AuthConfig.$(OBJEXT) \
+ acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) $(am__objects_3) \
+ asn.$(OBJEXT) authenticate.$(OBJEXT) AuthConfig.$(OBJEXT) \
AuthScheme.$(OBJEXT) AuthUser.$(OBJEXT) \
AuthUserRequest.$(OBJEXT) cache_cf.$(OBJEXT) \
CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \
ClientBody.$(OBJEXT) clientStream.$(OBJEXT) comm.$(OBJEXT) \
comm_select.$(OBJEXT) comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) \
- comm_kqueue.$(OBJEXT) ConfigOption.$(OBJEXT) debug.$(OBJEXT) \
- $(am__objects_5) disk.$(OBJEXT) $(am__objects_6) \
- $(am__objects_7) errorpage.$(OBJEXT) $(am__objects_9) \
- ETag.$(OBJEXT) event.$(OBJEXT) external_acl.$(OBJEXT) \
+ comm_kqueue.$(OBJEXT) ConfigOption.$(OBJEXT) \
+ ConfigParser.$(OBJEXT) debug.$(OBJEXT) $(am__objects_5) \
+ disk.$(OBJEXT) $(am__objects_6) $(am__objects_7) \
+ errorpage.$(OBJEXT) $(am__objects_9) ETag.$(OBJEXT) \
+ event.$(OBJEXT) external_acl.$(OBJEXT) \
ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \
filemap.$(OBJEXT) forward.$(OBJEXT) fqdncache.$(OBJEXT) \
ftp.$(OBJEXT) gopher.$(OBJEXT) helper.$(OBJEXT) \
Server.$(OBJEXT) SwapDir.$(OBJEXT) tools.$(OBJEXT) \
$(am__objects_19) url.$(OBJEXT) urn.$(OBJEXT) \
useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \
- whois.$(OBJEXT) $(am__objects_21)
+ whois.$(OBJEXT) wordlist.$(OBJEXT) $(am__objects_21)
nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \
string_arrays.$(OBJEXT)
squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS)
squidclient_LDADD = $(LDADD)
squidclient_DEPENDENCIES =
am__objects_25 = ../test-suite/test_tools.$(OBJEXT) globals.$(OBJEXT)
+am_tests_testACLMaxUserIP_OBJECTS = acl.$(OBJEXT) \
+ ACLChecklist.$(OBJEXT) ACLMaxUserIP.$(OBJEXT) \
+ ACLProxyAuth.$(OBJEXT) ACLRegexData.$(OBJEXT) \
+ ACLUserData.$(OBJEXT) authenticate.$(OBJEXT) \
+ AuthConfig.$(OBJEXT) AuthUser.$(OBJEXT) \
+ AuthUserRequest.$(OBJEXT) AuthScheme.$(OBJEXT) \
+ cbdata.$(OBJEXT) ConfigParser.$(OBJEXT) event.$(OBJEXT) \
+ ETag.$(OBJEXT) HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
+ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \
+ HttpHdrCc.$(OBJEXT) HttpHdrSc.$(OBJEXT) \
+ HttpHdrScTarget.$(OBJEXT) Packer.$(OBJEXT) StatHist.$(OBJEXT) \
+ String.$(OBJEXT) tests/stub_cache_manager.$(OBJEXT) \
+ tests/stub_store.$(OBJEXT) tests/testACLMaxUserIP.$(OBJEXT) \
+ tests/testMain.$(OBJEXT) mem.$(OBJEXT) MemBuf.$(OBJEXT) \
+ wordlist.$(OBJEXT) $(am__objects_25)
+tests_testACLMaxUserIP_OBJECTS = $(am_tests_testACLMaxUserIP_OBJECTS)
am_tests_testAuth_OBJECTS = tests/testAuth.$(OBJEXT) \
tests/testMain.$(OBJEXT) $(am__objects_25) \
AuthScheme.$(OBJEXT) authenticate.$(OBJEXT) AuthUser.$(OBJEXT) \
AuthUserRequest.$(OBJEXT) AuthConfig.$(OBJEXT) \
- tests/stub_acl.$(OBJEXT) tests/stub_cache_cf.$(OBJEXT) \
- tests/stub_helper.$(OBJEXT) cbdata.$(OBJEXT) String.$(OBJEXT) \
+ ConfigParser.$(OBJEXT) tests/stub_acl.$(OBJEXT) \
+ tests/stub_cache_cf.$(OBJEXT) tests/stub_helper.$(OBJEXT) \
+ cbdata.$(OBJEXT) String.$(OBJEXT) \
tests/stub_cache_manager.$(OBJEXT) tests/stub_store.$(OBJEXT) \
HttpHeaderTools.$(OBJEXT) HttpHeader.$(OBJEXT) acl.$(OBJEXT) \
event.$(OBJEXT) mem.$(OBJEXT) MemBuf.$(OBJEXT) \
tests/stub_MemObject.$(OBJEXT) mem_node.$(OBJEXT) \
stmem.$(OBJEXT) tests/stub_comm.$(OBJEXT) \
tests/stub_http.$(OBJEXT) HttpMsg.$(OBJEXT) \
- tests/stub_mime.$(OBJEXT) tests/stub_access_log.$(OBJEXT)
+ tests/stub_mime.$(OBJEXT) tests/stub_access_log.$(OBJEXT) \
+ wordlist.$(OBJEXT)
tests_testAuth_OBJECTS = $(am_tests_testAuth_OBJECTS)
am_tests_testBoilerplate_OBJECTS = tests/testBoilerplate.$(OBJEXT) \
tests/testMain.$(OBJEXT) $(am__objects_25)
DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
- NullDelayId.cc NullDelayId.h CacheDigest.cc HttpMsg.cc \
- store_dir.cc store.cc store_key_md5.cc string_arrays.c \
- Parsing.cc ConfigOption.cc SwapDir.cc AuthScheme.cc \
- authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
- tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
- cbdata.cc String.cc tests/stub_cache_manager.cc \
- tests/stub_comm.cc tests/stub_http.cc mem_node.cc stmem.cc \
- tests/stub_mime.cc tests/stub_store_client.cc \
- tests/stub_tools.cc HttpHeaderTools.cc HttpHeader.cc acl.cc \
- event.cc mem.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
+ NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
+ HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
+ string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
+ AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
+ AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
+ tests/stub_helper.cc cbdata.cc String.cc \
+ tests/stub_cache_manager.cc tests/stub_comm.cc \
+ tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
+ tests/stub_store_client.cc tests/stub_tools.cc \
+ HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+ acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
- tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+ tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc \
DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
DiskIO/WriteRequest.h DiskIO/DiskFile.h \
DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \
DiskIO/DiskIOModule.h
am__objects_26 = $(am__objects_25) $(am__objects_5) \
- CacheDigest.$(OBJEXT) HttpMsg.$(OBJEXT) store_dir.$(OBJEXT) \
- store.$(OBJEXT) store_key_md5.$(OBJEXT) \
+ CacheDigest.$(OBJEXT) ConfigParser.$(OBJEXT) HttpMsg.$(OBJEXT) \
+ store_dir.$(OBJEXT) store.$(OBJEXT) store_key_md5.$(OBJEXT) \
string_arrays.$(OBJEXT) Parsing.$(OBJEXT) \
ConfigOption.$(OBJEXT) SwapDir.$(OBJEXT) AuthScheme.$(OBJEXT) \
authenticate.$(OBJEXT) AuthUser.$(OBJEXT) \
tests/stub_mime.$(OBJEXT) tests/stub_store_client.$(OBJEXT) \
tests/stub_tools.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
HttpHeader.$(OBJEXT) acl.$(OBJEXT) event.$(OBJEXT) \
- mem.$(OBJEXT) MemBuf.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
- Packer.$(OBJEXT) ACLChecklist.$(OBJEXT) HttpHdrCc.$(OBJEXT) \
- HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) url.$(OBJEXT) \
- ACLProxyAuth.$(OBJEXT) ACLRegexData.$(OBJEXT) \
- ACLUserData.$(OBJEXT) StatHist.$(OBJEXT) \
- HttpHdrRange.$(OBJEXT) ETag.$(OBJEXT) \
+ mem.$(OBJEXT) acl_noncore.$(OBJEXT) MemBuf.$(OBJEXT) \
+ HttpHdrContRange.$(OBJEXT) Packer.$(OBJEXT) \
+ ACLChecklist.$(OBJEXT) HttpHdrCc.$(OBJEXT) HttpHdrSc.$(OBJEXT) \
+ HttpHdrScTarget.$(OBJEXT) url.$(OBJEXT) ACLProxyAuth.$(OBJEXT) \
+ ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
+ StatHist.$(OBJEXT) HttpHdrRange.$(OBJEXT) ETag.$(OBJEXT) \
tests/stub_errorpage.$(OBJEXT) \
tests/stub_HttpRequest.$(OBJEXT) \
- tests/stub_access_log.$(OBJEXT)
+ tests/stub_access_log.$(OBJEXT) wordlist.$(OBJEXT)
am__objects_27 = tests/stub_store_rebuild.$(OBJEXT) \
tests/stub_internal.$(OBJEXT) fd.$(OBJEXT) disk.$(OBJEXT) \
filemap.$(OBJEXT) HttpBody.$(OBJEXT) HttpReply.$(OBJEXT) \
am__DEPENDENCIES_2 = DiskIO/Blocking/BlockingDiskIOModule.o \
repl/lru/store_repl_lru.o
am__objects_28 = tests/testHeader_ACL.$(OBJEXT) \
+ tests/testHeader_ConfigParser.$(OBJEXT) \
tests/testHeader_dlink.$(OBJEXT) \
tests/testHeader_HttpHeader.$(OBJEXT) \
tests/testHeader_HttpHeaderRange.$(OBJEXT) \
- tests/testHeader_HttpReply.$(OBJEXT)
+ tests/testHeader_HttpReply.$(OBJEXT) \
+ tests/testHeader_wordlist.$(OBJEXT)
am_tests_testHeaders_OBJECTS = tests/testMain.$(OBJEXT) \
$(am__objects_28)
tests_testHeaders_OBJECTS = $(am_tests_testHeaders_OBJECTS)
DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
- NullDelayId.cc NullDelayId.h CacheDigest.cc HttpMsg.cc \
- store_dir.cc store.cc store_key_md5.cc string_arrays.c \
- Parsing.cc ConfigOption.cc SwapDir.cc AuthScheme.cc \
- authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
- tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
- cbdata.cc String.cc tests/stub_cache_manager.cc \
- tests/stub_comm.cc tests/stub_http.cc mem_node.cc stmem.cc \
- tests/stub_mime.cc tests/stub_store_client.cc \
- tests/stub_tools.cc HttpHeaderTools.cc HttpHeader.cc acl.cc \
- event.cc mem.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
+ NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
+ HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
+ string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
+ AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
+ AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
+ tests/stub_helper.cc cbdata.cc String.cc \
+ tests/stub_cache_manager.cc tests/stub_comm.cc \
+ tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
+ tests/stub_store_client.cc tests/stub_tools.cc \
+ HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+ acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
- tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+ tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc \
DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
DiskIO/WriteRequest.h DiskIO/DiskFile.h \
DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
- NullDelayId.cc NullDelayId.h CacheDigest.cc HttpMsg.cc \
- store_dir.cc store.cc store_key_md5.cc string_arrays.c \
- Parsing.cc ConfigOption.cc SwapDir.cc AuthScheme.cc \
- authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
- tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
- cbdata.cc String.cc tests/stub_cache_manager.cc \
- tests/stub_comm.cc tests/stub_http.cc mem_node.cc stmem.cc \
- tests/stub_mime.cc tests/stub_store_client.cc \
- tests/stub_tools.cc HttpHeaderTools.cc HttpHeader.cc acl.cc \
- event.cc mem.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
+ NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
+ HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
+ string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
+ AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
+ AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
+ tests/stub_helper.cc cbdata.cc String.cc \
+ tests/stub_cache_manager.cc tests/stub_comm.cc \
+ tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
+ tests/stub_store_client.cc tests/stub_tools.cc \
+ HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+ acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
- tests/stub_HttpRequest.cc tests/stub_access_log.cc
+ tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc
am_tests_testStore_OBJECTS = tests/testStore.$(OBJEXT) \
tests/testStoreController.$(OBJEXT) \
tests/testStoreHashIndex.$(OBJEXT) tests/testMain.$(OBJEXT) \
DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
- NullDelayId.cc NullDelayId.h CacheDigest.cc HttpMsg.cc \
- store_dir.cc store.cc store_key_md5.cc string_arrays.c \
- Parsing.cc ConfigOption.cc SwapDir.cc AuthScheme.cc \
- authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
- tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
- cbdata.cc String.cc tests/stub_cache_manager.cc \
- tests/stub_comm.cc tests/stub_http.cc mem_node.cc stmem.cc \
- tests/stub_mime.cc tests/stub_store_client.cc \
- tests/stub_tools.cc HttpHeaderTools.cc HttpHeader.cc acl.cc \
- event.cc mem.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
+ NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
+ HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
+ string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
+ AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
+ AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
+ tests/stub_helper.cc cbdata.cc String.cc \
+ tests/stub_cache_manager.cc tests/stub_comm.cc \
+ tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
+ tests/stub_store_client.cc tests/stub_tools.cc \
+ HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+ acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
- tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+ tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc \
DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
DiskIO/WriteRequest.h DiskIO/DiskFile.h \
$(pinger_SOURCES) $(nodist_pinger_SOURCES) \
$(recv_announce_SOURCES) $(squid_SOURCES) \
$(EXTRA_squid_SOURCES) $(nodist_squid_SOURCES) \
- $(squidclient_SOURCES) $(tests_testAuth_SOURCES) \
- $(tests_testBoilerplate_SOURCES) $(tests_testCoss_SOURCES) \
- $(tests_testHeaders_SOURCES) $(tests_testNull_SOURCES) \
- $(tests_testStore_SOURCES) $(tests_testUfs_SOURCES) \
- $(ufsdump_SOURCES) $(nodist_ufsdump_SOURCES) \
- $(unlinkd_SOURCES)
+ $(squidclient_SOURCES) $(tests_testACLMaxUserIP_SOURCES) \
+ $(tests_testAuth_SOURCES) $(tests_testBoilerplate_SOURCES) \
+ $(tests_testCoss_SOURCES) $(tests_testHeaders_SOURCES) \
+ $(tests_testNull_SOURCES) $(tests_testStore_SOURCES) \
+ $(tests_testUfs_SOURCES) $(ufsdump_SOURCES) \
+ $(nodist_ufsdump_SOURCES) $(unlinkd_SOURCES)
DIST_SOURCES = $(libAIO_a_SOURCES) $(libBlocking_a_SOURCES) \
$(libDiskDaemon_a_SOURCES) $(libDiskThreads_a_SOURCES) \
$(DiskIO_DiskDaemon_diskd_SOURCES) \
$(dnsserver_SOURCES) $(pinger_SOURCES) \
$(recv_announce_SOURCES) $(am__squid_SOURCES_DIST) \
$(EXTRA_squid_SOURCES) $(squidclient_SOURCES) \
- $(tests_testAuth_SOURCES) $(tests_testBoilerplate_SOURCES) \
+ $(tests_testACLMaxUserIP_SOURCES) $(tests_testAuth_SOURCES) \
+ $(tests_testBoilerplate_SOURCES) \
$(am__tests_testCoss_SOURCES_DIST) \
$(tests_testHeaders_SOURCES) \
$(am__tests_testNull_SOURCES_DIST) \
access_log.cc \
AccessLogEntry.h \
acl.cc \
+ acl_noncore.cc \
ACL.h \
ACLChecklist.cc \
ACLChecklist.h \
comm_kqueue.cc \
CommRead.h \
ConfigOption.cc \
+ ConfigParser.cc \
ConfigParser.h \
ConnectionDetail.h \
debug.cc \
wais.cc \
wccp.cc \
whois.cc \
+ wordlist.cc \
+ wordlist.h \
$(WIN32_SOURCE)
noinst_HEADERS = ACLChecklist.cci \
tests_testAuth_SOURCES = tests/testAuth.cc tests/testMain.cc tests/testAuth.h $(TESTSOURCES) \
AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
+ ConfigParser.cc \
tests/stub_acl.cc tests/stub_cache_cf.cc \
tests/stub_helper.cc cbdata.cc String.cc tests/stub_cache_manager.cc \
tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
tests/stub_http.cc \
HttpMsg.cc \
tests/stub_mime.cc \
- tests/stub_access_log.cc
+ tests/stub_access_log.cc \
+ wordlist.cc
tests_testAuth_LDADD = \
@AUTH_LINKOBJS@ @AUTH_OBJS@ \
@AUTH_OBJS@ \
@SQUID_CPPUNIT_LA@
+tests_testACLMaxUserIP_SOURCES = \
+ acl.cc \
+ ACLChecklist.cc \
+ ACLMaxUserIP.cc \
+ ACLProxyAuth.cc \
+ ACLRegexData.cc \
+ ACLUserData.cc \
+ authenticate.cc \
+ AuthConfig.cc \
+ AuthUser.cc \
+ AuthUserRequest.cc \
+ AuthScheme.cc \
+ cbdata.cc \
+ ConfigParser.cc \
+ event.cc \
+ ETag.cc \
+ HttpHeader.cc \
+ HttpHeaderTools.cc \
+ HttpHdrContRange.cc \
+ HttpHdrRange.cc \
+ HttpHdrCc.cc \
+ HttpHdrSc.cc \
+ HttpHdrScTarget.cc \
+ Packer.cc \
+ StatHist.cc \
+ String.cc \
+ tests/stub_cache_manager.cc \
+ tests/stub_store.cc \
+ tests/testACLMaxUserIP.cc \
+ tests/testACLMaxUserIP.h \
+ tests/testMain.cc \
+ mem.cc \
+ MemBuf.cc \
+ wordlist.cc \
+ $(TESTSOURCES)
+
+tests_testACLMaxUserIP_LDADD = \
+ -L../lib -lmiscutil \
+ @SQUID_CPPUNIT_LA@ \
+ @SSLLIB@
+
+tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
+tests_testACLMaxUserIP_DEPENDENCIES = \
+ @SQUID_CPPUNIT_LA@
+
tests_testBoilerplate_SOURCES = tests/testBoilerplate.cc tests/testMain.cc tests/testBoilerplate.h $(TESTSOURCES)
tests_testBoilerplate_LDADD = \
-L../lib -lmiscutil \
HEADERS_TO_TEST = \
tests/testHeader_ACL.cc \
+ tests/testHeader_ConfigParser.cc \
tests/testHeader_dlink.cc \
tests/testHeader_HttpHeader.cc \
tests/testHeader_HttpHeaderRange.cc \
- tests/testHeader_HttpReply.cc
+ tests/testHeader_HttpReply.cc \
+ tests/testHeader_wordlist.cc
tests_testHeaders_SOURCES = tests/testMain.cc $(HEADERS_TO_TEST)
tests_testHeaders_LDADD = \
$(TESTSOURCES) \
$(DELAY_POOL_SOURCE) \
CacheDigest.cc \
+ ConfigParser.cc \
HttpMsg.cc \
store_dir.cc \
store.cc \
tests/stub_store_client.cc \
tests/stub_tools.cc \
HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+ acl_noncore.cc \
MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
- tests/stub_HttpRequest.cc tests/stub_access_log.cc
+ tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+ wordlist.cc
tests_testStore_SOURCES = tests/testStore.cc \
tests/testStoreController.cc \
tests/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) tests/$(DEPDIR)
@: > tests/$(DEPDIR)/$(am__dirstamp)
-tests/testAuth.$(OBJEXT): tests/$(am__dirstamp) \
+tests/stub_cache_manager.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
+tests/stub_store.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
+tests/testACLMaxUserIP.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
tests/testMain.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
@: > ../test-suite/$(DEPDIR)/$(am__dirstamp)
../test-suite/test_tools.$(OBJEXT): ../test-suite/$(am__dirstamp) \
../test-suite/$(DEPDIR)/$(am__dirstamp)
+tests/testACLMaxUserIP$(EXEEXT): $(tests_testACLMaxUserIP_OBJECTS) $(tests_testACLMaxUserIP_DEPENDENCIES) tests/$(am__dirstamp)
+ @rm -f tests/testACLMaxUserIP$(EXEEXT)
+ $(CXXLINK) $(tests_testACLMaxUserIP_LDFLAGS) $(tests_testACLMaxUserIP_OBJECTS) $(tests_testACLMaxUserIP_LDADD) $(LIBS)
+tests/testAuth.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
tests/stub_acl.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
tests/stub_cache_cf.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
tests/stub_helper.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
-tests/stub_cache_manager.$(OBJEXT): tests/$(am__dirstamp) \
- tests/$(DEPDIR)/$(am__dirstamp)
-tests/stub_store.$(OBJEXT): tests/$(am__dirstamp) \
- tests/$(DEPDIR)/$(am__dirstamp)
tests/stub_errorpage.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
tests/stub_HttpRequest.$(OBJEXT): tests/$(am__dirstamp) \
$(CXXLINK) $(tests_testCoss_LDFLAGS) $(tests_testCoss_OBJECTS) $(tests_testCoss_LDADD) $(LIBS)
tests/testHeader_ACL.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
+tests/testHeader_ConfigParser.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
tests/testHeader_dlink.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
tests/testHeader_HttpHeader.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
tests/testHeader_HttpReply.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
+tests/testHeader_wordlist.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
tests/testHeaders$(EXEEXT): $(tests_testHeaders_OBJECTS) $(tests_testHeaders_DEPENDENCIES) tests/$(am__dirstamp)
@rm -f tests/testHeaders$(EXEEXT)
$(CXXLINK) $(tests_testHeaders_LDFLAGS) $(tests_testHeaders_OBJECTS) $(tests_testHeaders_LDADD) $(LIBS)
-rm -f tests/stub_store_rebuild.$(OBJEXT)
-rm -f tests/stub_store_swapout.$(OBJEXT)
-rm -f tests/stub_tools.$(OBJEXT)
+ -rm -f tests/testACLMaxUserIP.$(OBJEXT)
-rm -f tests/testAuth.$(OBJEXT)
-rm -f tests/testBoilerplate.$(OBJEXT)
-rm -f tests/testCoss.$(OBJEXT)
-rm -f tests/testHeader_ACL.$(OBJEXT)
+ -rm -f tests/testHeader_ConfigParser.$(OBJEXT)
-rm -f tests/testHeader_HttpHeader.$(OBJEXT)
-rm -f tests/testHeader_HttpHeaderRange.$(OBJEXT)
-rm -f tests/testHeader_HttpReply.$(OBJEXT)
-rm -f tests/testHeader_dlink.$(OBJEXT)
+ -rm -f tests/testHeader_wordlist.$(OBJEXT)
-rm -f tests/testMain.$(OBJEXT)
-rm -f tests/testNull.$(OBJEXT)
-rm -f tests/testStore.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CacheDigest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClientBody.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigOption.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigParser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelayBucket.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelayConfig.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelayId.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SwapDir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_log.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl_noncore.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authenticate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_cf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wccp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whois.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wordlist.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@DiskIO/$(DEPDIR)/DiskIOModule.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@DiskIO/$(DEPDIR)/ReadRequest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@DiskIO/$(DEPDIR)/WriteRequest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_store_rebuild.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_store_swapout.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_tools.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testACLMaxUserIP.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testAuth.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testBoilerplate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testCoss.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_ACL.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_ConfigParser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpHeader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpHeaderRange.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpReply.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_dlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_wordlist.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testMain.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testNull.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testStore.Po@am__quote@
/*
- * $Id: acl.cc,v 1.317 2006/04/22 13:53:21 robertc Exp $
+ * $Id: acl.cc,v 1.318 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
#include "ACL.h"
#include "ACLChecklist.h"
#include "HttpRequest.h"
+#include "ConfigParser.h"
const char *AclMatchedName = NULL;
return result;
}
-ACL::ACL () {}
+ACL::ACL () :cfgline(NULL) {}
bool ACL::valid () const
{
if ((t = strtok(NULL, w_space)) == NULL) {
debug(28, 0) ("aclParseAclLine: missing ACL name.\n");
- self_destruct();
+ ConfigParser::Destruct();
return;
}
if ((theType = strtok(NULL, w_space)) == NULL) {
debug(28, 0) ("aclParseAclLine: missing ACL type.\n");
- self_destruct();
+ ConfigParser::Destruct();
return;
}
if (!Prototype::Registered (theType)) {
debug(28, 0) ("aclParseAclLine: Invalid ACL type '%s'\n", theType);
- self_destruct();
+ ConfigParser::Destruct();
return;
}
} else {
if (strcmp (A->typeString(),theType) ) {
debug(28, 0) ("aclParseAclLine: ACL '%s' already exists with different type.\n", A->name);
- self_destruct();
+ ConfigParser::Destruct();
return;
}
*head = A;
}
-/* does name lookup, returns page_id */
-err_type
-aclGetDenyInfoPage(acl_deny_info_list ** head, const char *name)
-{
- acl_deny_info_list *A = NULL;
- acl_name_list *L = NULL;
-
- debug(28,9)("aclGetDenyInfoPage: got called for %s\n",name);
-
- A = *head;
-
- if (NULL == *head) { /* empty list */
- debug(28,9)("aclGetDenyInfoPage: called for an empty list\n");
- return ERR_NONE;
- }
-
- while (A) {
- L = A->acl_list;
-
- if (NULL == L) { /* empty list should never happen, but in case */
- debug(28,3)("aclGetDenyInfoPage: "
- "WARNING, unexpected codepath taken\n");
- continue;
- }
-
- while (L) {
- if (!strcmp(name, L->name)) {
- debug(28,8)("aclGetDenyInfoPage: match on %s\n",name);
- return A->err_page_id;
- }
-
- L = L->next;
- }
-
- A = A->next;
- }
-
- debug(28,8)("aclGetDenyInfoPage: no match\n");
- return ERR_NONE;
-}
-
-/* does name lookup, returns if it is a proxy_auth acl */
-int
-aclIsProxyAuth(const char *name)
-{
- debug(28,5)("aclIsProxyAuth: called for %s\n",name);
-
- if (NULL == name)
- return false;
-
- ACL *a;
-
- if ((a = ACL::FindByName(name))) {
- debug(28,5)("aclIsProxyAuth: returning %d\n",a->isProxyAuth());
- return a->isProxyAuth();
- }
-
- debug(28,3)("aclIsProxyAuth: WARNING, called for nonexistent ACL\n");
- return false;
-}
-
bool
ACL::isProxyAuth() const
{
return false;
}
-/* maex@space.net (05.09.96)
- * get the info for redirecting "access denied" to info pages
- * TODO (probably ;-)
- * currently there is no optimization for
- * - more than one deny_info line with the same url
- * - a check, whether the given acl really is defined
- * - a check, whether an acl is added more than once for the same url
- */
-
-void
-aclParseDenyInfoLine(acl_deny_info_list ** head)
-{
- char *t = NULL;
- acl_deny_info_list *A = NULL;
- acl_deny_info_list *B = NULL;
- acl_deny_info_list **T = NULL;
- acl_name_list *L = NULL;
- acl_name_list **Tail = NULL;
-
- /* first expect a page name */
-
- if ((t = strtok(NULL, w_space)) == NULL) {
- debug(28, 0) ("aclParseDenyInfoLine: %s line %d: %s\n",
- cfg_filename, config_lineno, config_input_line);
- debug(28, 0) ("aclParseDenyInfoLine: missing 'error page' parameter.\n");
- return;
- }
-
- A = (acl_deny_info_list *)memAllocate(MEM_ACL_DENY_INFO_LIST);
- A->err_page_id = errorReservePageId(t);
- A->err_page_name = xstrdup(t);
- A->next = (acl_deny_info_list *) NULL;
- /* next expect a list of ACL names */
- Tail = &A->acl_list;
-
- while ((t = strtok(NULL, w_space))) {
- L = (acl_name_list *)memAllocate(MEM_ACL_NAME_LIST);
- xstrncpy(L->name, t, ACL_NAME_SZ);
- *Tail = L;
- Tail = &L->next;
- }
-
- if (A->acl_list == NULL) {
- debug(28, 0) ("aclParseDenyInfoLine: %s line %d: %s\n",
- cfg_filename, config_lineno, config_input_line);
- debug(28, 0) ("aclParseDenyInfoLine: deny_info line contains no ACL's, skipping\n");
- memFree(A, MEM_ACL_DENY_INFO_LIST);
- return;
- }
-
- for (B = *head, T = head; B; T = &B->next, B = B->next)
-
- ; /* find the tail */
- *T = A;
-}
-
-void
-aclParseAccessLine(acl_access ** head)
-{
- char *t = NULL;
- acl_access *A = NULL;
- acl_access *B = NULL;
- acl_access **T = NULL;
-
- /* first expect either 'allow' or 'deny' */
-
- if ((t = strtok(NULL, w_space)) == NULL) {
- debug(28, 0) ("aclParseAccessLine: %s line %d: %s\n",
- cfg_filename, config_lineno, config_input_line);
- debug(28, 0) ("aclParseAccessLine: missing 'allow' or 'deny'.\n");
- return;
- }
-
- A = new acl_access;
-
- if (!strcmp(t, "allow"))
- A->allow = ACCESS_ALLOWED;
- else if (!strcmp(t, "deny"))
- A->allow = ACCESS_DENIED;
- else {
- debug(28, 0) ("aclParseAccessLine: %s line %d: %s\n",
- cfg_filename, config_lineno, config_input_line);
- debug(28, 0) ("aclParseAccessLine: expecting 'allow' or 'deny', got '%s'.\n", t);
- delete A;
- return;
- }
-
- aclParseAclList(&A->aclList);
-
- if (A->aclList == NULL) {
- debug(28, 0) ("%s line %d: %s\n",
- cfg_filename, config_lineno, config_input_line);
- debug(28, 0) ("aclParseAccessLine: Access line contains no ACL's, skipping\n");
- delete A;
- return;
- }
-
- A->cfgline = xstrdup(config_input_line);
- /* Append to the end of this list */
-
- for (B = *head, T = head; B; T = &B->next, B = B->next)
-
- ;
- *T = A;
-
- /* We lock _acl_access structures in ACLChecklist::check() */
-}
ACLList::ACLList() : op (1), _acl (NULL), next (NULL)
{}
op = 1;
}
-void
-aclParseAclList(acl_list ** head)
-{
- acl_list **Tail = head; /* sane name in the use below */
- ACL *a = NULL;
- char *t;
-
- /* next expect a list of ACL names, possibly preceeded
- * by '!' for negation */
-
- while ((t = strtok(NULL, w_space))) {
- acl_list *L = new ACLList;
-
- if (*t == '!') {
- L->negated (true);
- t++;
- }
-
- debug(28, 3) ("aclParseAccessLine: looking for ACL name '%s'\n", t);
- a = ACL::FindByName(t);
-
- if (a == NULL) {
- debug(28, 0) ("aclParseAccessLine: ACL name '%s' not found.\n", t);
- delete L;
- self_destruct();
- continue;
- }
-
- L->_acl = a;
- *Tail = L;
- Tail = &L->next;
- }
-}
-
/* ACL result caching routines */
int
/* Destroy functions */
/*********************/
-void
-aclDestroyAcls(ACL ** head)
-{
- ACL *next = NULL;
-
- debug(28,8)("aclDestroyACLs: invoked\n");
-
- for (ACL *a = *head; a; a = next) {
- next = a->next;
- delete a;
- }
-
- *head = NULL;
-}
-
ACL::~ACL()
{
debug(28, 3) ("ACL::~ACL: '%s'\n", cfgline);
safe_free(cfgline);
}
-void
-aclDestroyAclList(acl_list ** head)
-{
- acl_list *l;
- debug(28,8)("aclDestroyAclList: invoked\n");
-
- for (l = *head; l; l = *head) {
- *head = l->next;
- delete l;
- }
-}
-
-void
-aclDestroyAccessList(acl_access ** list)
-{
- acl_access *l = NULL;
- acl_access *next = NULL;
-
- for (l = *list; l; l = next) {
- debug(28, 3) ("aclDestroyAccessList: '%s'\n", l->cfgline);
- next = l->next;
- aclDestroyAclList(&l->aclList);
- safe_free(l->cfgline);
- cbdataFree(l);
- }
-
- *list = NULL;
-}
-
-/* maex@space.net (06.09.1996)
- * destroy an _acl_deny_info_list */
-
-void
-aclDestroyDenyInfoList(acl_deny_info_list ** list)
-{
- acl_deny_info_list *a = NULL;
- acl_deny_info_list *a_next = NULL;
- acl_name_list *l = NULL;
- acl_name_list *l_next = NULL;
-
- debug(28,8)("aclDestroyDenyInfoList: invoked\n");
-
- for (a = *list; a; a = a_next) {
- for (l = a->acl_list; l; l = l_next) {
- l_next = l->next;
- safe_free(l);
- }
-
- a_next = a->next;
- xfree(a->err_page_name);
- memFree(a, MEM_ACL_DENY_INFO_LIST);
- }
-
- *list = NULL;
-}
-
-/*
- * This function traverses all ACL elements referenced
- * by an access list (presumably 'http_access'). If
- * it finds a PURGE method ACL, then it returns TRUE,
- * otherwise FALSE.
- */
-/* XXX: refactor this more sensibly. perhaps have the parser detect it ? */
-int
-aclPurgeMethodInUse(acl_access * a)
-{
- return a->containsPURGE();
-}
-
#include "ACLStrategised.h"
bool
acl_access::containsPURGE() const
--- /dev/null
+/*
+ * $Id: acl_noncore.cc,v 1.1 2006/04/23 11:10:31 robertc Exp $
+ *
+ * DEBUG: section 28 Access Control
+ * AUTHOR: Duane Wessels
+ *
+ * This file contains ACL routines that are not part of the
+ * ACL class, nor any other class yet, and that need to be
+ * factored into appropriate places. They are here to reduce
+ * unneeded dependencies between the ACL class and the rest
+ * of squid.
+ *
+ * SQUID Web Proxy Cache http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from
+ * the Internet community; see the CONTRIBUTORS file for full
+ * details. Many organizations have provided support for Squid's
+ * development; see the SPONSORS file for full details. Squid is
+ * Copyrighted (C) 2001 by the Regents of the University of
+ * California; see the COPYRIGHT file for full details. Squid
+ * incorporates software developed and/or copyrighted by other
+ * sources; see the CREDITS file for full details.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#include "squid.h"
+#include "ACL.h"
+#include "ACLChecklist.h"
+#include "HttpRequest.h"
+#include "ConfigParser.h"
+
+
+/* does name lookup, returns page_id */
+err_type
+aclGetDenyInfoPage(acl_deny_info_list ** head, const char *name)
+{
+ acl_deny_info_list *A = NULL;
+ acl_name_list *L = NULL;
+
+ debug(28,9)("aclGetDenyInfoPage: got called for %s\n",name);
+
+ A = *head;
+
+ if (NULL == *head) { /* empty list */
+ debug(28,9)("aclGetDenyInfoPage: called for an empty list\n");
+ return ERR_NONE;
+ }
+
+ while (A) {
+ L = A->acl_list;
+
+ if (NULL == L) { /* empty list should never happen, but in case */
+ debug(28,3)("aclGetDenyInfoPage: "
+ "WARNING, unexpected codepath taken\n");
+ continue;
+ }
+
+ while (L) {
+ if (!strcmp(name, L->name)) {
+ debug(28,8)("aclGetDenyInfoPage: match on %s\n",name);
+ return A->err_page_id;
+ }
+
+ L = L->next;
+ }
+
+ A = A->next;
+ }
+
+ debug(28,8)("aclGetDenyInfoPage: no match\n");
+ return ERR_NONE;
+}
+
+/* does name lookup, returns if it is a proxy_auth acl */
+int
+aclIsProxyAuth(const char *name)
+{
+ debug(28,5)("aclIsProxyAuth: called for %s\n",name);
+
+ if (NULL == name)
+ return false;
+
+ ACL *a;
+
+ if ((a = ACL::FindByName(name))) {
+ debug(28,5)("aclIsProxyAuth: returning %d\n",a->isProxyAuth());
+ return a->isProxyAuth();
+ }
+
+ debug(28,3)("aclIsProxyAuth: WARNING, called for nonexistent ACL\n");
+ return false;
+}
+
+
+/* maex@space.net (05.09.96)
+ * get the info for redirecting "access denied" to info pages
+ * TODO (probably ;-)
+ * currently there is no optimization for
+ * - more than one deny_info line with the same url
+ * - a check, whether the given acl really is defined
+ * - a check, whether an acl is added more than once for the same url
+ */
+
+void
+aclParseDenyInfoLine(acl_deny_info_list ** head)
+{
+ char *t = NULL;
+ acl_deny_info_list *A = NULL;
+ acl_deny_info_list *B = NULL;
+ acl_deny_info_list **T = NULL;
+ acl_name_list *L = NULL;
+ acl_name_list **Tail = NULL;
+
+ /* first expect a page name */
+
+ if ((t = strtok(NULL, w_space)) == NULL) {
+ debug(28, 0) ("aclParseDenyInfoLine: %s line %d: %s\n",
+ cfg_filename, config_lineno, config_input_line);
+ debug(28, 0) ("aclParseDenyInfoLine: missing 'error page' parameter.\n");
+ return;
+ }
+
+ A = (acl_deny_info_list *)memAllocate(MEM_ACL_DENY_INFO_LIST);
+ A->err_page_id = errorReservePageId(t);
+ A->err_page_name = xstrdup(t);
+ A->next = (acl_deny_info_list *) NULL;
+ /* next expect a list of ACL names */
+ Tail = &A->acl_list;
+
+ while ((t = strtok(NULL, w_space))) {
+ L = (acl_name_list *)memAllocate(MEM_ACL_NAME_LIST);
+ xstrncpy(L->name, t, ACL_NAME_SZ);
+ *Tail = L;
+ Tail = &L->next;
+ }
+
+ if (A->acl_list == NULL) {
+ debug(28, 0) ("aclParseDenyInfoLine: %s line %d: %s\n",
+ cfg_filename, config_lineno, config_input_line);
+ debug(28, 0) ("aclParseDenyInfoLine: deny_info line contains no ACL's, skipping\n");
+ memFree(A, MEM_ACL_DENY_INFO_LIST);
+ return;
+ }
+
+ for (B = *head, T = head; B; T = &B->next, B = B->next)
+
+ ; /* find the tail */
+ *T = A;
+}
+
+void
+aclParseAccessLine(acl_access ** head)
+{
+ char *t = NULL;
+ acl_access *A = NULL;
+ acl_access *B = NULL;
+ acl_access **T = NULL;
+
+ /* first expect either 'allow' or 'deny' */
+
+ if ((t = strtok(NULL, w_space)) == NULL) {
+ debug(28, 0) ("aclParseAccessLine: %s line %d: %s\n",
+ cfg_filename, config_lineno, config_input_line);
+ debug(28, 0) ("aclParseAccessLine: missing 'allow' or 'deny'.\n");
+ return;
+ }
+
+ A = new acl_access;
+
+ if (!strcmp(t, "allow"))
+ A->allow = ACCESS_ALLOWED;
+ else if (!strcmp(t, "deny"))
+ A->allow = ACCESS_DENIED;
+ else {
+ debug(28, 0) ("aclParseAccessLine: %s line %d: %s\n",
+ cfg_filename, config_lineno, config_input_line);
+ debug(28, 0) ("aclParseAccessLine: expecting 'allow' or 'deny', got '%s'.\n", t);
+ delete A;
+ return;
+ }
+
+ aclParseAclList(&A->aclList);
+
+ if (A->aclList == NULL) {
+ debug(28, 0) ("%s line %d: %s\n",
+ cfg_filename, config_lineno, config_input_line);
+ debug(28, 0) ("aclParseAccessLine: Access line contains no ACL's, skipping\n");
+ delete A;
+ return;
+ }
+
+ A->cfgline = xstrdup(config_input_line);
+ /* Append to the end of this list */
+
+ for (B = *head, T = head; B; T = &B->next, B = B->next)
+
+ ;
+ *T = A;
+
+ /* We lock _acl_access structures in ACLChecklist::check() */
+}
+
+void
+aclParseAclList(acl_list ** head)
+{
+ acl_list **Tail = head; /* sane name in the use below */
+ ACL *a = NULL;
+ char *t;
+
+ /* next expect a list of ACL names, possibly preceeded
+ * by '!' for negation */
+
+ while ((t = strtok(NULL, w_space))) {
+ acl_list *L = new ACLList;
+
+ if (*t == '!') {
+ L->negated (true);
+ t++;
+ }
+
+ debug(28, 3) ("aclParseAccessLine: looking for ACL name '%s'\n", t);
+ a = ACL::FindByName(t);
+
+ if (a == NULL) {
+ debug(28, 0) ("aclParseAccessLine: ACL name '%s' not found.\n", t);
+ delete L;
+ ConfigParser::Destruct();
+ continue;
+ }
+
+ L->_acl = a;
+ *Tail = L;
+ Tail = &L->next;
+ }
+}
+
+
+
+/*********************/
+/* Destroy functions */
+/*********************/
+
+void
+aclDestroyAcls(ACL ** head)
+{
+ ACL *next = NULL;
+
+ debug(28,8)("aclDestroyACLs: invoked\n");
+
+ for (ACL *a = *head; a; a = next) {
+ next = a->next;
+ delete a;
+ }
+
+ *head = NULL;
+}
+
+void
+aclDestroyAclList(acl_list ** head)
+{
+ acl_list *l;
+ debug(28,8)("aclDestroyAclList: invoked\n");
+
+ for (l = *head; l; l = *head) {
+ *head = l->next;
+ delete l;
+ }
+}
+
+void
+aclDestroyAccessList(acl_access ** list)
+{
+ acl_access *l = NULL;
+ acl_access *next = NULL;
+
+ for (l = *list; l; l = next) {
+ debug(28, 3) ("aclDestroyAccessList: '%s'\n", l->cfgline);
+ next = l->next;
+ aclDestroyAclList(&l->aclList);
+ safe_free(l->cfgline);
+ cbdataFree(l);
+ }
+
+ *list = NULL;
+}
+
+/* maex@space.net (06.09.1996)
+ * destroy an _acl_deny_info_list */
+
+void
+aclDestroyDenyInfoList(acl_deny_info_list ** list)
+{
+ acl_deny_info_list *a = NULL;
+ acl_deny_info_list *a_next = NULL;
+ acl_name_list *l = NULL;
+ acl_name_list *l_next = NULL;
+
+ debug(28,8)("aclDestroyDenyInfoList: invoked\n");
+
+ for (a = *list; a; a = a_next) {
+ for (l = a->acl_list; l; l = l_next) {
+ l_next = l->next;
+ safe_free(l);
+ }
+
+ a_next = a->next;
+ xfree(a->err_page_name);
+ memFree(a, MEM_ACL_DENY_INFO_LIST);
+ }
+
+ *list = NULL;
+}
+
+/*
+ * This function traverses all ACL elements referenced
+ * by an access list (presumably 'http_access'). If
+ * it finds a PURGE method ACL, then it returns TRUE,
+ * otherwise FALSE.
+ */
+/* XXX: refactor this more sensibly. perhaps have the parser detect it ? */
+int
+aclPurgeMethodInUse(acl_access * a)
+{
+ return a->containsPURGE();
+}
/*
- * $Id: asn.cc,v 1.103 2006/02/17 18:10:59 wessels Exp $
+ * $Id: asn.cc,v 1.104 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 53 AS Number handling
* AUTHOR: Duane Wessels, Kostas Anagnostakis
#include "ACLDestinationIP.h"
#include "HttpReply.h"
#include "forward.h"
+#include "wordlist.h"
#define WHOIS_PORT 43
#define AS_REQBUF_SZ 4096
/*
- * $Id: auth_basic.cc,v 1.39 2005/11/04 23:09:44 hno Exp $
+ * $Id: auth_basic.cc,v 1.40 2006/04/23 11:10:32 robertc Exp $
*
* DEBUG: section 29 Authenticator
* AUTHOR: Duane Wessels
#include "Store.h"
#include "HttpReply.h"
#include "basicScheme.h"
+#include "wordlist.h"
static void
authenticateStateFree(AuthenticateStateData * r)
/*
- * $Id: auth_digest.cc,v 1.43 2005/04/24 14:00:52 serassio Exp $
+ * $Id: auth_digest.cc,v 1.44 2006/04/23 11:10:33 robertc Exp $
*
* DEBUG: section 29 Authenticator
* AUTHOR: Robert Collins
#include "Store.h"
#include "HttpRequest.h"
#include "HttpReply.h"
+#include "wordlist.h"
/* TODO don't include this */
#include "digestScheme.h"
/*
- * $Id: auth_negotiate.cc,v 1.6 2005/11/06 22:50:25 hno Exp $
+ * $Id: auth_negotiate.cc,v 1.7 2006/04/23 11:10:33 robertc Exp $
*
* DEBUG: section 29 Negotiate Authenticator
* AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
#include "HttpRequest.h"
/* TODO remove this include */
#include "negotiateScheme.h"
+#include "wordlist.h"
static void
authenticateNegotiateReleaseServer(auth_user_request_t * auth_user_request);
/*
- * $Id: auth_ntlm.cc,v 1.55 2006/02/26 15:08:32 serassio Exp $
+ * $Id: auth_ntlm.cc,v 1.56 2006/04/23 11:10:34 robertc Exp $
*
* DEBUG: section 29 NTLM Authenticator
* AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
#include "HttpRequest.h"
/* TODO remove this include */
#include "ntlmScheme.h"
+#include "wordlist.h"
static void
authenticateNTLMReleaseServer(auth_user_request_t * auth_user_request);
/*
- * $Id: cache_cf.cc,v 1.489 2006/04/22 01:53:52 hno Exp $
+ * $Id: cache_cf.cc,v 1.490 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Harvest Derived
#include "StoreFileSystem.h"
#include "Parsing.h"
#include "MemBuf.h"
+#include "wordlist.h"
#if SQUID_SNMP
#include "snmp.h"
void
self_destruct(void)
{
- shutting_down = 1;
- fatalf("Bungled %s line %d: %s",
- cfg_filename, config_lineno, config_input_line);
-}
-
-void
-wordlistDestroy(wordlist ** list)
-{
- wordlist *w = NULL;
-
- while ((w = *list) != NULL) {
- *list = w->next;
- safe_free(w->key);
- memFree(w, MEM_WORDLIST);
- }
-
- *list = NULL;
-}
-
-const char *
-wordlistAdd(wordlist ** list, const char *key)
-{
- while (*list)
- list = &(*list)->next;
-
- *list = static_cast<wordlist *>(memAllocate(MEM_WORDLIST));
-
- (*list)->key = xstrdup(key);
-
- (*list)->next = NULL;
-
- return (*list)->key;
-}
-
-void
-wordlistJoin(wordlist ** list, wordlist ** wl)
-{
- while (*list)
- list = &(*list)->next;
-
- *list = *wl;
-
- *wl = NULL;
-}
-
-void
-wordlistAddWl(wordlist ** list, wordlist * wl)
-{
- while (*list)
- list = &(*list)->next;
-
- for (; wl; wl = wl->next, list = &(*list)->next) {
- *list = static_cast<wordlist *>(memAllocate(MEM_WORDLIST));
- (*list)->key = xstrdup(wl->key);
- (*list)->next = NULL;
- }
-}
-
-void
-wordlistCat(const wordlist * w, MemBuf * mb)
-{
- while (NULL != w) {
- mb->Printf("%s\n", w->key);
- w = w->next;
- }
-}
-
-wordlist *
-wordlistDup(const wordlist * w)
-{
- wordlist *D = NULL;
-
- while (NULL != w) {
- wordlistAdd(&D, w->key);
- w = w->next;
- }
-
- return D;
+ ConfigParser::Destruct();
}
/*
char *
strtokFile(void)
{
- static int fromFile = 0;
- static FILE *wordFile = NULL;
-
- char *t, *fn;
- LOCAL_ARRAY(char, buf, 256);
-
-strtok_again:
-
- if (!fromFile) {
- t = (strtok(NULL, w_space));
-
- if (!t || *t == '#') {
- return NULL;
- } else if (*t == '\"' || *t == '\'') {
- /* quote found, start reading from file */
- fn = ++t;
-
- while (*t && *t != '\"' && *t != '\'')
- t++;
-
- *t = '\0';
-
- if ((wordFile = fopen(fn, "r")) == NULL) {
- debug(28, 0) ("strtokFile: %s not found\n", fn);
- return (NULL);
- }
-
-#ifdef _SQUID_WIN32_
- setmode(fileno(wordFile), O_TEXT);
-
-#endif
-
- fromFile = 1;
- } else {
- return t;
- }
- }
-
- /* fromFile */
- if (fgets(buf, 256, wordFile) == NULL) {
- /* stop reading from file */
- fclose(wordFile);
- wordFile = NULL;
- fromFile = 0;
- goto strtok_again;
- } else {
- char *t2, *t3;
- t = buf;
- /* skip leading and trailing white space */
- t += strspn(buf, w_space);
- t2 = t + strcspn(t, w_space);
- t3 = t2 + strspn(t2, w_space);
-
- while (*t3 && *t3 != '#') {
- t2 = t3 + strcspn(t3, w_space);
- t3 = t2 + strspn(t2, w_space);
- }
-
- *t2 = '\0';
- /* skip comments */
-
- if (*t == '#')
- goto strtok_again;
-
- /* skip blank lines */
- if (!*t)
- goto strtok_again;
-
- return t;
- }
+ return ConfigParser::strtokFile();
}
#include "AccessLogEntry.h"
/*
- * $Id: cache_manager.cc,v 1.37 2006/02/17 20:15:35 wessels Exp $
+ * $Id: cache_manager.cc,v 1.38 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 16 Cache Manager Objects
* AUTHOR: Duane Wessels
#include "HttpRequest.h"
#include "Store.h"
#include "fde.h"
+#include "wordlist.h"
#define MGR_PASSWD_SZ 128
/*
- * $Id: client_side_request.cc,v 1.60 2006/04/02 11:58:38 serassio Exp $
+ * $Id: client_side_request.cc,v 1.61 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 85 Client-side Request Routines
* AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
#include "HttpReply.h"
#include "MemObject.h"
#include "ClientRequestContext.h"
+#include "wordlist.h"
#if ICAP_CLIENT
#include "ICAP/ICAPClientReqmodPrecache.h"
/*
- * $Id: dns_internal.cc,v 1.86 2005/11/20 18:39:22 serassio Exp $
+ * $Id: dns_internal.cc,v 1.87 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c
* AUTHOR: Duane Wessels
*
*/
+#include "config.h"
#include "squid.h"
#include "Store.h"
#include "comm.h"
#include "MemBuf.h"
-#include "config.h"
+#include "wordlist.h"
#if HAVE_ARPA_NAMESER_H
#include <arpa/nameser.h>
/*
- * $Id: enums.h,v 1.248 2006/04/22 13:53:21 robertc Exp $
+ * $Id: enums.h,v 1.249 2006/04/23 11:10:31 robertc Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
MEM_NETDBENTRY,
MEM_NET_DB_NAME,
MEM_RELIST,
- MEM_WORDLIST,
#if !USE_DNSSERVERS
MEM_IDNS_QUERY,
#endif
/*
- * $Id: errorpage.cc,v 1.209 2006/04/02 14:32:35 serassio Exp $
+ * $Id: errorpage.cc,v 1.210 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 4 Error Generation
* AUTHOR: Duane Wessels
#include "MemObject.h"
#include "fde.h"
#include "MemBuf.h"
+#include "wordlist.h"
/* local types */
/*
- * $Id: external_acl.cc,v 1.67 2006/01/25 13:16:11 hno Exp $
+ * $Id: external_acl.cc,v 1.68 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 82 External ACL
* AUTHOR: Henrik Nordstrom, MARA Systems AB
#include "HttpRequest.h"
#include "authenticate.h"
#include "MemBuf.h"
+#include "wordlist.h"
#ifndef DEFAULT_EXTERNAL_ACL_TTL
#define DEFAULT_EXTERNAL_ACL_TTL 1 * 60 * 60
/*
- * $Id: fqdncache.cc,v 1.165 2005/10/23 14:10:45 serassio Exp $
+ * $Id: fqdncache.cc,v 1.166 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 35 FQDN Cache
* AUTHOR: Harvest Derived
#include "squid.h"
#include "Store.h"
+#include "wordlist.h"
#define FQDN_LOW_WATER 90
#define FQDN_HIGH_WATER 95
/*
- * $Id: store_dir_ufs.cc,v 1.70 2006/03/08 10:35:58 hno Exp $
+ * $Id: store_dir_ufs.cc,v 1.71 2006/04/23 11:10:34 robertc Exp $
*
* DEBUG: section 47 Store Directory Routines
* AUTHOR: Duane Wessels
void
UFSSwapDir::init()
{
- /* Parsing is finished - force to NULL, don't delete */
+ debugs(47, 3, "Initialising UFS SwapDir engine.");
+ /* Parsing must be finished by now - force to NULL, don't delete */
currentIOOptions = NULL;
static int started_clean_event = 0;
static const char *errmsg =
void
UFSSwapDir::create()
{
- debug(47, 3) ("Creating swap space in %s\n", path);
+ debugs(47, 3, "Creating swap space in " << path);
createDirectory(path, 0);
createSwapSubDirs();
}
/*
- * $Id: ftp.cc,v 1.390 2006/04/09 12:21:52 serassio Exp $
+ * $Id: ftp.cc,v 1.391 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 9 File Transfer Protocol (FTP)
* AUTHOR: Harvest Derived
#include "forward.h"
#include "Server.h"
#include "MemBuf.h"
+#include "wordlist.h"
#if ICAP_CLIENT
#include "ICAP/ICAPClientRespmodPrecache.h"
if (*s >= '0' && *s <= '9' && (*(s + 3) == '-' || *(s + 3) == ' '))
offset = 4;
- list = (wordlist *)memAllocate(MEM_WORDLIST);
+ list = new wordlist();
list->key = (char *)xmalloc(linelen - offset);
ftpState->pathcomps = w->next;
- memFree(w, MEM_WORDLIST);
+ delete w;
/* Check if we are to CWD or RETR */
if (ftpState->pathcomps != NULL || ftpState->flags.isdir) {
/*
- * $Id: helper.cc,v 1.72 2006/04/02 10:15:24 serassio Exp $
+ * $Id: helper.cc,v 1.73 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 84 Helper process maintenance
* AUTHOR: Harvest Derived?
#include "Store.h"
#include "comm.h"
#include "MemBuf.h"
+#include "wordlist.h"
#define HELPER_MAX_ARGS 64
/*
- * $Id: icp_v2.cc,v 1.90 2006/02/17 18:10:59 wessels Exp $
+ * $Id: icp_v2.cc,v 1.91 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 12 Internet Cache Protocol
* AUTHOR: Duane Wessels
#include "ACLChecklist.h"
#include "ACL.h"
#include "AccessLogEntry.h"
+#include "wordlist.h"
static void icpLogIcp(struct IN_ADDR, log_type, int, const char *, int);
/*
- * $Id: internal.cc,v 1.38 2006/04/23 09:02:13 serassio Exp $
+ * $Id: internal.cc,v 1.39 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 76 Internal Squid Object handling
* AUTHOR: Duane, Alex, Henrik
#include "HttpRequest.h"
#include "HttpReply.h"
#include "MemBuf.h"
+#include "wordlist.h"
/* called when we "miss" on an internal object;
* generate known dynamic objects,
/*
- * $Id: ipcache.cc,v 1.252 2005/10/23 14:10:45 serassio Exp $
+ * $Id: ipcache.cc,v 1.253 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 14 IP Cache
* AUTHOR: Harvest Derived
#include "squid.h"
#include "Store.h"
+#include "wordlist.h"
typedef struct _ipcache_entry ipcache_entry;
/*
- * $Id: main.cc,v 1.416 2006/01/03 17:22:31 wessels Exp $
+ * $Id: main.cc,v 1.417 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 1 Startup and Main Loop
* AUTHOR: Harvest Derived
eventRun();
- /* Attempt any pending storedir IO */
+ /* Attempt any pending storedir IO
+ * Note: the storedir is roughly a reactor of its own.
+ */
Store::Root().callback();
comm_calliocallback();
/*
- * $Id: mem.cc,v 1.91 2006/04/22 05:29:19 robertc Exp $
+ * $Id: mem.cc,v 1.92 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 13 High Level Memory Pool Management
* AUTHOR: Harvest Derived
memDataInit(MEM_NETDBENTRY, "netdbEntry", sizeof(netdbEntry), 0);
memDataInit(MEM_NET_DB_NAME, "net_db_name", sizeof(net_db_name), 0);
memDataInit(MEM_RELIST, "relist", sizeof(relist), 0);
- memDataInit(MEM_WORDLIST, "wordlist", sizeof(wordlist), 0);
memDataInit(MEM_CLIENT_INFO, "ClientInfo", sizeof(ClientInfo), 0);
memDataInit(MEM_MD5_DIGEST, "MD5 digest", MD5_DIGEST_CHARS, 0);
MemPools[MEM_MD5_DIGEST]->setChunkSize(512 * 1024);
/*
- * $Id: net_db.cc,v 1.184 2006/04/18 12:34:22 robertc Exp $
+ * $Id: net_db.cc,v 1.185 2006/04/23 11:10:31 robertc Exp $
*
* DEBUG: section 38 Network Measurement Database
* AUTHOR: Duane Wessels
#include "MemObject.h"
#include "fde.h"
#include "forward.h"
+#include "wordlist.h"
#if USE_ICMP
#include "StoreClient.h"
/*
- * $Id: protos.h,v 1.521 2006/04/22 06:03:42 robertc Exp $
+ * $Id: protos.h,v 1.522 2006/04/23 11:10:32 robertc Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
* cache_cf.c
*/
SQUIDCEXTERN int parseConfigFile(const char *file_name);
-SQUIDCEXTERN const char *wordlistAdd(wordlist **, const char *);
-SQUIDCEXTERN void wordlistAddWl(wordlist **, wordlist *);
-SQUIDCEXTERN void wordlistJoin(wordlist **, wordlist **);
-SQUIDCEXTERN wordlist *wordlistDup(const wordlist *);
-SQUIDCEXTERN void wordlistDestroy(wordlist **);
SQUIDCEXTERN void configFreeMemory(void);
SQUIDCEXTERN void wordlistCat(const wordlist *, MemBuf * mb);
SQUIDCEXTERN void self_destruct(void);
/*
- * $Id: store_repl_heap.cc,v 1.17 2004/12/20 16:30:47 robertc Exp $
+ * $Id: store_repl_heap.cc,v 1.18 2006/04/23 11:10:35 robertc Exp $
*
* DEBUG: section ? HEAP based removal policies
* AUTHOR: Henrik Nordstrom
#include "store_heap_replacement.h"
#include "Store.h"
#include "MemObject.h"
+#include "wordlist.h"
REMOVALPOLICYCREATE createRemovalPolicy_heap;
/*
- * $Id: structs.h,v 1.538 2006/04/22 05:29:20 robertc Exp $
+ * $Id: structs.h,v 1.539 2006/04/23 11:10:32 robertc Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
size_t size;
};
-struct _wordlist
-{
- char *key;
- wordlist *next;
-};
-
struct _ushortlist
{
u_short i;
/*
- * $Id: stub_cache_cf.cc,v 1.2 2005/12/26 10:16:05 serassio Exp $
+ * $Id: stub_cache_cf.cc,v 1.3 2006/04/23 11:10:35 robertc Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Robert Collins
#include "squid.h"
#include "ConfigParser.h"
+#include "wordlist.h"
void
self_destruct(void)
fatal("not implemented 6");
}
-const char *
-wordlistAdd(wordlist ** list, const char *key)
-{
- while (*list)
- list = &(*list)->next;
-
- *list = static_cast<wordlist *>(memAllocate(MEM_WORDLIST));
-
- (*list)->key = xstrdup(key);
-
- (*list)->next = NULL;
-
- return (*list)->key;
-}
-
-void
-wordlistDestroy(wordlist ** list)
-{
- fatal("not implemented 8");
-}
-
char *
strtokFile(void)
{
--- /dev/null
+#include "squid.h"
+#include <stdexcept>
+
+#include "testACLMaxUserIP.h"
+#include "ACLMaxUserIP.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION( testACLMaxUserIP );
+
+
+void
+testACLMaxUserIP::testDefaults()
+{
+ ACLMaxUserIP anACL("max_user_ip");
+ /* 0 is not a valid maximum, so we start at 0 */
+ CPPUNIT_ASSERT(anACL.getMaximum() == 0);
+ /* and we have no option to turn strict OFF, so start ON. */
+ CPPUNIT_ASSERT(anACL.getStrict() == false);
+ /* an unparsed acl must not be valid - there is no sane default */
+ CPPUNIT_ASSERT(!anACL.valid());
+}
+
+
+void
+testACLMaxUserIP::testParseLine()
+{
+ /* a config line to pass with a lead-in token to seed the parser. */
+ char * line = xstrdup("token -s 1");
+ /* seed the parser */
+ strtok(line, w_space);
+ ACLMaxUserIP anACL("max_user_ip");
+ anACL.parse();
+ /* we want a maximum of one, and strict to be true */
+ CPPUNIT_ASSERT(anACL.getMaximum() == 1);
+ CPPUNIT_ASSERT(anACL.getStrict() == true);
+ /* the acl must be vaid */
+ CPPUNIT_ASSERT(anACL.valid());
+ xfree(line);
+}
--- /dev/null
+
+#ifndef SQUID_SRC_TEST_ACLMAXUSERIP_H
+#define SQUID_SRC_TEST_ACLMAXUSERIP_H
+
+#include <cppunit/extensions/HelperMacros.h>
+
+/*
+ * demonstration test file, as new idioms are made they will
+ * be shown in the testBoilerplate source.
+ */
+
+class testACLMaxUserIP : public CPPUNIT_NS::TestFixture
+{
+ CPPUNIT_TEST_SUITE( testACLMaxUserIP );
+ /* note the statement here and then the actual prototype below */
+ CPPUNIT_TEST( testDefaults );
+ CPPUNIT_TEST( testParseLine );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+
+protected:
+ void testDefaults();
+ void testParseLine();
+};
+
+#endif /* SQUID_SRC_TEST_ACLMAXUSERIP_H */
+
--- /dev/null
+/* This test tests that the header below can be processed on its own with
+ * no other #includes. Dont add any!
+ */
+#include "ConfigParser.h"
--- /dev/null
+/* This test tests that the header below can be processed on its own with
+ * no other #includes. Dont add any!
+ */
+#include "wordlist.h"
/*
- * $Id: tools.cc,v 1.265 2006/02/18 00:09:35 wessels Exp $
+ * $Id: tools.cc,v 1.266 2006/04/23 11:10:32 robertc Exp $
*
* DEBUG: section 21 Misc Functions
* AUTHOR: Harvest Derived
#include "SwapDir.h"
#include "fde.h"
#include "MemBuf.h"
+#include "wordlist.h"
#if HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
/*
- * $Id: typedefs.h,v 1.180 2006/04/22 05:29:21 robertc Exp $
+ * $Id: typedefs.h,v 1.181 2006/04/23 11:10:32 robertc Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
class ACLChecklist;
-typedef struct _wordlist wordlist;
-
typedef struct _ushortlist ushortlist;
typedef struct _relist relist;
class FwdServer;
typedef void PSC(FwdServer *, void *);
typedef void RH(void *data, char *);
+/* in wordlist.h */
+
+class wordlist;
typedef void UH(void *data, wordlist *);
typedef int READ_HANDLER(int, char *, int);
typedef int WRITE_HANDLER(int, const char *, int);
/*
- * $Id: url.cc,v 1.151 2006/04/23 09:02:13 serassio Exp $
+ * $Id: url.cc,v 1.152 2006/04/23 11:10:32 robertc Exp $
*
* DEBUG: section 23 URL Parsing
* AUTHOR: Duane Wessels
#include "squid.h"
#include "HttpRequest.h"
+#include "wordlist.h"
const char *RequestMethodStr[] =
{
--- /dev/null
+
+/*
+ * $Id: wordlist.cc,v 1.1 2006/04/23 11:10:32 robertc Exp $
+ *
+ * DEBUG: section 3 Configuration File Parsing
+ * AUTHOR: Harvest Derived
+ *
+ * SQUID Web Proxy Cache http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from
+ * the Internet community; see the CONTRIBUTORS file for full
+ * details. Many organizations have provided support for Squid's
+ * development; see the SPONSORS file for full details. Squid is
+ * Copyrighted (C) 2001 by the Regents of the University of
+ * California; see the COPYRIGHT file for full details. Squid
+ * incorporates software developed and/or copyrighted by other
+ * sources; see the CREDITS file for full details.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#include "wordlist.h"
+#include "MemBuf.h"
+
+void
+wordlistDestroy(wordlist ** list)
+{
+ wordlist *w = NULL;
+
+ while ((w = *list) != NULL) {
+ *list = w->next;
+ safe_free(w->key);
+ delete w;
+ }
+
+ *list = NULL;
+}
+
+const char *
+wordlistAdd(wordlist ** list, const char *key)
+{
+ while (*list)
+ list = &(*list)->next;
+
+ *list = new wordlist;
+
+ (*list)->key = xstrdup(key);
+
+ (*list)->next = NULL;
+
+ return (*list)->key;
+}
+
+void
+wordlistJoin(wordlist ** list, wordlist ** wl)
+{
+ while (*list)
+ list = &(*list)->next;
+
+ *list = *wl;
+
+ *wl = NULL;
+}
+
+void
+wordlistAddWl(wordlist ** list, wordlist * wl)
+{
+ while (*list)
+ list = &(*list)->next;
+
+ for (; wl; wl = wl->next, list = &(*list)->next) {
+ *list = new wordlist();
+ (*list)->key = xstrdup(wl->key);
+ (*list)->next = NULL;
+ }
+}
+
+void
+wordlistCat(const wordlist * w, MemBuf * mb)
+{
+ while (NULL != w) {
+ mb->Printf("%s\n", w->key);
+ w = w->next;
+ }
+}
+
+wordlist *
+wordlistDup(const wordlist * w)
+{
+ wordlist *D = NULL;
+
+ while (NULL != w) {
+ wordlistAdd(&D, w->key);
+ w = w->next;
+ }
+
+ return D;
+}
--- /dev/null
+
+/*
+ * $Id: wordlist.h,v 1.1 2006/04/23 11:10:32 robertc Exp $
+ *
+ *
+ * SQUID Web Proxy Cache http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from
+ * the Internet community; see the CONTRIBUTORS file for full
+ * details. Many organizations have provided support for Squid's
+ * development; see the SPONSORS file for full details. Squid is
+ * Copyrighted (C) 2001 by the Regents of the University of
+ * California; see the COPYRIGHT file for full details. Squid
+ * incorporates software developed and/or copyrighted by other
+ * sources; see the CREDITS file for full details.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#ifndef SQUID_WORDLIST_H
+#define SQUID_WORDLIST_H
+
+#include "squid.h"
+#include "MemPool.h"
+
+class wordlist
+{
+
+public:
+ MEMPROXY_CLASS(wordlist);
+ char *key;
+ wordlist *next;
+};
+
+MEMPROXY_CLASS_INLINE(wordlist);
+
+SQUIDCEXTERN const char *wordlistAdd(wordlist **, const char *);
+SQUIDCEXTERN void wordlistAddWl(wordlist **, wordlist *);
+SQUIDCEXTERN void wordlistJoin(wordlist **, wordlist **);
+SQUIDCEXTERN wordlist *wordlistDup(const wordlist *);
+SQUIDCEXTERN void wordlistDestroy(wordlist **);
+
+#endif /* SQUID_WORDLIST_H */
projects / thirdparty / squid.git / commitdiff
