add --with-locking option