summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-03-28 01:44:36 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-03-28 01:44:36 +0000
commitf86251dc52adc4193ce1eab580ef1e53d9119899 (patch)
tree29a69188a5d6ea119c97b3cb9feb46c2086685dc /utils
parent2a0310c3f1e4c688448734b651f31e2df68d8d3c (diff)
downloadgdm-f86251dc52adc4193ce1eab580ef1e53d9119899.tar.gz
Now support --with-sysconfsubdir so that GDM can be configured to have the
2006-03-27 Brian Cameron <brian.cameron@sun.com> * acconfig.h, configure.ac, config/Makefile.am, config/PostLogin, config/gdm.conf.in, daemon/Makefile.am, daemon/gdm.[ch], daemon/gdmconfig.c, gui/Makefile.am, gui/greeter/Makeifle.am, gui/modules/Makefile.am, gui/modules/dwellmouselistener.c, gui/modules/keymouselistener.c, utils/Makefile.am: Now support --with-sysconfsubdir so that GDM can be configured to have the config files in a directory that isn't hardcoded to have "/gdm" at the end. Fixes bug #335957. Patch provided by Julio M Merino Vidal <jmmv@NetBSD.org> with minor changes by me to fix some usage of EXPANDED_GDMCONFDIR that caused breakage on Solaris. * gui/gdmXnestchooser, gui/gdmchooser.c, gui/gdmcomm.[ch], gui/gdmdynamic.c, gui/gdmflexiserver.c, gui/gdmlogin.c, gui/gdmphotosetup.c, gui/greeter/greeter.c: Now use gdmcomm_comm_bulk_start and gdmcomm_comm_bulk_stop to wrap areas of the code where we want to keep the sockets connection open for performance. This makes gdmsetup start faster and better ensures that sockets are not left open. Now gdmcomm_call_gdm will always close the socket unless inside such a block, ensuring that if distros add patches to read new config values at random points in the code, the socket won't be left open. * daemon/gdm.c: Fix gdm_debug message.
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 77ca1a8f..508db4c2 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce makefile.in
-DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" \
- -DGDM_FACTORY_CONFIG_FILE=\"@sysconfdir@/gdm/factory-gdm.conf\" \
+DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"$(gdmconfdir)/gdm.conf\" \
+ -DGDM_FACTORY_CONFIG_FILE=\"$(gdmconfdir)/factory-gdm.conf\" \
-DGDM_GLADE_DIR=\"@datadir@/gdm\"
INCLUDES = \