summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2005-08-09 04:02:41 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-08-09 04:02:41 +0000
commit51852799fc54a0dbf0a55ca998d0c84a5d3d4158 (patch)
tree125ac2154b4a1a660f8fef9c694002019ba0cafb /configure.in
parent7fe02295c558c074cec5a9b5649686485771dc5a (diff)
downloadgdm-51852799fc54a0dbf0a55ca998d0c84a5d3d4158.tar.gz
Fixed "make distcheck" issue.
2005-08-08 Brian Cameron <brian.cameron@sun.com> * configure.in, config/Makefile.am: Fixed "make distcheck" issue.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in17
1 files changed, 8 insertions, 9 deletions
diff --git a/configure.in b/configure.in
index cd60120b..164c3695 100644
--- a/configure.in
+++ b/configure.in
@@ -330,7 +330,7 @@ AC_CHECK_HEADERS(linux/vt.h, [
GDMOPEN=gdmopen])
AC_SUBST(GDMOPEN)
-dnl ## Autentication scheme
+dnl ## Authentication scheme
have_pam=no
VRFY="verify-crypt"
if test x$enable_authentication_scheme != xcrypt -a \
@@ -798,6 +798,11 @@ EXPANDED_LOGDIR=`eval echo $LOGDIR_TMP`
AC_SUBST(EXPANDED_LOGDIR)
AC_DEFINE_UNQUOTED(EXPANDED_LOGDIR,"$EXPANDED_LOGDIR")
+SYSCONFDIR_TMP="$sysconfdir"
+EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
+AC_SUBST(EXPANDED_SYSCONFDIR)
+AC_DEFINE_UNQUOTED(EXPANDED_SYSCONFDIR,"$EXPANDED_SYSCONFDIR")
+
if test x$DMX_SUPPORT = xyes ; then
GDM_RECONNECT_PROXY=$EXPANDED_BINDIR/gdm-dmx-reconnect-proxy
else
@@ -820,13 +825,12 @@ AC_DEFINE_UNQUOTED(AT_BINDIR,"$AT_BINDIR")
withval=""
AC_ARG_WITH(configdir,
-[ --with-configdir=<PATH> PATH to Install gdm.conf configuration file [defaul
-t=EXPANDED_SYSCONFDIR]],)
+[ --with-configdir=<PATH> PATH to Install gdm.conf configuration file [default=EXPANDED_SYSCONFDIR]],)
if test x$withval != x; then
GDM_CONFIGDIR="$withval"
else
- GDM_CONFIGDIR=$EXPANDED_SYSCONFDIR
+ GDM_CONFIGDIR="$EXPANDED_SYSCONFDIR/gdm"
fi
AC_SUBST(GDM_CONFIGDIR)
@@ -1001,11 +1005,6 @@ AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER")
AC_DEFINE_UNQUOTED(X_SERVER_PATH,"$X_SERVER_PATH")
AC_DEFINE_UNQUOTED(X_CONFIG_OPTIONS,"$X_CONFIG_OPTIONS", Options used when launching xserver)
-SYSCONFDIR_TMP="$sysconfdir"
-EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
-AC_SUBST(EXPANDED_SYSCONFDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_SYSCONFDIR,"$EXPANDED_SYSCONFDIR")
-
SESSDIR_TMP="$sysconfdir/gdm/Sessions"
EXPANDED_SESSDIR=`eval echo $SESSDIR_TMP`
AC_SUBST(EXPANDED_SESSDIR)