Re-added --enable-valgrind option