diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-05-15 19:02:51 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-05-15 19:02:51 +0000 |
| commit | 141ad8f8ad688c6709e630b7038cc9b74f78b505 (patch) | |
| tree | 2dd25940278898ff7f800b5c418fb3dd0d35030e | |
| parent | cfa3a1f92a7721d7e02d94d8618c072f5d3e77a8 (diff) | |
| download | gdm-141ad8f8ad688c6709e630b7038cc9b74f78b505.tar.gz | |
Fix configure so it builds the path to use for gdm-ssh-session desktop
2006-05-15 Brian Cameron <brian.cameron@sun.com>
* configure.ac: Fix configure so it builds the path to use for
gdm-ssh-session desktop file properly if --libexecdir isn't
passed to configure.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 20 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2006-05-15 Brian Cameron <brian.cameron@sun.com> + * configure.ac: Fix configure so it builds the path to use for + gdm-ssh-session desktop file properly if --libexecdir isn't + passed to configure. + +2006-05-15 Brian Cameron <brian.cameron@sun.com> + * gui/gdmcommon.c: Use ngettext. Patch provided by Benoit Dejean <benoit@placenet.org>. Fixes bug #341680. diff --git a/configure.ac b/configure.ac index 94f3de4f..b2e98ca8 100644 --- a/configure.ac +++ b/configure.ac @@ -861,10 +861,23 @@ else fi fi +if test ${libexecdir} = "\${exec_prefix}/libexec"; then + if test ${exec_prefix} != "NONE"; then + path_to_check=$exec_prefix + elif test ${prefix} != "NONE"; then + path_to_check=$prefix + else + path_to_check=$ac_default_prefix + fi + ssh_libexec="$path_to_check/libexec" +else + ssh_libexec="${libexecdir}" +fi + if test x$enable_secureremote != xno ; then SSHDESKTOP="ssh.desktop" GDMSSHSESSION="gdm-ssh-session" - GDMSSHSESSIONCMD="${libexecdir}/gdm-ssh-session" + GDMSSHSESSIONCMD="${ssh_libexec}/gdm-ssh-session" fi AC_SUBST(SSHDESKTOP) AC_SUBST(GDMSSHSESSION) |