Restore accidentally removed #.
Linux build should be fixed.
+shibboleth-sp-2.5.2 (noted in PR 48030)
Try fixing the option handling.