summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Browaeys <prahal@yahoo.com>2013-01-02 17:08:38 +0100
committerRay Strode <rstrode@redhat.com>2013-02-04 23:33:07 -0500
commit6fed512bb47b026f0b229a359d5f5bdd2fcc7cdf (patch)
tree3c5f16e9c63ff67c40c03889874271f6113c439c
parent22364a4989acad0de1235fece70c640dcc7dd044 (diff)
downloadgdm-6fed512bb47b026f0b229a359d5f5bdd2fcc7cdf.tar.gz
build: feed AC_DEFINE_UNQUOTED with expanded version of the variables.
Fixes gdm attempts to access "/${prefix}/..." for the ran once dir and files. https://bugzilla.gnome.org/show_bug.cgi?id=691058
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 82823eaf..a2822321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1374,11 +1374,13 @@ else
GDM_RAN_ONCE_MARKER_DIR=/run/gdm
fi
AC_SUBST(GDM_RAN_ONCE_MARKER_DIR)
-AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_DIR, "$GDM_RAN_ONCE_MARKER_DIR", [ran once marker dir])
+AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_DIR_EXPANDED, $GDM_RAN_ONCE_MARKER_DIR)
+AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_DIR, "$GDM_RAN_ONCE_MARKER_DIR_EXPANDED", [ran once marker dir])
GDM_RAN_ONCE_MARKER_FILE="$GDM_RAN_ONCE_MARKER_DIR/ran-once-marker"
AC_SUBST(GDM_RAN_ONCE_MARKER_FILE)
-AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_FILE, "$GDM_RAN_ONCE_MARKER_FILE", [ran once marker file])
+AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_FILE_EXPANDED, $GDM_RAN_ONCE_MARKER_FILE)
+AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_FILE, "$GDM_RAN_ONCE_MARKER_FILE_EXPANDED", [ran once marker file])
dnl ---------------------------------------------------------------------------
dnl - GREETER WORKING DIRECTORY