Log Message:
Fix up some more bugs introduced by the libtoolization.  Hopefully this
will finally fix all of the bulk build problems seen on -current and
2.0 branch machines (1.6 branch has never had problems).