Rename Glade UI support stuff.

diff --git a/Makefile.am b/Makefile.am
index aba5e9e2f97b9bbd28f0e4de723cbbe93c3e9190..3ac950834ffcb1f0e22cee9289ef49f75c0615e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = . icons
 ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libaspectbin.la
 
-if INST_GLADE
-glade_catalogdir = $(GLADE_catalogdir)
+if INST_GLADEUI
+glade_catalogdir = $(GLADEUI_catalogdir)
 dist_glade_catalog_DATA = aspectbin.xml
 endif
 
@@ -14,8 +14,8 @@ libaspectbin_la_CFLAGS  = $(GTK_CFLAGS)
 libaspectbin_la_LDFLAGS = $(GTK_LIBS)
 include_HEADERS = aspectbin.h
 
-if BUILD_GLADE
-libaspectbin_la_SOURCES += aspectbin-glade.c
+if BUILD_GLADEUI
+libaspectbin_la_SOURCES += aspectbin-gladeui.c
 libaspectbin_la_CFLAGS  += $(GLADEUI_CFLAGS)
 libaspectbin_la_LDFLAGS += $(GLADEUI_LIBS)
 endif

diff --git a/aspectbin-glade.c b/aspectbin-gladeui.c
similarity index 100%
rename from aspectbin-glade.c
rename to aspectbin-gladeui.c

diff --git a/configure.ac b/configure.ac
index 2285e7ebd13e108324eb5fb4a27ecd614d3e8c73..becbe7d547bbedf54a46978399a8bf4e230eaa42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,43 +14,43 @@ 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([gladeui],
+       [AS_HELP_STRING([--with-gladeui],
+               [build support for Glade UI [default=yes]]
        )],
        [],
-       [with_glade=yes])
+       [with_gladeui=yes])
 
-have_glade=no
-if test x"$with_glade" != x"no"; then
+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_GLADEUI],  [test x"$have_gladeui" = x"yes"])
+AM_CONDITIONAL([INST_GLADEUI],   [test x"$have_gladeui_dirs" = x"yes"])
 
 AC_CONFIG_FILES([
        Makefile

diff --git a/icons/Makefile.am b/icons/Makefile.am
index e71cc638617ac0e4ae2ccd9a2f1eaa49e4c1aebc..2a438485c41195c15b0bbfa67dcb44a7bd3a270c 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,5 +1,5 @@
-if INST_GLADE
-iconsdir = $(GLADE_pixmapdir)/hicolor
+if INST_GLADEUI
+iconsdir = $(GLADEUI_pixmapdir)/hicolor
 nobase_dist_icons_DATA = \
        16x16/actions/widget-aspectbin-aspectbin.png \
        22x22/actions/widget-aspectbin-aspectbin.png