X-Git-Url: http://git.draconx.ca/gitweb/aspectbin.git/blobdiff_plain/d480835293695cbc9c851dfe80d368ea7df59816..12e25c55a3f2d556c7716223564e53b8d78aa049:/configure.ac

diff --git a/configure.ac b/configure.ac
index 2ba581b..1594a48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,36 @@ 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],
+PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= 3.4],
 	[have_glade=yes], [have_glade=no])
 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], [prefix], [Glade prefix], [gladeui-1.0],
+	[have_gladedirs=yes], [have_gladedirs=no])
+PKG_CHECK_VAR([GLADE], [catalogdir], [Glade catalog directory], [gladeui-1.0],
+	[have_gladedirs=yes], [have_gladedirs=no])
+PKG_CHECK_VAR([GLADE], [pixmapdir], [Glade pixmap directory], [gladeui-1.0],
+	[have_gladedirs=yes], [have_gladedirs=no])
+
+DIST_FIND_MATCH([GLADE_catalogdir], [$GLADE_prefix], [$GLADE_catalogdir])
+DIST_FIND_MATCH([GLADE_pixmapdir],  [$GLADE_prefix], [$GLADE_pixmapdir])
+
+AC_SUBST(GLADE_catalogdir)
+AC_SUBST(GLADE_pixmapdir)
+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"])
+AM_CONDITIONAL([INST_GLADE],  [test x"$have_gladedirs" = x"yes"])
 
 AC_CONFIG_FILES([
 	Makefile