-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.2.0,
- [LIBS="$LIBS $GNOME_LIBS"
- CFLAGS="$CFLAGS $GNOME_CFLAGS"])
+dnl Check for Gtk+-2.0
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8, CFLAGS="${CFLAGS} $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS")
+
+dnl Check for popt library (popt doesn't use pkg-config)
+AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([popt header file not found.]))
+AC_CHECK_LIB(popt, poptGetContext, [LIBS="$LIBS -lpopt"], AC_MSG_ERROR([popt library not found.]))