[gnome-terminal] Use target version flags when converting glade files to gtkbuilder

[Christian Persch <chpe src gnome org>]

commit 378a9776bb934ed6143a158c4174f499eb9b11a5
Author: Christian Persch <chpe gnome org>
Date:   Wed Jan 12 22:55:30 2011 +0100

    Use target version flags when converting glade files to gtkbuilder
    
    Bug #639327.

 configure.ac    |   12 ++++++++----
 src/Makefile.am |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 09c8682..8998ddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,15 +141,19 @@ AC_SUBST([GLIB_GENMARSHAL])
 GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
 AC_SUBST([GLIB_MKENUMS])
 
-case "$with_gtk" in
-  2.0) AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false]) ;;
-  3.0) AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert gtk-builder-convert-3.0],[false]) ;;
-esac
+AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false]) ;;
 
 if test "$GTK_BUILDER_CONVERT" = "false"; then
   AC_MSG_ERROR([gtk-builder-convert not found])
 fi
 
+case "$with_gtk" in
+  2.0) GTK_BUILDER_CONVERT_FLAGS="" ;;
+  3.0) GTK_BUILDER_CONVERT_FLAGS="--target-version=3.0" ;;
+esac
+
+AC_SUBST([GTK_BUILDER_CONVERT_FLAGS])
+
 # *************
 # Documentation
 # *************
diff --git a/src/Makefile.am b/src/Makefile.am
index 634fa20..17c1dd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,6 +187,6 @@ install-data-local:
 endif
 
 %.ui: %.glade
-	$(AM_V_GEN) $(GTK_BUILDER_CONVERT) $< $@
+	$(AM_V_GEN) $(GTK_BUILDER_CONVERT) $(GTK_BUILDER_CONVERT_FLAGS) $< $@
 
 -include $(top_srcdir)/git.mk