Merge branch 'maint'

[paraslash.git] / ggo / server.m4

diff --git a/ggo/server.m4 b/ggo/server.m4
index f2738d37fea1045b7da2f01ee07dd37f04e02015..4be4e2c9f029766e7376d0949153f7ed7e560a94 100644 (file)
--- a/ggo/server.m4
+++ b/ggo/server.m4
@@ -9,6 +9,7 @@ section "General options"
 </qu>
 
 include(loglevel.m4)
 </qu>
 
 include(loglevel.m4)

+include(log_timing.m4)

 include(color.m4)
 include(daemon.m4)
 include(user.m4)
 include(color.m4)
 include(daemon.m4)
 include(user.m4)


@@ -104,7 +105,7 @@ option "afs_socket" s
 #~~~~~~~~~~~~~~~~~~~~
 "Command socket for afs"
 string typestr="path"
 #~~~~~~~~~~~~~~~~~~~~
 "Command socket for afs"
 string typestr="path"

-default="/var/paraslash/afs_command_socket"
+default="/var/paraslash/afs_command_socket-0.4"

 optional
 details="
        For each server command that is handled by the audio file
 optional
 details="
        For each server command that is handled by the audio file