Re-add --with-lockdir=DIR configure option