From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 19 Mar 2001 16:46:08 +0000 (+0000)
Subject: Add "--with-docdir=/dir" option to configure script for specifying the
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d6db4289656f8fa8d953565c255b3618ab3b0c5;p=thirdparty%2Fcups.git

Add "--with-docdir=/dir" option to configure script for specifying the
location of the documentation...


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

diff --git a/CHANGES.txt b/CHANGES.txt
index 40494afc5c..8e56c6ffd5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,10 @@ CHANGES.txt - 03/14/2001
 
 CHANGES IN CUPS V1.1.7
 
+	- Configuration script changes, including new
+	  "--with-docdir=/dir" option to relocate CUPS
+	  documentation and web content according to your
+	  favorite version of the FHS.
 	- Documentation updates for encryption, SLP, etc.
 	- New Software Test Plan and automated test script to
 	  test CUPS prior to installation.
diff --git a/configure.in b/configure.in
index 22247f66b4..e7f969a17b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.81 2001/03/04 02:30:59 mike Exp $"
+dnl "$Id: configure.in,v 1.82 2001/03/19 16:46:08 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -128,6 +128,8 @@ AC_ARG_ENABLE(pam, [  --enable-pam        turn on PAM support [default=yes]])
 
 AC_ARG_WITH(fontpath, [  --with-fontpath     set font path for pstoraster],fontpath="$withval",fontpath="")
 
+AC_ARG_WITH(docdir, [  --with-docdir       set path for documentation],docdir="$withval",docdir="")
+
 dnl Checks for programs...
 AC_PROG_AWK
 AC_PROG_CC
@@ -660,8 +662,14 @@ AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 AC_SUBST(CUPS_DATADIR)
 
 dnl Set the CUPS_DOCROOT directory...
-CUPS_DOCROOT='${datadir}/doc/cups'
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
+if test x$docdir = x; then
+	CUPS_DOCROOT='${datadir}/doc/cups'
+	docdir='$datadir/doc/cups'
+else
+	CUPS_DOCROOT="$docdir"
+fi
+
+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
 AC_SUBST(CUPS_DOCROOT)
 
 dnl Set the CUPS_FONTPATH directory...
@@ -670,5 +678,5 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 AC_OUTPUT(Makedefs cups.sh)
 
 dnl
-dnl End of "$Id: configure.in,v 1.81 2001/03/04 02:30:59 mike Exp $".
+dnl End of "$Id: configure.in,v 1.82 2001/03/19 16:46:08 mike Exp $".
 dnl