Since we moved to autotools... it's really not any "simpler" now. I suggest revising that part too.