Import changes from CUPS 1.4svn-r8704.

[thirdparty/cups.git] / config-scripts / cups-pap.m4

diff --git a/config-scripts/cups-pap.m4 b/config-scripts/cups-pap.m4
index 2fbed6776dd16f5c3a571fbec9583f6622c56ef3..b532e0370330f76236a891b8b8d398c3f7773302 100644 (file)
--- a/config-scripts/cups-pap.m4
+++ b/config-scripts/cups-pap.m4
@@ -1,37 +1,31 @@
 dnl
-dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007-2009 by Apple Inc.
 dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 # Currently the PAP backend is only supported on MacOS X with the AppleTalk
 # SDK installed...
-PAP=""
-if test $uname = Darwin; then
-       PAP="pap"
-       AC_CHECK_HEADER(AppleTalk/at_proto.h)
-fi
+AC_ARG_ENABLE(pap, [  --enable-pap            build with AppleTalk support])
 
+PAP=""
 AC_SUBST(PAP)
 
+if test x$enable_pap = xyes -a $uname = Darwin; then
+       AC_CHECK_HEADER(netat/appletalk.h,[
+               PAP="pap"
+               AC_CHECK_HEADER(AppleTalk/at_proto.h)])
+fi
+
 dnl
-dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl