[PATCH] popt: update to 1.16