Make sure the default web interface state is reflected in the binary, otherwise

we'll disable the web interface in existing installs.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9397 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 5fcaaca94f65bdfe1a06b2890f9d280c800f5aca..141f802ef4abc323fd13028405f6642f8b1a89ad 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -471,24 +471,29 @@ fi
 AC_SUBST(FONTS)
 
 dnl Web interface...
-AC_ARG_ENABLE(webif, [  --enable-webif        Enable the web interface by default, default=no for Mac OS X])
+AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for Mac OS X])
 case "x$enable_webif" in
        xno)
                CUPS_WEBIF=No
+               CUPS_DEFAULT_WEBIF=0
                ;;
        xyes)
                CUPS_WEBIF=Yes
+               CUPS_DEFAULT_WEBIF=1
                ;;
        *)
                if test $uname = Darwin; then
                        CUPS_WEBIF=No
+                       CUPS_DEFAULT_WEBIF=0
                else
                        CUPS_WEBIF=Yes
+                       CUPS_DEFAULT_WEBIF=1
                fi
                ;;
 esac
 
 AC_SUBST(CUPS_WEBIF)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
 
 dnl
 dnl End of "$Id$".

diff --git a/config.h.in b/config.h.in
index 996bc67170064f9648c940e889c046a3f182f15d..ed3df38b6eea82ab09897e993cacecf5806826be 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -100,12 +100,19 @@
 
 
 /*
- * Do we have domain socket support?
+ * Do we have domain socket support, and if so what is the default one?
  */
 
 #undef CUPS_DEFAULT_DOMAINSOCKET
 
 
+/*
+ * Default WebInterface value...
+ */
+
+#undef CUPS_DEFAULT_WEBIF
+
+
 /*
  * Where are files stored?
  *

diff --git a/scheduler/conf.c b/scheduler/conf.c
index a625afdfc057869ddb32107b6320ef73be565326..5acb0900afa2c62dbb6fb122cee372dff81014dd 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -633,7 +633,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Timeout                  = DEFAULT_TIMEOUT;
   NumSystemGroups          = 0;
-  WebInterface             = FALSE;
+  WebInterface             = CUPS_DEFAULT_WEBIF;
 
   BrowseInterval           = DEFAULT_INTERVAL;
   BrowsePort               = ippPort();

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 3dcb46c7682ec36a145828a29ba708dafba3ae93..ce6169ef9b681f97d37f9b370335a6daa0a34b8a 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -221,7 +221,7 @@ VAR int                     MaxClients              VALUE(100),
                                        /* Share printers by default? */
                        MultipleOperationTimeout VALUE(DEFAULT_TIMEOUT),
                                        /* multiple-operation-time-out value */
-                       WebInterface            VALUE(FALSE);
+                       WebInterface            VALUE(CUPS_DEFAULT_WEBIF);
                                        /* Enable the web interface? */
 VAR cups_file_t                *AccessFile             VALUE(NULL),
                                        /* Access log file */