[PATCH] don't install session files while --disable-session-integration

[Andrei Kholodnyi]

Hi list,

patch applied against Luke's git.

Thanks,
Andrei

Signed-off-by: Andrei Kholodnyi <>
---
 configure.in            |   12 ++++--------
 src/Makefile.am         |    6 +++++-
 src/python/Makefile.in  |    4 +---
 src/session/Makefile.in |    4 ----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/configure.in b/configure.in
index 8edbd6e..3d9c305 100644
--- a/configure.in
+++ b/configure.in
@@ -272,14 +272,10 @@ AC_SUBST(gthread_libs)
 AC_SUBST(datadir)
 
 AC_ARG_ENABLE([session-integration],
-           AC_HELP_STRING([--enable-session-integration],
-               [build with user session integration support]),
-               msg_session_integration=$enableval,
-               msg_session_integration=no)
-           if test "x$enable_session_integration" != "xyes"; then
-               msg_session_integration=no
-           fi
-AM_CONDITIONAL(ENABLE_SESSION, test "$msg_session_integration" = "yes")
+               AS_HELP_STRING([--enable-session-integration], [build with user 
session integration support (default)]),
+               [], [enable_session_integration=yes])
+
+AM_CONDITIONAL([ENABLE_SESSION], [test x$enable_session_integration = xyes])
 
 AC_ARG_WITH([bash-profile-dir],
             AC_HELP_STRING([--with-bash-profile-dir=PATH],
diff --git a/src/Makefile.am b/src/Makefile.am
index da68244..e4dfdb3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,10 @@ python/speechd_config/spd-conf 
python/speechd_config/test.wav \
 python/speechd_config/speechd.desktop session/Makefile.in 
session/speechd-user-port.sh.in \
 session/speechd-server-spawn.1 session/speechd-server-spawn.in
 
-SUBDIRS= server audio c modules tests python session
+SUBDIRS=server audio c modules tests python
+DIST_SUBDIRS=server audio c modules tests python session
 
+if ENABLE_SESSION
+SUBDIRS+=session
+endif
 
diff --git a/src/python/Makefile.in b/src/python/Makefile.in
index 711c59c..d66f006 100644
--- a/src/python/Makefile.in
+++ b/src/python/Makefile.in
@@ -12,9 +12,7 @@ all:
        echo "SPD_CONF_PATH=\"@address@hidden"" >> speechd_config/paths.py
        echo "SPD_SOUND_DATA_PATH=\"address@hidden@\"" >> 
speechd_config/paths.py
        echo "SPD_DESKTOP_CONF_PATH=\"address@hidden@\"" >> 
speechd_config/paths.py
-ifneq ($(ENABLE_SESSION_TRUE), "")
-       echo "SPD_SPAWN_CMD=\"@prefix@/bin/speechd-server-spawn\"" > 
speechd/spawn.py
-endif
+       @ENABLE_SESSION_TRUE at echo 
"SPD_SPAWN_CMD=\"@prefix@/bin/speechd-server-spawn\"" > speechd/spawn.py
 
 install:
        if test -x /usr/bin/python; then \
diff --git a/src/session/Makefile.in b/src/session/Makefile.in
index 0391748..3c65b70 100644
--- a/src/session/Makefile.in
+++ b/src/session/Makefile.in
@@ -7,20 +7,16 @@ speechd_default_port = $(shell grep SPEECHD_DEFAULT_PORT 
../../intl/def.h | awk
 speechd_system_start_cmd = @SPEECHD_SYSTEM_START_CMD@
 
 all:
-ifneq ($(ENABLE_SESSION_TRUE), "")
        sed -e "s/@SPEECHD_DEFAULT_PORT@/$(speechd_default_port)/" 
speechd-user-port.sh.in > speechd-user-port.sh
        sed -e "address@hidden@#$(speechd_system_start_cmd)#" 
speechd-server-spawn.in > speechd-server-spawn
-endif
 
 install:
-ifneq ($(ENABLE_SESSION_TRUE), "")
        install -d -o root -m 755 $(DESTDIR)/$(bash_profile_dir)
        install -o root -m 644 speechd-user-port.sh 
$(DESTDIR)/$(bash_profile_dir)
        install -d -o root -m 755 $(DESTDIR)/@prefix@/bin
        install -o root -m 755 speechd-server-spawn $(DESTDIR)/@prefix@/bin
        install -d -o root -m 755 $(DESTDIR)/@mandir@/man1
        install -o root -m 644 speechd-server-spawn.1 $(DESTDIR)/@mandir@/man1
-endif
 
 uninstall:
        rm -f $(DESTDIR)/$(bash_profile_dir)/speechd-user-port.sh
-- 
1.6.3.3