From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Tue, 9 Apr 2013 19:44:01 +0000 (+0000)
Subject: The configure script now supports a --with-rundir option to change the
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebafc0c1b132e6d4678ee026866b9322c6bf6e3b;p=thirdparty%2Fcups.git

The configure script now supports a --with-rundir option to change the
transient run-time state directory from the default to other locations like
/run/cups (STR #4306)

Bump version to 1.7b1, in preparation for the first beta release.


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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 57a0ff5f82..6d94e5e03c 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -5,6 +5,7 @@ CHANGES IN CUPS V1.6.3
 
 	- The configure script now prefers Clang over GCC.
 	- Fixed a compile problem on AIX (STR #4307)
+	- The Russian web interface templates were broken (STR #4310)
 	- The scheduler no longer tries to do Kerberos authentication over the
 	  loopback interface.
 	- The IPP backend could fail to pause a job for authentication
diff --git a/CHANGES.txt b/CHANGES.txt
index 3ce9b9bebc..f85fc21ce0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@ CHANGES.txt - 1.7b1 - 2013-04-09
 
 CHANGES IN CUPS V1.7b1
 
+	- The configure script now supports a --with-rundir option to change
+	  the transient run-time state directory from the default to other
+	  locations like /run/cups (STR #4306)
 	- The scheduler now supports PPD lookups for classes (STR #4296)
 	- The cupsfilter program did not set the FINAL_CONTENT_TYPE
 	  environment variable for filters.
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 62c17c362a..b3f82b5517 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,11 +20,11 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.7svn"
+CUPS_VERSION="1.7b1"
 CUPS_REVISION=""
-if test -z "$CUPS_REVISION" -a -d .svn; then
-	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-fi
+#if test -z "$CUPS_REVISION" -a -d .svn; then
+#	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+#fi
 CUPS_BUILD="cups-$CUPS_VERSION"
 
 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index e0349593f1..45665a13f3 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Directory stuff for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2013 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -412,16 +412,17 @@ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
 AC_SUBST(CUPS_SERVERROOT)
 
 # Transient run-time state
-case "$uname" in
-	Darwin*)
-		# Darwin (OS X)
-		CUPS_STATEDIR="$CUPS_SERVERROOT"
-		;;
-	*)
-		# All others
-		CUPS_STATEDIR="$localstatedir/run/cups"
-		;;
-esac
+AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state directory],CUPS_STATEDIR="$withval",[
+	case "$uname" in
+		Darwin*)
+			# Darwin (OS X)
+			CUPS_STATEDIR="$CUPS_SERVERROOT"
+			;;
+		*)
+			# All others
+			CUPS_STATEDIR="$localstatedir/run/cups"
+			;;
+	esac])
 AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)