Minor define changes for glibc, SConscript overhaul.