From fb0c97485d90a37ecd870810d2152c7442a9e84c Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Thu, 30 Apr 2020 19:52:28 +0000
Subject: data: switch gdm.service.in to use cmake format

We're going to be switching to meson, and meson doesn't
deal too well with an @ in the configuration file that's not
part of a substitution variable.

This commit switches the gdm service over to use a cmake style
of substitution variables, so we can later tell meson to use
configure in cmake mode and workaround the @ confusion.
---
 build-aux/find-x-server.sh      | 34 ++++++++++++++++++++++++++++++++++
 build-aux/meson_post_install.py | 11 +++++++++++
 2 files changed, 45 insertions(+)
 create mode 100755 build-aux/find-x-server.sh
 create mode 100644 build-aux/meson_post_install.py

(limited to 'build-aux')

diff --git a/build-aux/find-x-server.sh b/build-aux/find-x-server.sh
new file mode 100755
index 00000000..b5a80750
--- /dev/null
+++ b/build-aux/find-x-server.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
+# symlink to each other, and configure should use the more stable
+# location (the real directory) if possible.
+#
+# On Solaris, the /usr/bin/Xserver script is used to decide whether to
+# use Xsun or Xorg, so this is used on Solaris.
+#
+# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
+# and /usr/X11 since they often symlink to each other, and configure
+# should use the more stable location (the real directory) if possible.
+#
+if test -x /usr/bin/X; then
+    echo "/usr/bin/X"
+elif test -x /usr/X11/bin/Xserver; then
+    echo "/usr/X11/bin/Xserver"
+elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
+    echo "/usr/X11R6/bin/X"
+elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
+    echo "/usr/X11/bin/X"
+elif test -x /usr/X11R6/bin/X; then
+    echo "/usr/X11R6/bin/X"
+elif test -x /usr/bin/Xorg; then
+    echo "/usr/bin/Xorg"
+elif test -x /usr/X11/bin/X; then
+    echo "/usr/X11/bin/X"
+elif test -x /usr/openwin/bin/Xsun; then
+    echo "/usr/openwin/bin/Xsun"
+elif test -x /opt/X11R6/bin/X; then
+    echo "/opt/X11R6/bin/X"
+else
+    echo ""
+fi
diff --git a/build-aux/meson_post_install.py b/build-aux/meson_post_install.py
new file mode 100644
index 00000000..4debe816
--- /dev/null
+++ b/build-aux/meson_post_install.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+install_prefix = os.environ['MESON_INSTALL_PREFIX']
+schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas')
+
+if not os.environ.get('DESTDIR'):
+  print('Compiling gsettings schemas...')
+  subprocess.call(['glib-compile-schemas', schemadir])
-- 
cgit v1.2.1