popt: Update (fix issue #18).