Update .gitignore.

[aspectbin.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 64c8630a05da5cd12243e8c96582b580d359735f..69a3eeb879125493a677344794ee4503210aa022 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,38 +14,63 @@ 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]]
        )],
-       [use_glade=$enableval],
-       [use_glade=yes])
+       [],
+       [with_libglade=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])
+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_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], [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)
 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([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
        examples/Makefile
+       icons/Makefile
        ])
 AC_OUTPUT