cupsd.conf: Remove IdleExitTimeout if no ondemand support

There are distributions using CUPS without ondemand support, where
IdleExitTimeout in cupsd.conf causes error in logs...

Related #1215

Author: zdohnal

conf/cupsd.conf.in

@@ -27,9 +27,7 @@ DefaultAuthType Basic
 
 # Web interface setting...
 WebInterface @CUPS_WEBIF@
-
-# Timeout after cupsd exits if idle (applied only if cupsd runs on-demand - with -l)
-IdleExitTimeout @EXIT_TIMEOUT@
+@EXIT_TIMEOUT@
 
 # Restrict access to the server...
 <Location />

config-scripts/cups-defaults.m4

@@ -395,15 +395,19 @@ AS_IF([test $CUPS_WEBIF = Yes || test $CUPS_BROWSING = Yes], [
   ])
 AC_SUBST([SYSTEMD_WANTED_BY])
 
-dnl Set default value of IdleExitTimeout
-AC_ARG_WITH([idle_exit_timeout], AS_HELP_STRING([--with-idle-exit-timeout], [set the default value for IdleExitTimeout, default=60]), [
-    AS_IF([test "x$withval" = "xno"], [
-	EXIT_TIMEOUT=0
+dnl Set default value of IdleExitTimeout if we have an ondemand support
+AS_IF([test x$with_ondemand != xno], [
+    AC_ARG_WITH([idle_exit_timeout], AS_HELP_STRING([--with-idle-exit-timeout], [set the default value for IdleExitTimeout, default=60]), [
+	AS_IF([test "x$withval" = "xno"], [
+	    EXIT_TIMEOUT="IdleExitTimeout 0"
+	], [
+	    EXIT_TIMEOUT="IdleExitTimeout $withval"
+	])
     ], [
-	EXIT_TIMEOUT=$withval
+	EXIT_TIMEOUT="IdleExitTimeout 60"
     ])
-], [
-    EXIT_TIMEOUT=60
+] ,[
+    EXIT_TIMEOUT=""
 ])
 
 AC_SUBST([EXIT_TIMEOUT])