From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 26 Aug 2015 18:26:22 +0000 (+0000)
Subject: Fix --enable-page-logging configure option (STR #4694)
X-Git-Tag: v2.2b1~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e87a99684f071ad1f33903cbf9749bf7f41d891e;p=thirdparty%2Fcups.git

Fix --enable-page-logging configure option (STR #4694)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12846 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 498a3a1c7d..d3c080a8ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,8 +9,7 @@ CHANGES IN CUPS V2.1.0
 	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
 	- "make check" incorrectly reported an expectation of 18 warning
 	  messages when 8 were expected (STR #4684)
-	- The configure script did not disable the Avahi test on OS X
-	  (STR #4695)
+	- Fixed some configure script issues (STR #4694, STR #4695)
 
 
 CHANGES IN CUPS V2.1rc1
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 3e87de4fec..599825ca72 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
-dnl   Copyright 2007-2014 by Apple Inc.
+dnl   Copyright 2007-2015 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -85,7 +85,7 @@ AC_SUBST(CUPS_ACCESS_LOG_LEVEL)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_ACCESS_LOG_LEVEL, "$CUPS_ACCESS_LOG_LEVEL")
 
 dnl Default PageLogFormat
-AC_ARG_WITH(page_logging, [  --enable-page-logging   enable page_log by default])
+AC_ARG_ENABLE(page_logging, [  --enable-page-logging   enable page_log by default])
 if test "x$enable_page_logging" = xyes; then
 	CUPS_PAGE_LOG_FORMAT=""
 else