Commit upstream/0.69 - squidview

Imported Upstream version 0.69 Willi Mann 11 years ago

8 changed file(s) with 119 addition(s) and 76 deletion(s). Raw diff Collapse all Expand all

-0

ChangeLog less more

0	0	>> Squidview history:
	1
	2	v0.69: 24 October 2004:
	3	- removed an emun for clean compiles on gcc 3.4 - the same patch made by a
	4	few people - thanks to all - should've done it long ago (bad me).
1	5
2	6	v0.68: 18 April 2004:
3	7	- incorporated bug fixs by Willi Mann in CreateLinks():

-4

Makefile.in less more

0		# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
1
2		# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
	0	# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
	1
	2	# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
3	3	# This Makefile.in is free software; the Free Software Foundation
4	4	# gives unlimited permission to copy and/or distribute it,
5	5	# with or without modifications, as long as this notice is preserved.

120	120	$(ACLOCAL_M4): configure.in
121	121	cd $(srcdir) && $(ACLOCAL)
122	122
123		config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
	123	config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
124	124	$(SHELL) ./config.status --recheck
125	125	$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
126	126	cd $(srcdir) && $(AUTOCONF)

+39

-9

aclocal.m4 less more

0		dnl aclocal.m4 generated automatically by aclocal 1.4-p4
	0	dnl aclocal.m4 generated automatically by aclocal 1.4-p6
1	1
2		dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
	2	dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
3	3	dnl This file is free software; the Free Software Foundation
4	4	dnl gives unlimited permission to copy and/or distribute it,
5	5	dnl with or without modifications, as long as this notice is preserved.

11	11
12	12	# Like AC_CONFIG_HEADER, but automatically create stamp file.
13	13
14		AC_DEFUN(AM_CONFIG_HEADER,
	14	AC_DEFUN([AM_CONFIG_HEADER],
15	15	[AC_PREREQ([2.12])
16	16	AC_CONFIG_HEADER([$1])
17	17	dnl When config.status generates a header, we must update the stamp-h file.

41	41	dnl Usage:
42	42	dnl AM_INIT_AUTOMAKE(package,version, [no-define])
43	43
44		AC_DEFUN(AM_INIT_AUTOMAKE,
45		[AC_REQUIRE([AC_PROG_INSTALL])
	44	AC_DEFUN([AM_INIT_AUTOMAKE],
	45	[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
	46	AC_REQUIRE([AC_PROG_INSTALL])
46	47	PACKAGE=[$1]
47	48	AC_SUBST(PACKAGE)
48	49	VERSION=[$2]

58	59	AC_REQUIRE([AC_ARG_PROGRAM])
59	60	dnl FIXME This is truly gross.
60	61	missing_dir=`cd $ac_aux_dir && pwd`
61		AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
	62	AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
62	63	AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
63		AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
	64	AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
64	65	AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
65	66	AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
66	67	AC_REQUIRE([AC_PROG_MAKE_SET])])
	68
	69	# Copyright 2002 Free Software Foundation, Inc.
	70
	71	# This program is free software; you can redistribute it and/or modify
	72	# it under the terms of the GNU General Public License as published by
	73	# the Free Software Foundation; either version 2, or (at your option)
	74	# any later version.
	75
	76	# This program is distributed in the hope that it will be useful,
	77	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	78	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	79	# GNU General Public License for more details.
	80
	81	# You should have received a copy of the GNU General Public License
	82	# along with this program; if not, write to the Free Software
	83	# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
	84
	85	# AM_AUTOMAKE_VERSION(VERSION)
	86	# ----------------------------
	87	# Automake X.Y traces this macro to ensure aclocal.m4 has been
	88	# generated from the m4 files accompanying Automake X.Y.
	89	AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
	90
	91	# AM_SET_CURRENT_AUTOMAKE_VERSION
	92	# -------------------------------
	93	# Call AM_AUTOMAKE_VERSION so it can be traced.
	94	# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
	95	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
	96	[AM_AUTOMAKE_VERSION([1.4-p6])])
67	97
68	98	#
69	99	# Check to make sure that the build environment is sane.
70	100	#
71	101
72		AC_DEFUN(AM_SANITY_CHECK,
	102	AC_DEFUN([AM_SANITY_CHECK],
73	103	[AC_MSG_CHECKING([whether build environment is sane])
74	104	# Just in case
75	105	sleep 1

110	140
111	141	dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
112	142	dnl The program must properly implement --version.
113		AC_DEFUN(AM_MISSING_PROG,
	143	AC_DEFUN([AM_MISSING_PROG],
114	144	[AC_MSG_CHECKING(for working $2)
115	145	# Run test in a subshell; some versions of sh will print an error if
116	146	# an executable is not found, even if stderr is redirected.

-1

config.h.in less more

0		/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
	0	/* config.h.in. Generated automatically from configure.in by autoheader. */
1	1
2	2	#undef SHAREDIR
3	3

+52

-51

configure less more

542	542	ac_config_sub=$ac_aux_dir/config.sub
543	543	ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
544	544
	545	am__api_version="1.4"
545	546	# Find a good install program. We prefer a C program (faster),
546	547	# so one script is as good as another. But avoid the broken or
547	548	# incompatible versions:

554	555	# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
555	556	# ./install, which can be erroneously created by make from ./install.sh.
556	557	echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
557		echo "configure:559: checking for a BSD compatible install" >&5
	558	echo "configure:560: checking for a BSD compatible install" >&5
558	559	if test -z "$INSTALL"; then
559	560	if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
560	561	echo $ac_n "(cached) $ac_c" 1>&6

607	608	test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
608	609
609	610	echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
610		echo "configure:612: checking whether build environment is sane" >&5
	611	echo "configure:613: checking whether build environment is sane" >&5
611	612	# Just in case
612	613	sleep 1
613	614	echo timestamp > conftestfile

664	665	test "$program_transform_name" = "" && program_transform_name="s,x,x,"
665	666
666	667	echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
667		echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5
	668	echo "configure:670: checking whether ${MAKE-make} sets \${MAKE}" >&5
668	669	set dummy ${MAKE-make}; ac_make=`echo "$2" \| sed 'y%./+-%__p_%'`
669	670	if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
670	671	echo $ac_n "(cached) $ac_c" 1>&6

693	694
694	695	PACKAGE=squidview
695	696
696		VERSION=0.68
	697	VERSION=0.69
697	698
698	699	if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
699	700	{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

709	710
710	711
711	712	missing_dir=`cd $ac_aux_dir && pwd`
712		echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
713		echo "configure:715: checking for working aclocal" >&5
	713	echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
	714	echo "configure:716: checking for working aclocal-${am__api_version}" >&5
714	715	# Run test in a subshell; some versions of sh will print an error if
715	716	# an executable is not found, even if stderr is redirected.
716	717	# Redirect stdin to placate older versions of autoconf. Sigh.
717		if (aclocal --version) < /dev/null > /dev/null 2>&1; then
718		ACLOCAL=aclocal
	718	if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
	719	ACLOCAL=aclocal-${am__api_version}
719	720	echo "$ac_t""found" 1>&6
720	721	else
721		ACLOCAL="$missing_dir/missing aclocal"
	722	ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
722	723	echo "$ac_t""missing" 1>&6
723	724	fi
724	725
725	726	echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
726		echo "configure:728: checking for working autoconf" >&5
	727	echo "configure:729: checking for working autoconf" >&5
727	728	# Run test in a subshell; some versions of sh will print an error if
728	729	# an executable is not found, even if stderr is redirected.
729	730	# Redirect stdin to placate older versions of autoconf. Sigh.

735	736	echo "$ac_t""missing" 1>&6
736	737	fi
737	738
738		echo $ac_n "checking for working automake""... $ac_c" 1>&6
739		echo "configure:741: checking for working automake" >&5
	739	echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
	740	echo "configure:742: checking for working automake-${am__api_version}" >&5
740	741	# Run test in a subshell; some versions of sh will print an error if
741	742	# an executable is not found, even if stderr is redirected.
742	743	# Redirect stdin to placate older versions of autoconf. Sigh.
743		if (automake --version) < /dev/null > /dev/null 2>&1; then
744		AUTOMAKE=automake
	744	if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
	745	AUTOMAKE=automake-${am__api_version}
745	746	echo "$ac_t""found" 1>&6
746	747	else
747		AUTOMAKE="$missing_dir/missing automake"
	748	AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
748	749	echo "$ac_t""missing" 1>&6
749	750	fi
750	751
751	752	echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
752		echo "configure:754: checking for working autoheader" >&5
	753	echo "configure:755: checking for working autoheader" >&5
753	754	# Run test in a subshell; some versions of sh will print an error if
754	755	# an executable is not found, even if stderr is redirected.
755	756	# Redirect stdin to placate older versions of autoconf. Sigh.

762	763	fi
763	764
764	765	echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
765		echo "configure:767: checking for working makeinfo" >&5
	766	echo "configure:768: checking for working makeinfo" >&5
766	767	# Run test in a subshell; some versions of sh will print an error if
767	768	# an executable is not found, even if stderr is redirected.
768	769	# Redirect stdin to placate older versions of autoconf. Sigh.

780	781	# Extract the first word of "$ac_prog", so it can be a program name with args.
781	782	set dummy $ac_prog; ac_word=$2
782	783	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
783		echo "configure:785: checking for $ac_word" >&5
	784	echo "configure:786: checking for $ac_word" >&5
784	785	if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
785	786	echo $ac_n "(cached) $ac_c" 1>&6
786	787	else

812	813
813	814
814	815	echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
815		echo "configure:817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
	816	echo "configure:818: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
816	817
817	818	ac_ext=C
818	819	# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

823	824
824	825	cat > conftest.$ac_ext << EOF
825	826
826		#line 828 "configure"
	827	#line 829 "configure"
827	828	#include "confdefs.h"
828	829
829	830	int main(){return(0);}
830	831	EOF
831		if { (eval echo configure:833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	832	if { (eval echo configure:834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
832	833	ac_cv_prog_cxx_works=yes
833	834	# If we can't run a trivial program, we are probably using a cross compiler.
834	835	if (./conftest; exit) 2>/dev/null; then

854	855	{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
855	856	fi
856	857	echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
857		echo "configure:859: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
	858	echo "configure:860: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
858	859	echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
859	860	cross_compiling=$ac_cv_prog_cxx_cross
860	861
861	862	echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
862		echo "configure:864: checking whether we are using GNU C++" >&5
	863	echo "configure:865: checking whether we are using GNU C++" >&5
863	864	if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
864	865	echo $ac_n "(cached) $ac_c" 1>&6
865	866	else

868	869	yes;
869	870	#endif
870	871	EOF
871		if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \| egrep yes >/dev/null 2>&1; then
	872	if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \| egrep yes >/dev/null 2>&1; then
872	873	ac_cv_prog_gxx=yes
873	874	else
874	875	ac_cv_prog_gxx=no

887	888	ac_save_CXXFLAGS="$CXXFLAGS"
888	889	CXXFLAGS=
889	890	echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
890		echo "configure:892: checking whether ${CXX-g++} accepts -g" >&5
	891	echo "configure:893: checking whether ${CXX-g++} accepts -g" >&5
891	892	if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
892	893	echo $ac_n "(cached) $ac_c" 1>&6
893	894	else

930	931	# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
931	932	# ./install, which can be erroneously created by make from ./install.sh.
932	933	echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
933		echo "configure:935: checking for a BSD compatible install" >&5
	934	echo "configure:936: checking for a BSD compatible install" >&5
934	935	if test -z "$INSTALL"; then
935	936	if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
936	937	echo $ac_n "(cached) $ac_c" 1>&6

984	985
985	986
986	987	echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
987		echo "configure:989: checking how to run the C preprocessor" >&5
	988	echo "configure:990: checking how to run the C preprocessor" >&5
988	989	# On Suns, sometimes $CPP names a directory.
989	990	if test -n "$CPP" && test -d "$CPP"; then
990	991	CPP=

999	1000	# On the NeXT, cc -E runs the code through the compiler's parser,
1000	1001	# not just through cpp.
1001	1002	cat > conftest.$ac_ext <<EOF
1002		#line 1004 "configure"
	1003	#line 1005 "configure"
1003	1004	#include "confdefs.h"
1004	1005	#include <assert.h>
1005	1006	Syntax Error
1006	1007	EOF
1007	1008	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1008		{ (eval echo configure:1010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1009	{ (eval echo configure:1011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1009	1010	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1010	1011	if test -z "$ac_err"; then
1011	1012	:

1016	1017	rm -rf conftest*
1017	1018	CPP="${CC-cc} -E -traditional-cpp"
1018	1019	cat > conftest.$ac_ext <<EOF
1019		#line 1021 "configure"
	1020	#line 1022 "configure"
1020	1021	#include "confdefs.h"
1021	1022	#include <assert.h>
1022	1023	Syntax Error
1023	1024	EOF
1024	1025	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1025		{ (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1026	{ (eval echo configure:1028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1026	1027	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1027	1028	if test -z "$ac_err"; then
1028	1029	:

1033	1034	rm -rf conftest*
1034	1035	CPP="${CC-cc} -nologo -E"
1035	1036	cat > conftest.$ac_ext <<EOF
1036		#line 1038 "configure"
	1037	#line 1039 "configure"
1037	1038	#include "confdefs.h"
1038	1039	#include <assert.h>
1039	1040	Syntax Error
1040	1041	EOF
1041	1042	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1042		{ (eval echo configure:1044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1043	{ (eval echo configure:1045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1043	1044	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1044	1045	if test -z "$ac_err"; then
1045	1046	:

1068	1069	do
1069	1070	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
1070	1071	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1071		echo "configure:1073: checking for $ac_hdr" >&5
	1072	echo "configure:1074: checking for $ac_hdr" >&5
1072	1073	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1073	1074	echo $ac_n "(cached) $ac_c" 1>&6
1074	1075	else
1075	1076	cat > conftest.$ac_ext <<EOF
1076		#line 1078 "configure"
	1077	#line 1079 "configure"
1077	1078	#include "confdefs.h"
1078	1079	#include <$ac_hdr>
1079	1080	EOF
1080	1081	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1081		{ (eval echo configure:1083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1082	{ (eval echo configure:1084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1082	1083	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1083	1084	if test -z "$ac_err"; then
1084	1085	rm -rf conftest*

1107	1108	done
1108	1109
1109	1110	echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6
1110		echo "configure:1112: checking for wgetch in -lncurses" >&5
	1111	echo "configure:1113: checking for wgetch in -lncurses" >&5
1111	1112	ac_lib_var=`echo ncurses'_'wgetch \| sed 'y%./+-%__p_%'`
1112	1113	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1113	1114	echo $ac_n "(cached) $ac_c" 1>&6

1115	1116	ac_save_LIBS="$LIBS"
1116	1117	LIBS="-lncurses $LIBS"
1117	1118	cat > conftest.$ac_ext <<EOF
1118		#line 1120 "configure"
	1119	#line 1121 "configure"
1119	1120	#include "confdefs.h"
1120	1121	/* Override any gcc2 internal prototype to avoid an error. */
1121	1122	/* We use char because int might match the return type of a gcc2

1126	1127	wgetch()
1127	1128	; return 0; }
1128	1129	EOF
1129		if { (eval echo configure:1131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	1130	if { (eval echo configure:1132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1130	1131	rm -rf conftest*
1131	1132	eval "ac_cv_lib_$ac_lib_var=yes"
1132	1133	else

1163	1164	cross_compiling=$ac_cv_prog_cxx_cross
1164	1165
1165	1166	echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
1166		echo "configure:1168: checking how to run the C++ preprocessor" >&5
	1167	echo "configure:1169: checking how to run the C++ preprocessor" >&5
1167	1168	if test -z "$CXXCPP"; then
1168	1169	if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
1169	1170	echo $ac_n "(cached) $ac_c" 1>&6

1176	1177	cross_compiling=$ac_cv_prog_cxx_cross
1177	1178	CXXCPP="${CXX-g++} -E"
1178	1179	cat > conftest.$ac_ext <<EOF
1179		#line 1181 "configure"
	1180	#line 1182 "configure"
1180	1181	#include "confdefs.h"
1181	1182	#include <stdlib.h>
1182	1183	EOF
1183	1184	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1184		{ (eval echo configure:1186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1185	{ (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1185	1186	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1186	1187	if test -z "$ac_err"; then
1187	1188	:

1207	1208
1208	1209	ac_safe=`echo "string" \| sed 'y%./+-%__p_%'`
1209	1210	echo $ac_n "checking for string""... $ac_c" 1>&6
1210		echo "configure:1212: checking for string" >&5
	1211	echo "configure:1213: checking for string" >&5
1211	1212	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1212	1213	echo $ac_n "(cached) $ac_c" 1>&6
1213	1214	else
1214	1215	cat > conftest.$ac_ext <<EOF
1215		#line 1217 "configure"
	1216	#line 1218 "configure"
1216	1217	#include "confdefs.h"
1217	1218	#include <string>
1218	1219	EOF
1219	1220	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1220		{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1221	{ (eval echo configure:1223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1221	1222	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1222	1223	if test -z "$ac_err"; then
1223	1224	rm -rf conftest*

1241	1242
1242	1243	ac_safe=`echo "vector" \| sed 'y%./+-%__p_%'`
1243	1244	echo $ac_n "checking for vector""... $ac_c" 1>&6
1244		echo "configure:1246: checking for vector" >&5
	1245	echo "configure:1247: checking for vector" >&5
1245	1246	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1246	1247	echo $ac_n "(cached) $ac_c" 1>&6
1247	1248	else
1248	1249	cat > conftest.$ac_ext <<EOF
1249		#line 1251 "configure"
	1250	#line 1252 "configure"
1250	1251	#include "confdefs.h"
1251	1252	#include <vector>
1252	1253	EOF
1253	1254	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1254		{ (eval echo configure:1256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1255	{ (eval echo configure:1257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1255	1256	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1256	1257	if test -z "$ac_err"; then
1257	1258	rm -rf conftest*

1275	1276
1276	1277	ac_safe=`echo "algorithm" \| sed 'y%./+-%__p_%'`
1277	1278	echo $ac_n "checking for algorithm""... $ac_c" 1>&6
1278		echo "configure:1280: checking for algorithm" >&5
	1279	echo "configure:1281: checking for algorithm" >&5
1279	1280	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1280	1281	echo $ac_n "(cached) $ac_c" 1>&6
1281	1282	else
1282	1283	cat > conftest.$ac_ext <<EOF
1283		#line 1285 "configure"
	1284	#line 1286 "configure"
1284	1285	#include "confdefs.h"
1285	1286	#include <algorithm>
1286	1287	EOF
1287	1288	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1288		{ (eval echo configure:1290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	1289	{ (eval echo configure:1291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1289	1290	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
1290	1291	if test -z "$ac_err"; then
1291	1292	rm -rf conftest*

-1

configure.in less more

0	0	AC_INIT(squidview.cpp)
1	1	AM_CONFIG_HEADER(config.h)
2		AM_INIT_AUTOMAKE(squidview,0.68)
	2	AM_INIT_AUTOMAKE(squidview,0.69)
3	3	AC_PROG_CXX
4	4	AC_PROG_INSTALL
5	5

+16

-8

missing less more

0	0	#! /bin/sh
1	1	# Common stub for a few missing GNU programs while installing.
2		# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
	2	# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
3	3	# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
4	4
5	5	# This program is free software; you can redistribute it and/or modify

20	20	if test $# -eq 0; then
21	21	echo 1>&2 "Try \`$0 --help' for more information"
22	22	exit 1
	23	fi
	24
	25	# In the cases where this matters, `missing' is being run in the
	26	# srcdir already.
	27	if test -f configure.in; then
	28	configure_ac=configure.ac
	29	else
	30	configure_ac=configure.in
23	31	fi
24	32
25	33	case "$1" in

57	65	exit 1
58	66	;;
59	67
60		aclocal)
	68	aclocal*)
61	69	echo 1>&2 "\
62	70	WARNING: \`$1' is missing on your system. You should only need it if
63		you modified \`acinclude.m4' or \`configure.in'. You might want
	71	you modified \`acinclude.m4' or \`$configure_ac'. You might want
64	72	to install the \`Automake' and \`Perl' packages. Grab them from
65	73	any GNU archive site."
66	74	touch aclocal.m4

69	77	autoconf)
70	78	echo 1>&2 "\
71	79	WARNING: \`$1' is missing on your system. You should only need it if
72		you modified \`configure.in'. You might want to install the
	80	you modified \`$configure_ac'. You might want to install the
73	81	\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
74	82	archive site."
75	83	touch configure

78	86	autoheader)
79	87	echo 1>&2 "\
80	88	WARNING: \`$1' is missing on your system. You should only need it if
81		you modified \`acconfig.h' or \`configure.in'. You might want
	89	you modified \`acconfig.h' or \`$configure_ac'. You might want
82	90	to install the \`Autoconf' and \`GNU m4' packages. Grab them
83	91	from any GNU archive site."
84		files=`sed -n 's/^[ ]A[CM]_CONFIG_HEADER($[^)]$).*/\1/p' configure.in`
	92	files=`sed -n 's/^[ ]A[CM]_CONFIG_HEADER($[^)]$).*/\1/p' $configure_ac`
85	93	test -z "$files" && files="config.h"
86	94	touch_files=
87	95	for f in $files; do

94	102	touch $touch_files
95	103	;;
96	104
97		automake)
	105	automake*)
98	106	echo 1>&2 "\
99	107	WARNING: \`$1' is missing on your system. You should only need it if
100		you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
	108	you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
101	109	You might want to install the \`Automake' and \`Perl' packages.
102	110	Grab them from any GNU archive site."
103	111	find . -type f -name Makefile.am -print \|

-2

squidview.cpp less more

1237	1237
1238	1238	GetColumn (szRequest, iUserCol, sTemp);
1239	1239
1240		if (bAliases && (sTemp == "-"))
	1240	if (bAliases && (sTemp == "-"))
1241	1241	{
1242	1242	GetColumn (szRequest, iIPCol, sIP);
1243	1243	sIP = LookupIP (sIP);

5212	5212	{
5213	5213	con << "\n\nSorting...";
5214	5214	refresh();
5215		iSortMode = enum cUsersMode::eSort ((iKey - '1') + nSortU);
	5215	iSortMode = cUsersMode::eSort ((iKey - '1') + nSortU);
5216	5216	SortData();
5217	5217	iScreenStart = iSelectedRow = 0;
5218	5218	}