Alex Rousskov wrote:
On Thu, 2008-01-24 at 20:51 -0700, Adrian Chadd wrote:
Don't commit to HEAD on sourceforge- thats used to sync against.
Create a branch for your work and dump your work in that branch.

Hm... I wonder if that wrong HEAD commit could explain cvsmerge problems
on the ssl-bump branch? Will these commits be nullified by the next sync
up with the "real" HEAD?


I was wondering how he managed it at all.
When I've made a mistake and triad a commit after checkout from SF HEAD its always died early with a 'cant commit to a sticky-tag' warning.

Amos

Thanks,

Alex.

On Wed, Jan 23, 2008, Arthur Tumanyan wrote:
Update of cvs.devel.squid-cache.org:/cvsroot/squid/squid3

Modified Files:
configure.in Log Message:


Index: configure.in
===================================================================
RCS file: /cvsroot/squid/squid3/configure.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** configure.in        22 Jan 2008 15:50:56 -0000      1.173
--- configure.in        23 Jan 2008 16:46:35 -0000      1.174
***************
*** 857,860 ****
--- 857,873 ----
  AM_CONDITIONAL(ENABLE_SSL, false)
+ dnl Shaga support is not enabled by default
+ AM_CONDITIONAL(ENABLE_SHAGA, false)
+ AC_ARG_ENABLE(shaga,
+ [  --enable-shaga          Enable ShagaEngine support],
+ [ if test "$enableval" != "no"; then
+     echo "ShagaEngine support enabled"
+     AC_DEFINE(USE_SHAGA, 1, [Define this to include code for ShagaEngine.])
+     AM_CONDITIONAL(ENABLE_SHAGA, true)
+       SHAGALIB="-L/usr/local/lib/mysql -lmysqlclient -lz -lcrypt -lm"       
+ fi
+ ])
+ AC_SUBST(SHAGALIB)
+ dnl Default is to use OpenSSL when available
  AC_ARG_ENABLE(ssl,



--
Please use Squid 2.6STABLE17+ or 3.0STABLE1+
There are serious security advisories out on all earlier releases.

Reply via email to