Add check for glade catalog/module directories.

diff --git a/configure.ac b/configure.ac
index 2ba581bd999b009187a1c7a2f67166983509ff07..64c8630a05da5cd12243e8c96582b580d359735f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ AC_ARG_WITH(glade,
        [use_glade=$enableval],
        [use_glade=yes])
 
+have_glade=no
 if test x"$use_glade" = x"yes"; then
 PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= 3.4.5],
        [have_glade=yes], [have_glade=no])
@@ -28,8 +29,20 @@ AC_SUBST(GLADEUI_LIBS)
 AC_SUBST(GLADEUI_CFLAGS)
 fi
 
-AM_CONDITIONAL([BUILD_GLADE], [test x"$have_glade" = x"yes" \
-                                 -a x"$use_glade"  = x"yes"])
+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)
+fi
+
+if test x"$have_glade" = x"yes" -a x"$have_gladedirs" = x"no"; then
+AC_MSG_WARN([Glade support will be built, but not installed.])
+fi
+AM_CONDITIONAL([BUILD_GLADE], [test x"$have_glade" = x"yes"])
 
 AC_CONFIG_FILES([
        Makefile