X-Git-Url: http://git.draconx.ca/gitweb/aspectbin.git/blobdiff_plain/cdbe33497fbccf1df3c6f55d48dfd89b804eca3f..HEAD:/configure.ac

diff --git a/configure.ac b/configure.ac
index 2285e7e..69a3eeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,43 +14,59 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0])
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
-AC_ARG_WITH(glade,
-	[AS_HELP_STRING([--with-glade],
-		[build support for Glade [default=yes]]
+AC_ARG_WITH([libglade],
+	[AS_HELP_STRING([--with-libglade],
+		[build support for libglade [default=yes]]
 	)],
 	[],
-	[with_glade=yes])
+	[with_libglade=yes])
 
-have_glade=no
-if test x"$with_glade" != x"no"; then
+AC_ARG_WITH([gladeui],
+	[AS_HELP_STRING([--with-gladeui],
+		[build support for Glade UI [default=yes]]
+	)],
+	[],
+	[with_gladeui=yes])
+
+have_libglade=no
+if test x"$with_libglade" != x"no"; then
+PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= 2.6],
+	[have_libglade=yes], [have_libglade=no])
+AC_SUBST(LIBGLADE_LIBS)
+AC_SUBST(LIBGLADE_CFLAGS)
+fi
+
+have_gladeui=no
+if test x"$with_gladeui" != x"no"; then
 PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= 3],
-	[have_glade=yes], [have_glade=no])
+	[have_gladeui=yes], [have_gladeui=no])
 AC_SUBST(GLADEUI_LIBS)
 AC_SUBST(GLADEUI_CFLAGS)
 fi
 
-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])
+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([GLADE_catalogdir], [$GLADE_prefix], [$GLADE_catalogdir])
-DIST_FIND_MATCH([GLADE_pixmapdir],  [$GLADE_prefix], [$GLADE_pixmapdir])
+DIST_FIND_MATCH([GLADEUI_catalogdir], [$GLADEUI_prefix], [$GLADEUI_catalogdir])
+DIST_FIND_MATCH([GLADEUI_pixmapdir],  [$GLADEUI_prefix], [$GLADEUI_pixmapdir])
 
-AC_SUBST(GLADE_catalogdir)
-AC_SUBST(GLADE_pixmapdir)
+AC_SUBST(GLADEUI_catalogdir)
+AC_SUBST(GLADEUI_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.])
+if test x"$have_gladeui" = x"yes" -a x"$have_gladeui_dirs" = x"no"; then
+AC_MSG_WARN([Glade UI 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"])
+AM_CONDITIONAL([BUILD_LIBGLADE], [test x"$have_libglade" = x"yes"])
+AM_CONDITIONAL([BUILD_GLADEUI],  [test x"$have_gladeui" = x"yes"])
+AM_CONDITIONAL([INST_GLADEUI],   [test x"$have_gladeui_dirs" = x"yes"])
 
 AC_CONFIG_FILES([
 	Makefile