Update autogen.sh also for test(1) -o adjustment.
Cherry-pick master commit of: 371e1f1f18c062ec9e18712baf98acad83a8f2aa