[gnome-terminal] build: Rename configure option

[Christian Persch <chpe src gnome org>]

commit c2134a7b1870d13589645fd983c4c83c921da290
Author: Christian Persch <chpe gnome org>
Date:   Wed May 28 21:18:11 2014 +0200

    build: Rename configure option

 configure.ac    |   16 ++++++++--------
 src/Makefile.am |    5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 49f0390..86ddeef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,12 +82,12 @@ PKG_CHECK_MODULES([TERM],
 # Vala
 # ****
 
-AC_MSG_CHECKING([whether vala is requested])
-AC_ARG_WITH([vala],[AS_HELP_STRING([--without-vala],[Disable vala programmes])],
-  [],[with_vala=yes])
-AC_MSG_RESULT([$with_vala])
+AC_MSG_CHECKING([whether gterminal is requested])
+AC_ARG_ENABLE([gterminal],[AS_HELP_STRING([--disable-gterminal],[Disable gterminal])],
+  [],[enable_gterminal=yes])
+AC_MSG_RESULT([$enable_gterminal])
 
-if test "$with_vala" = "yes"; then
+AS_IF([test "$enable_gterminal" = "yes"],[
   AM_PROG_VALAC([0.24])
 
   VALA_CHECK_PACKAGES([glib-2.0 gio-2.0 gio-unix-2.0 linux posix])
@@ -99,9 +99,9 @@ if test "$with_vala" = "yes"; then
      dconf >= $DCONF_REQUIRED
      uuid
      $PLATFORM_DEPS])
-fi
+])
 
-AM_CONDITIONAL([WITH_VALA],[test "$with_vala" = "yes"])
+AM_CONDITIONAL([ENABLE_GTERMINAL],[test "$enable_gterminal" = "yes"])
 
 # ****
 # DBus
@@ -366,7 +366,7 @@ gnome-terminal-$VERSION:
       prefix:                 ${prefix}
       source code location:   ${srcdir}
       compiler:               ${CC}
-      Vala:                   ${with_vala}
+      gterminal:              ${enable_gterminal}
       DBus interface dir:     ${dbusinterfacedir}
       DBus service dir:       ${dbusservicedir}
       Debug:                  ${enable_debug}
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e3b115..b3fff44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -151,7 +151,7 @@ terminal-resources.h terminal-resources.c: terminal.gresource.xml Makefile $(she
 
 # Terminal client
 
-if WITH_VALA
+if ENABLE_GTERMINAL
 
 noinst_PROGRAMS += gterminal
 
@@ -184,6 +184,7 @@ gterminal_VALAFLAGS = \
        --pkg gtk+-$(GTK_API_VERSION) \
        $(GTERMINAL_VALAFLAGS) \
        $(AM_VALAFLAGS)
+
 gterminal_CPPFLAGS = \
        -I$(top_builddir) \
        -DTERMINAL_COMPILATION \
@@ -208,7 +209,7 @@ gterminal_LDADD = \
        $(GTERMINAL_LIBS) \
        $(NULL)
 
-endif # WITH_VALA
+endif # ENABLE_GTERMINAL
 
 # Legacy terminal client