-have_gladedirs=no
-if test x"$have_glade" = x"yes"; then
-PKG_CHECK_VAR([GLADE], [catalogdir], [Glade catalog directory], [gladeui-1.0],
- [have_gladedirs=yes], [have_gladedirs=no])
-PKG_CHECK_VAR([GLADE], [moduledir], [Glade module directory], [gladeui-1.0],
- [have_gladedirs=yes], [have_gladedirs=no])
-AC_SUBST(GLADE_catalogdir)
-AC_SUBST(GLADE_moduledir)
+have_gladeui_dirs=no
+if test x"$have_gladeui" = x"yes"; then
+PKG_CHECK_VAR([GLADEUI], [prefix], [Glade UI prefix],
+ [gladeui-1.0], [have_gladeui_dirs=yes], [have_gladeui_dirs=no])
+PKG_CHECK_VAR([GLADEUI], [catalogdir], [Glade UI catalog directory],
+ [gladeui-1.0], [have_gladeui_dirs=yes], [have_gladeui_dirs=no])
+PKG_CHECK_VAR([GLADEUI], [pixmapdir], [Glade UI pixmap directory],
+ [gladeui-1.0], [have_gladeui_dirs=yes], [have_gladeui_dirs=no])
+
+DIST_FIND_MATCH([GLADEUI_catalogdir], [$GLADEUI_prefix], [$GLADEUI_catalogdir])
+DIST_FIND_MATCH([GLADEUI_pixmapdir], [$GLADEUI_prefix], [$GLADEUI_pixmapdir])
+
+AC_SUBST(GLADEUI_catalogdir)
+AC_SUBST(GLADEUI_pixmapdir)