update @@ tokens according to recent Makefile.am change

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1107 fefdeb5f-60dc-0310-8127-8f9354f1896f

src/daemon/daemon.conf.in

@@ -52,11 +52,11 @@
 ## The path were to look for dynamic shared objects (DSOs aka
 ## plugins).  You may specify more than one path seperated by
 ## colons. 
-; dl-search-path = @DLSEARCHPATH@
+; dl-search-path = @PA_DLSEARCHPATH@
 
 ## The default script file to load. Specify an empty string for not
 ## loading a default script file. The 
-; default-script-file = @DEFAULT_CONFIG_FILE@
+; default-script-file = @PA_DEFAULT_CONFIG_FILE@
 
 ## The default log target. Use either "stderr", "syslog" or
 ## "auto". The latter is equivalent to "sylog" in case daemonize is

src/daemon/esdcompat.in

@@ -95,4 +95,4 @@ EOF
     shift
 done
 
-eval "exec '@PULSEAUDIO_BINARY@'$ARGS"
+eval "exec '@PA_BINARY@'$ARGS"

src/pulse/client.conf.in

@@ -21,7 +21,7 @@
 ## commented out.  Use either ; or # for commenting
 
 ## Path to the pulseaudio daemon to run when autospawning.
-; daemon-binary = @PULSEAUDIO_BINARY@
+; daemon-binary = @PA_BINARY@
 
 ## Extra arguments to pass to the pulseaudio daemon
 ; extra-arguments = --log-target=syslog --exit-idle-time=5
@@ -37,3 +37,9 @@
 
 ## Autospawn daemons?
 ; autospawn = 0
+
+### Cookie file
+; cookie-file = 
+
+### Access group
+; access-group =