diff options
| author | Christian Persch <chpe@gnome.org> | 2014-05-22 13:50:16 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2014-05-22 13:52:03 +0200 |
| commit | c38f44dafea624ca656d3700e0f4b0c0a259856e (patch) | |
| tree | 1e1a894953f0782876f67ca18aef8883a8da728a | |
| parent | 174428ceafa642747400c5497dcfe207ec928db1 (diff) | |
| download | vte-c38f44dafea624ca656d3700e0f4b0c0a259856e.tar.gz | |
build: Don't enable pty helper by default
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/vteenums.h | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index e4b3685f..bf4e1881 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-introspection \ --enable-vala \ --enable-test-application \ + --enable-gnome-pty-helper \ --disable-silent-rules \ --with-gtk=3.0 diff --git a/configure.ac b/configure.ac index de4aa8e2..b78ff0e8 100644 --- a/configure.ac +++ b/configure.ac @@ -238,7 +238,12 @@ AC_CHECK_TYPES(wint_t, AC_DEFINE(HAVE_WINT_T, , [Defined when the wint_t type is # GNOME PTY Helper ################################################################################ -AC_ARG_ENABLE(gnome-pty-helper, [AS_HELP_STRING(--enable-gnome-pty-helper,Build a setuid helper for opening ptys [default=yes])], enable_gnome_pty_helper="$enableval", enable_gnome_pty_helper=yes) +AC_MSG_CHECKING([whether to build the PTY helper binary]) +AC_ARG_ENABLE(gnome-pty-helper, + [AS_HELP_STRING([--disable-gnome-pty-helper], + [Build a setuid helper for opening ptys])], + [],[enable_gnome_pty_helper=no]) +AC_MSG_RESULT([$enable_gnome_pty_helper]) if test "$enable_gnome_pty_helper" != no; then AC_DEFINE(VTE_USE_GNOME_PTY_HELPER,1,[Define if you intend to use gnome-pty-helper.]) AC_CONFIG_SUBDIRS(gnome-pty-helper) @@ -375,4 +380,5 @@ Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION Introspection: $enable_introspection Vala bindings: $enable_vala Test application: $enable_test_application + PTY helper: $enable_gnome_pty_helper EOF diff --git a/src/vteenums.h b/src/vteenums.h index c5275178..a4e4d118 100644 --- a/src/vteenums.h +++ b/src/vteenums.h @@ -93,12 +93,12 @@ typedef enum { /** * VtePtyFlags: - * @VTE_PTY_NO_LASTLOG: don't record the session in lastlog - * @VTE_PTY_NO_UTMP: don't record the session in utmp - * @VTE_PTY_NO_WTMP: don't record the session in wtmp - * @VTE_PTY_NO_HELPER: don't use the GNOME PTY helper to allocate the PTY + * @VTE_PTY_NO_LASTLOG: don't record the session in lastlog. Deprecated: 0.38 + * @VTE_PTY_NO_UTMP: don't record the session in utmp. Deprecated: 0.38 + * @VTE_PTY_NO_WTMP: don't record the session in wtmp. Deprecated: 0.38 + * @VTE_PTY_NO_HELPER: don't use the GNOME PTY helper to allocate the PTY. Deprecated: 0.38 * @VTE_PTY_NO_FALLBACK: when allocating the PTY with the PTY helper fails, - * don't fall back to try using PTY98 + * don't fall back to try using PTY98. Deprecated: 0.38 * @VTE_PTY_DEFAULT: the default flags * * Since: 0.26 |