[gnome-terminal] server: No longer set Ubuntu specific environment variables
- From: Egmont Koblinger <egmontkob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] server: No longer set Ubuntu specific environment variables
- Date: Thu, 1 Feb 2018 22:10:12 +0000 (UTC)
commit 581019e2d2ff8ebae7511992f6b30b957f435a92
Author: Egmont Koblinger <egmont gmail com>
Date: Thu Feb 1 23:07:03 2018 +0100
server: No longer set Ubuntu specific environment variables
https://bugzilla.gnome.org/show_bug.cgi?id=793105
configure.ac | 24 ------------------------
src/server.c | 12 ------------
2 files changed, 0 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2ae8f43..0dfb0c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,30 +238,6 @@ fi
AM_CONDITIONAL([WITH_NAUTILUS_EXTENSION],[test "$with_nautilus_extension" = "yes"])
-# **********************
-# Distribution specifics
-# **********************
-
-if test -f /etc/os-release; then
- DISTRO="$(. /etc/os-release && echo $ID)"
-else
- DISTRO="unknown"
-fi
-
-case "$DISTRO" in
- ubuntu) AC_DEFINE([HAVE_UBUNTU],[1],[Define if building under ubuntu]) ;;
-esac
-
-AC_MSG_CHECKING([whether building a distro package])
-AC_ARG_ENABLE([distro-packaging],
- [AS_HELP_STRING([--enable-distro-packaging],[enable when building a distro package])],
- [],[enable_distro_packaging=no])
-AC_MSG_RESULT([$enable_distro_packaging])
-
-if test "$enable_distro_packaging" = "yes"; then
- AC_DEFINE([ENABLE_DISTRO_PACKAGING],[1],[Define if building a distro package])
-fi
-
# ***********
# Compilation
# ***********
diff --git a/src/server.c b/src/server.c
index ac89ca7..cce7581 100644
--- a/src/server.c
+++ b/src/server.c
@@ -132,18 +132,6 @@ init_server (int argc,
if (g_getenv ("G_ENABLE_DIAGNOSTIC") == NULL)
g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE);
-#ifdef HAVE_UBUNTU
-#ifndef ENABLE_DISTRO_PACKAGING
- /* Set some env vars to disable the ubuntu modules. Their package will be
- * built using --enable-distro-packaging, but anyone running from git will
- * get the right behaviour.
- */
- g_setenv ("LIBOVERLAY_SCROLLBAR", "0", TRUE);
-#endif
- g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
- g_setenv ("NO_UNITY_GTK_MODULE", "1", TRUE);
-#endif
-
_terminal_debug_init ();
/* Change directory to $HOME so we don't prevent unmounting, e.g. if the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]