From 61515785f7de12d8b2a29090020e684988f89977 Mon Sep 17 00:00:00 2001 From: Michael Sweet Date: Tue, 15 Mar 2016 10:36:17 -0400 Subject: [PATCH] Import CUPS v1.7.1 --- CHANGES.txt | 21 +- INSTALL.txt | 2 +- Makedefs.in | 4 +- Makefile | 4 +- README.txt | 2 +- backend/Makefile | 4 +- backend/backend-private.h | 4 +- backend/dnssd.c | 4 +- backend/ieee1284.c | 4 +- backend/ipp.c | 64 +- backend/lpd.c | 4 +- backend/network.c | 4 +- backend/runloop.c | 4 +- backend/snmp-supplies.c | 4 +- backend/snmp.c | 4 +- backend/socket.c | 4 +- backend/test1284.c | 4 +- backend/testbackend.c | 4 +- backend/testsupplies.c | 4 +- backend/usb-darwin.c | 4 +- backend/usb-libusb.c | 10 +- backend/usb-unix.c | 4 +- backend/usb.c | 4 +- berkeley/Makefile | 4 +- berkeley/lpc.c | 4 +- berkeley/lpq.c | 4 +- berkeley/lpr.c | 4 +- berkeley/lprm.c | 4 +- cgi-bin/Makefile | 4 +- cgi-bin/admin.c | 4 +- cgi-bin/cgi-private.h | 4 +- cgi-bin/cgi.h | 4 +- cgi-bin/classes.c | 4 +- cgi-bin/help-index.c | 4 +- cgi-bin/help-index.h | 4 +- cgi-bin/help.c | 4 +- cgi-bin/html.c | 4 +- cgi-bin/ipp-var.c | 4 +- cgi-bin/jobs.c | 4 +- cgi-bin/makedocset.c | 4 +- cgi-bin/printers.c | 4 +- cgi-bin/search.c | 4 +- cgi-bin/template.c | 4 +- cgi-bin/testcgi.c | 4 +- cgi-bin/testhi.c | 4 +- cgi-bin/testtemplate.c | 4 +- cgi-bin/var.c | 4 +- cgi-bin/websearch.c | 4 +- conf/Makefile | 4 +- conf/cups-files.conf.in | 4 +- conf/cupsd.conf.in | 4 +- conf/mime.convs.in | 4 +- conf/snmp.conf.in | 4 +- config-scripts/cups-common.m4 | 4 +- config.h.in | 4 +- configure | 11427 ++++++++++++++++++++++++ configure.in | 4 +- cups-config.in | 4 +- cups/Makefile | 4 +- cups/adminutil.c | 4 +- cups/adminutil.h | 4 +- cups/array-private.h | 4 +- cups/array.c | 4 +- cups/array.h | 4 +- cups/attr.c | 4 +- cups/auth.c | 4 +- cups/backchannel.c | 4 +- cups/backend.c | 4 +- cups/backend.h | 4 +- cups/conflicts.c | 4 +- cups/cups-private.h | 4 +- cups/cups.h | 4 +- cups/custom.c | 4 +- cups/debug-private.h | 4 +- cups/debug.c | 4 +- cups/dest-job.c | 4 +- cups/dest-localization.c | 4 +- cups/dest-options.c | 4 +- cups/dest.c | 4 +- cups/dir.c | 4 +- cups/dir.h | 4 +- cups/emit.c | 4 +- cups/encode.c | 4 +- cups/file-private.h | 4 +- cups/file.c | 4 +- cups/file.h | 4 +- cups/getdevices.c | 4 +- cups/getifaddrs.c | 4 +- cups/getputfile.c | 4 +- cups/globals.c | 4 +- cups/http-addr.c | 4 +- cups/http-addrlist.c | 4 +- cups/http-private.h | 4 +- cups/http-support.c | 12 +- cups/http.c | 4 +- cups/http.h | 4 +- cups/ipp-private.h | 4 +- cups/ipp-support.c | 4 +- cups/ipp.c | 4 +- cups/ipp.h | 4 +- cups/langprintf.c | 4 +- cups/language-private.h | 4 +- cups/language.c | 4 +- cups/language.h | 4 +- cups/localize.c | 4 +- cups/mark.c | 4 +- cups/md5-private.h | 4 +- cups/md5.c | 4 +- cups/md5passwd.c | 4 +- cups/notify.c | 4 +- cups/options.c | 4 +- cups/page.c | 4 +- cups/ppd-cache.c | 4 +- cups/ppd-private.h | 4 +- cups/ppd.c | 4 +- cups/ppd.h | 4 +- cups/pwg-media.c | 4 +- cups/pwg-private.h | 4 +- cups/pwg.h | 4 +- cups/raster-private.h | 4 +- cups/raster.h | 4 +- cups/request.c | 4 +- cups/sidechannel.c | 4 +- cups/sidechannel.h | 4 +- cups/snmp-private.h | 4 +- cups/snmp.c | 4 +- cups/snprintf.c | 4 +- cups/sspi.c | 4 +- cups/string-private.h | 4 +- cups/string.c | 4 +- cups/tempfile.c | 4 +- cups/testadmin.c | 4 +- cups/testarray.c | 4 +- cups/testconflicts.c | 4 +- cups/testcups.c | 4 +- cups/testfile.c | 4 +- cups/testhttp.c | 29 +- cups/testi18n.c | 4 +- cups/testipp.c | 4 +- cups/testlang.c | 4 +- cups/testoptions.c | 4 +- cups/testppd.c | 4 +- cups/testpwg.c | 4 +- cups/testsnmp.c | 4 +- cups/thread-private.h | 4 +- cups/thread.c | 4 +- cups/transcode.c | 4 +- cups/transcode.h | 4 +- cups/usersys.c | 73 +- cups/util.c | 4 +- cups/versioning.h | 4 +- data/Makefile | 4 +- data/epson.h | 4 +- data/hp.h | 4 +- data/label.h | 4 +- desktop/Makefile | 4 +- doc/Makefile | 2 +- doc/ca/index.html.in | 2 +- doc/cs/index.html.in | 2 +- doc/es/index.html.in | 2 +- doc/fr/index.html.in | 2 +- doc/help/spec-cmp.html | 157 +- doc/index.html.in | 2 +- doc/it/index.html.in | 2 +- doc/ja/index.html.in | 2 +- doc/ru/index.html.in | 2 +- examples/Makefile | 4 +- examples/ppdx.c | 4 +- examples/ppdx.h | 4 +- examples/testppdx.c | 4 +- examples/testppdx.ppd | 4 +- filter/Makefile | 4 +- filter/commandtops.c | 4 +- filter/common.c | 4 +- filter/common.h | 4 +- filter/error.c | 4 +- filter/gziptoany.c | 4 +- filter/interpret.c | 4 +- filter/pstops.c | 4 +- filter/raster.c | 4 +- filter/rasterbench.c | 4 +- filter/rastertoepson.c | 4 +- filter/rastertohp.c | 4 +- filter/rastertolabel.c | 4 +- filter/rastertopwg.c | 4 +- filter/testraster.c | 4 +- install-sh | 2 +- locale/Makefile | 4 +- locale/checkpo.c | 4 +- locale/po2strings.c | 4 +- locale/strings2po.c | 4 +- locale/translate.c | 4 +- man/Makefile | 4 +- man/backend.man | 4 +- man/cancel.man | 4 +- man/classes.conf.man | 4 +- man/client.conf.man.in | 4 +- man/cups-config.man | 4 +- man/cups-deviced.man.in | 4 +- man/cups-driverd.man.in | 4 +- man/cups-files.conf.man.in | 4 +- man/cups-lpd.man.in | 4 +- man/cups-snmp.conf.man | 4 +- man/cups-snmp.man.in | 4 +- man/cupsaccept.man | 4 +- man/cupsaddsmb.man.in | 4 +- man/cupsctl.man | 4 +- man/cupsd.conf.man.in | 4 +- man/cupsd.man.in | 4 +- man/cupsenable.man | 4 +- man/cupsfilter.man | 4 +- man/cupstestdsc.man | 4 +- man/cupstestppd.man | 4 +- man/filter.man | 4 +- man/ippfind.man | 4 +- man/ipptool.man | 4 +- man/ipptoolfile.man | 4 +- man/lp.man | 4 +- man/lpadmin.man | 4 +- man/lpc.man | 4 +- man/lpinfo.man | 4 +- man/lpmove.man | 4 +- man/lpoptions.man.in | 4 +- man/lppasswd.man | 4 +- man/lpq.man | 4 +- man/lpr.man | 4 +- man/lprm.man | 4 +- man/lpstat.man | 4 +- man/mailto.conf.man | 4 +- man/mantohtml.c | 4 +- man/mime.convs.man | 4 +- man/mime.types.man | 4 +- man/notifier.man | 4 +- man/ppdc.man | 4 +- man/ppdcfile.man | 4 +- man/ppdhtml.man | 4 +- man/ppdi.man | 4 +- man/ppdmerge.man | 4 +- man/ppdpo.man | 4 +- man/printers.conf.man | 4 +- man/subscriptions.conf.man | 4 +- monitor/Makefile | 4 +- monitor/bcp.c | 4 +- monitor/tbcp.c | 4 +- notifier/Makefile | 4 +- notifier/dbus.c | 77 +- notifier/mailto.c | 4 +- notifier/rss.c | 4 +- notifier/testnotify.c | 4 +- packaging/cups.list.in | 4 +- packaging/cups.spec | 396 + packaging/cups.spec.in | 8 +- ppdc/Makefile | 4 +- ppdc/foo.drv | 4 +- ppdc/genstrings.cxx | 4 +- ppdc/ppdc-array.cxx | 4 +- ppdc/ppdc-attr.cxx | 4 +- ppdc/ppdc-catalog.cxx | 4 +- ppdc/ppdc-choice.cxx | 4 +- ppdc/ppdc-constraint.cxx | 4 +- ppdc/ppdc-driver.cxx | 4 +- ppdc/ppdc-file.cxx | 4 +- ppdc/ppdc-filter.cxx | 4 +- ppdc/ppdc-font.cxx | 4 +- ppdc/ppdc-group.cxx | 4 +- ppdc/ppdc-import.cxx | 4 +- ppdc/ppdc-mediasize.cxx | 4 +- ppdc/ppdc-message.cxx | 4 +- ppdc/ppdc-option.cxx | 4 +- ppdc/ppdc-private.h | 4 +- ppdc/ppdc-profile.cxx | 4 +- ppdc/ppdc-shared.cxx | 4 +- ppdc/ppdc-source.cxx | 4 +- ppdc/ppdc-string.cxx | 4 +- ppdc/ppdc-variable.cxx | 4 +- ppdc/ppdc.cxx | 4 +- ppdc/ppdc.h | 4 +- ppdc/ppdhtml.cxx | 4 +- ppdc/ppdi.cxx | 4 +- ppdc/ppdmerge.cxx | 4 +- ppdc/ppdpo.cxx | 4 +- ppdc/sample.drv | 4 +- ppdc/testcatalog.cxx | 4 +- scheduler/Makefile | 4 +- scheduler/auth.c | 8 +- scheduler/auth.h | 4 +- scheduler/banners.c | 4 +- scheduler/banners.h | 4 +- scheduler/cert.c | 4 +- scheduler/cert.h | 4 +- scheduler/classes.c | 4 +- scheduler/classes.h | 4 +- scheduler/client.c | 4 +- scheduler/client.h | 4 +- scheduler/colorman.c | 4 +- scheduler/colorman.h | 4 +- scheduler/conf.c | 6 +- scheduler/conf.h | 4 +- scheduler/cups-deviced.c | 4 +- scheduler/cups-driverd.cxx | 4 +- scheduler/cups-exec.c | 4 +- scheduler/cups-lpd.c | 4 +- scheduler/cups.sh.in | 4 +- scheduler/cups.xml.in | 2 +- scheduler/cupsd.h | 4 +- scheduler/cupsfilter.c | 4 +- scheduler/dirsvc.c | 4 +- scheduler/dirsvc.h | 4 +- scheduler/env.c | 4 +- scheduler/file.c | 4 +- scheduler/filter.c | 4 +- scheduler/ipp.c | 109 +- scheduler/job.c | 4 +- scheduler/job.h | 4 +- scheduler/listen.c | 4 +- scheduler/log.c | 4 +- scheduler/main.c | 4 +- scheduler/mime-private.h | 4 +- scheduler/mime.c | 4 +- scheduler/mime.h | 4 +- scheduler/network.c | 13 +- scheduler/network.h | 4 +- scheduler/policy.c | 4 +- scheduler/policy.h | 4 +- scheduler/printers.c | 4 +- scheduler/printers.h | 4 +- scheduler/process.c | 4 +- scheduler/quotas.c | 4 +- scheduler/select.c | 4 +- scheduler/server.c | 4 +- scheduler/statbuf.c | 4 +- scheduler/statbuf.h | 4 +- scheduler/subscriptions.c | 4 +- scheduler/subscriptions.h | 4 +- scheduler/sysman.c | 4 +- scheduler/sysman.h | 4 +- scheduler/testlpd.c | 4 +- scheduler/testmime.c | 4 +- scheduler/testspeed.c | 4 +- scheduler/testsub.c | 4 +- scheduler/tls-darwin.c | 4 +- scheduler/tls-gnutls.c | 4 +- scheduler/tls-openssl.c | 4 +- scheduler/tls.c | 4 +- scheduler/type.c | 4 +- scheduler/util.c | 4 +- scheduler/util.h | 4 +- systemv/Makefile | 4 +- systemv/cancel.c | 4 +- systemv/cupsaccept.c | 4 +- systemv/cupsaddsmb.c | 4 +- systemv/cupsctl.c | 4 +- systemv/cupstestdsc.c | 4 +- systemv/cupstestppd.c | 4 +- systemv/lp.c | 4 +- systemv/lpadmin.c | 4 +- systemv/lpinfo.c | 4 +- systemv/lpmove.c | 4 +- systemv/lpoptions.c | 4 +- systemv/lppasswd.c | 4 +- systemv/lpstat.c | 4 +- templates/Makefile | 4 +- templates/ca/trailer.tmpl | 2 +- templates/cs/trailer.tmpl | 2 +- templates/es/trailer.tmpl | 2 +- templates/fr/trailer.tmpl | 2 +- templates/it/trailer.tmpl | 2 +- templates/ja/trailer.tmpl | 2 +- templates/ru/Makefile | 4 +- templates/ru/trailer.tmpl | 2 +- templates/trailer.tmpl | 2 +- test/4.1-requests.test | 4 +- test/4.2-cups-printer-ops.test | 4 +- test/4.3-job-ops.test | 4 +- test/4.4-subscription-ops.test | 4 +- test/5.1-lpadmin.sh | 4 +- test/5.2-lpc.sh | 4 +- test/5.3-lpq.sh | 4 +- test/5.4-lpstat.sh | 4 +- test/5.5-lp.sh | 4 +- test/5.6-lpr.sh | 4 +- test/5.7-lprm.sh | 4 +- test/5.8-cancel.sh | 4 +- test/5.9-lpinfo.sh | 4 +- test/Makefile | 4 +- test/cancel-current-job.test | 4 +- test/create-printer-subscription.test | 4 +- test/get-completed-jobs.test | 4 +- test/get-jobs.test | 4 +- test/get-notifications.test | 4 +- test/ipp-1.1.test | 4 +- test/ipp-2.0.test | 4 +- test/ipp-2.1.test | 4 +- test/ipp-2.2.test | 4 +- test/ipp-everywhere.test | 4 +- test/ippdiscover.c | 4 +- test/ippfind.c | 4 +- test/ippserver.c | 4 +- test/ipptool.c | 4 +- test/run-stp-tests.sh | 4 +- test/testhp.ppd | 4 +- test/testps.ppd | 4 +- test/waitjobs.sh | 4 +- test/xmltotest.c | 4 +- tools/checkglobals | 32 - tools/listpublic | 12 - tools/makeipptoolpkg | 97 - tools/makesrcdist | 133 - tools/pdftops-darwin.sh | 44 - tools/products.php | 50 - tools/testbtmm.c | 65 - tools/testosx | 137 - tools/testrpm | 32 - vcnet/config.h | 4 +- xcode/config.h | 4 +- 415 files changed, 12841 insertions(+), 1693 deletions(-) create mode 100755 configure create mode 100644 packaging/cups.spec delete mode 100755 tools/checkglobals delete mode 100755 tools/listpublic delete mode 100755 tools/makeipptoolpkg delete mode 100755 tools/makesrcdist delete mode 100755 tools/pdftops-darwin.sh delete mode 100644 tools/products.php delete mode 100644 tools/testbtmm.c delete mode 100755 tools/testosx delete mode 100755 tools/testrpm diff --git a/CHANGES.txt b/CHANGES.txt index fadfac839..a47e89585 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,10 @@ -CHANGES.txt - 1.7.1 - 2013-11-06 +CHANGES.txt - 1.7.1 - 2014-01-08 -------------------------------- CHANGES IN CUPS V1.7.1 + - Security: the lppasswd program incorrectly used settings from + ~/.cups/client.conf (STR #4319) - Auto debug logging was broken in 1.7.0 () - Some gzip'd PPD files could not be used () - Cleaned up some job logging in the scheduler @@ -11,7 +13,7 @@ CHANGES IN CUPS V1.7.1 scheduler () - The RPM spec file did not list the build requirements; this was on purpose, but now we are listing the Red Hat package names - () + (, STR #4322) - Printing to a raw queue could result in corrupt output due to opportunistic compression () - The GNU TLS support code triggered many compiler warnings due to the @@ -21,6 +23,21 @@ CHANGES IN CUPS V1.7.1 cups-filters package installed () - Japanese PPDs using with the Shift-JIS encoding did not work () + - "tel:" URIs incorrectly had slashes () + - The libusb-based USB backend incorrectly used write timeouts + () + - Shared printers could become inaccessible after a few days on OS X + () + - The IPP backend did not wait for a busy printer to become available + before attempting to print () + - CUPS did not support "auto-monochrome" or "process-monochrome" for the + "print-color-mode" option () + - Using "@IF(name)" in an Allow or Deny rule did not work (STR #4328) + - lpq and lpstat did not list jobs in the correct order when priorities + were specified (STR #4326) + - The D-BUS notifier did not remove its lockfile (STR #4314) + - CUPS incorrectly used the USER environment variable when the name did + not match the user ID (STR #4327) CHANGES IN CUPS V1.7.0 diff --git a/INSTALL.txt b/INSTALL.txt index 090b17fba..27797678d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.7.0 - 2013-07-16 +INSTALL - CUPS v1.7.1 - 2014-01-08 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/Makedefs.in b/Makedefs.in index 817f18ab1..6d25b41cb 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makedefs.in 11154 2013-07-17 15:21:18Z msweet $" # # Common makefile definitions for CUPS. # @@ -261,5 +261,5 @@ DBUSDIR = @DBUSDIR@ # -# End of "$Id$" +# End of "$Id: Makedefs.in 11154 2013-07-17 15:21:18Z msweet $" # diff --git a/Makefile b/Makefile index 0e287e473..199d0a0b3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 11370 2013-10-30 15:08:29Z msweet $" # # Top-level Makefile for CUPS. # @@ -352,5 +352,5 @@ dist: all # -# End of "$Id$". +# End of "$Id: Makefile 11370 2013-10-30 15:08:29Z msweet $". # diff --git a/README.txt b/README.txt index 9ec52474c..70f10e775 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v1.7.0 - 2013-07-16 +README - CUPS v1.7.1 - 2014-01-08 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/backend/Makefile b/backend/Makefile index 8d1e12e71..ec17c0a13 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 11154 2013-07-17 15:21:18Z msweet $" # # Backend makefile for CUPS. # @@ -301,5 +301,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 11154 2013-07-17 15:21:18Z msweet $". # diff --git a/backend/backend-private.h b/backend/backend-private.h index 3729bb020..09e4bac4e 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: backend-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Backend support definitions for CUPS. * @@ -334,5 +334,5 @@ extern int backendWaitLoop(int snmp_fd, http_addr_t *addr, /* - * End of "$Id$". + * End of "$Id: backend-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/dnssd.c b/backend/dnssd.c index 9cea92e03..916b890b3 100644 --- a/backend/dnssd.c +++ b/backend/dnssd.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dnssd.c 4074 2012-12-12 20:54:21Z msweet $" * * DNS-SD discovery backend for CUPS. * @@ -1320,5 +1320,5 @@ unquote(char *dst, /* I - Destination buffer */ /* - * End of "$Id$". + * End of "$Id: dnssd.c 4074 2012-12-12 20:54:21Z msweet $". */ diff --git a/backend/ieee1284.c b/backend/ieee1284.c index bc4b344a6..fc5ad1d09 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ieee1284.c 10996 2013-05-29 11:51:34Z msweet $" * * IEEE-1284 support functions for CUPS. * @@ -487,5 +487,5 @@ backendGetMakeModel( /* - * End of "$Id$". + * End of "$Id: ieee1284.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/ipp.c b/backend/ipp.c index fb9700b11..22a350c9c 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ipp.c 11495 2013-12-22 05:29:16Z msweet $" * * IPP backend for CUPS. * @@ -163,7 +163,7 @@ static ipp_t *new_request(ipp_op_t op, int version, const char *uri, ppd_file_t *ppd, ipp_attribute_t *media_col_sup, ipp_attribute_t *doc_handling_sup, - int print_color_mode); + ipp_attribute_t *print_color_mode_sup); static const char *password_cb(const char *prompt, http_t *http, const char *method, const char *resource, int *user_data); @@ -250,12 +250,12 @@ main(int argc, /* I - Number of command-line args */ ipp_attribute_t *doc_handling_sup; /* multiple-document-handling-supported */ ipp_attribute_t *printer_state; /* printer-state attribute */ ipp_attribute_t *printer_accepting; /* printer-is-accepting-jobs */ + ipp_attribute_t *print_color_mode_sup;/* Does printer support print-color-mode? */ int create_job = 0, /* Does printer support Create-Job? */ get_job_attrs = 0, /* Does printer support Get-Job-Attributes? */ send_document = 0, /* Does printer support Send-Document? */ validate_job = 0, /* Does printer support Validate-Job? */ - print_color_mode = 0; /* Does printer support print-color-mode? */ - int copies, /* Number of copies for job */ + copies, /* Number of copies for job */ copies_remaining; /* Number of copies remaining */ const char *content_type, /* CONTENT_TYPE environment variable */ *final_content_type, /* FINAL_CONTENT_TYPE environment var */ @@ -1024,7 +1024,8 @@ main(int argc, /* I - Number of command-line args */ delay = _cupsNextDelay(delay, &prev_delay); ippDelete(supported); - supported = NULL; + supported = NULL; + ipp_status = IPP_STATUS_ERROR_BUSY; continue; } } @@ -1100,9 +1101,7 @@ main(int argc, /* I - Number of command-line args */ media_col_sup->values[i].string.text); } - print_color_mode = ippFindAttribute(supported, - "print-color-mode-supported", - IPP_TAG_KEYWORD) != NULL; + print_color_mode_sup = ippFindAttribute(supported, "print-color-mode-supported", IPP_TAG_KEYWORD); if ((operations_sup = ippFindAttribute(supported, "operations-supported", IPP_TAG_ENUM)) != NULL) @@ -1384,7 +1383,7 @@ main(int argc, /* I - Number of command-line args */ request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], monitor.job_name, num_options, options, compression, copies_sup ? copies : 1, document_format, pc, ppd, - media_col_sup, doc_handling_sup, print_color_mode); + media_col_sup, doc_handling_sup, print_color_mode_sup); response = cupsDoRequest(http, request, resource); @@ -1470,7 +1469,7 @@ main(int argc, /* I - Number of command-line args */ version, uri, argv[2], monitor.job_name, num_options, options, compression, copies_sup ? copies : 1, document_format, pc, ppd, media_col_sup, - doc_handling_sup, print_color_mode); + doc_handling_sup, print_color_mode_sup); /* * Do the request... @@ -2483,7 +2482,8 @@ new_request( ppd_file_t *ppd, /* I - PPD file data */ ipp_attribute_t *media_col_sup, /* I - media-col-supported values */ ipp_attribute_t *doc_handling_sup, /* I - multiple-document-handling-supported values */ - int print_color_mode) /* I - Printer supports print-color-mode */ + ipp_attribute_t *print_color_mode_sup) + /* I - Printer supports print-color-mode */ { int i; /* Looping var */ ipp_t *request; /* Request data */ @@ -2658,6 +2658,14 @@ new_request( strlen(keyword)); break; default : + if (!strcmp(mandatory, "print-color-mode") && !strcmp(keyword, "monochrome")) + { + if (ippContainsString(print_color_mode_sup, "auto-monochrome")) + keyword = "auto-monochrome"; + else if (ippContainsString(print_color_mode_sup, "process-monochrome") && !ippContainsString(print_color_mode_sup, "monochrome")) + keyword = "process-monochrome"; + } + ippAddString(request, IPP_TAG_JOB, value_tag, mandatory, NULL, keyword); break; @@ -2732,22 +2740,32 @@ new_request( ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-bin", NULL, keyword); - color_attr_name = print_color_mode ? "print-color-mode" : "output-mode"; + color_attr_name = print_color_mode_sup ? "print-color-mode" : "output-mode"; if ((keyword = cupsGetOption("print-color-mode", num_options, - options)) != NULL) - ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, color_attr_name, - NULL, keyword); - else if ((choice = ppdFindMarkedChoice(ppd, "ColorModel")) != NULL) + options)) == NULL) { - if (!_cups_strcasecmp(choice->choice, "Gray")) - ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, - color_attr_name, NULL, "monochrome"); - else - ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, - color_attr_name, NULL, "color"); + if ((choice = ppdFindMarkedChoice(ppd, "ColorModel")) != NULL) + { + if (!_cups_strcasecmp(choice->choice, "Gray")) + keyword = "monochrome"; + else + keyword = "color"; + } + } + + if (keyword && !strcmp(keyword, "monochrome")) + { + if (ippContainsString(print_color_mode_sup, "auto-monochrome")) + keyword = "auto-monochrome"; + else if (ippContainsString(print_color_mode_sup, "process-monochrome") && !ippContainsString(print_color_mode_sup, "monochrome")) + keyword = "process-monochrome"; } + if (keyword) + ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, color_attr_name, + NULL, keyword); + if ((keyword = cupsGetOption("print-quality", num_options, options)) != NULL) ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality", @@ -3662,5 +3680,5 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */ } /* - * End of "$Id$". + * End of "$Id: ipp.c 11495 2013-12-22 05:29:16Z msweet $". */ diff --git a/backend/lpd.c b/backend/lpd.c index d73d1bcf0..6e4ab3657 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: lpd.c 10996 2013-05-29 11:51:34Z msweet $" * * Line Printer Daemon backend for CUPS. * @@ -1331,5 +1331,5 @@ sigterm_handler(int sig) /* I - Signal */ /* - * End of "$Id$". + * End of "$Id: lpd.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/network.c b/backend/network.c index f011f2cf2..4227319c4 100644 --- a/backend/network.c +++ b/backend/network.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $" * * Common backend network APIs for CUPS. * @@ -322,5 +322,5 @@ backendNetworkSideCB( /* - * End of "$Id$". + * End of "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/backend/runloop.c b/backend/runloop.c index c03c4c262..74cdc512d 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: runloop.c 10996 2013-05-29 11:51:34Z msweet $" * * Common run loop APIs for CUPS backends. * @@ -539,5 +539,5 @@ backendWaitLoop( /* - * End of "$Id$". + * End of "$Id: runloop.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c index 0864c2290..568af8586 100644 --- a/backend/snmp-supplies.c +++ b/backend/snmp-supplies.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: snmp-supplies.c 11319 2013-09-27 16:18:26Z msweet $" * * SNMP supplies functions for CUPS. * @@ -1103,5 +1103,5 @@ utf16_to_utf8( /* - * End of "$Id$". + * End of "$Id: snmp-supplies.c 11319 2013-09-27 16:18:26Z msweet $". */ diff --git a/backend/snmp.c b/backend/snmp.c index fc40800c6..a94e89c57 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: snmp.c 10996 2013-05-29 11:51:34Z msweet $" * * SNMP discovery backend for CUPS. * @@ -1391,5 +1391,5 @@ update_cache(snmp_cache_t *device, /* I - Device */ /* - * End of "$Id$". + * End of "$Id: snmp.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/socket.c b/backend/socket.c index ebed1361b..8b7dc380c 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: socket.c 10996 2013-05-29 11:51:34Z msweet $" * * AppSocket backend for CUPS. * @@ -520,5 +520,5 @@ wait_bc(int device_fd, /* I - Socket */ /* - * End of "$Id$". + * End of "$Id: socket.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/test1284.c b/backend/test1284.c index 49bef87ee..3a32391b1 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $" * * IEEE-1284 support functions test program for CUPS. * @@ -80,5 +80,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id$". + * End of "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/testbackend.c b/backend/testbackend.c index 722859f7f..aecfd9cd9 100644 --- a/backend/testbackend.c +++ b/backend/testbackend.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testbackend.c 4297 2013-05-10 16:04:59Z msweet $" * * Backend test program for CUPS. * @@ -684,5 +684,5 @@ walk_cb(const char *oid, /* I - OID */ /* - * End of "$Id$". + * End of "$Id: testbackend.c 4297 2013-05-10 16:04:59Z msweet $". */ diff --git a/backend/testsupplies.c b/backend/testsupplies.c index 6cbdf8091..0a300bc90 100644 --- a/backend/testsupplies.c +++ b/backend/testsupplies.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $" * * SNMP supplies test program for CUPS. * @@ -79,5 +79,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id$". + * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $". */ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 937d18e1a..15f074e9e 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,5 +1,5 @@ /* -* "$Id$" +* "$Id: usb-darwin.c 10996 2013-05-29 11:51:34Z msweet $" * * Copyright 2005-2013 Apple Inc. All rights reserved. * @@ -2339,5 +2339,5 @@ static void get_device_id(cups_sc_status_t *status, /* - * End of "$Id$". + * End of "$Id: usb-darwin.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index 20c3d1b56..34c28999b 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: usb-libusb.c 11456 2013-12-09 19:26:47Z msweet $" * * LIBUSB interface code for CUPS. * @@ -496,7 +496,7 @@ print_device(const char *uri, /* I - Device URI */ iostatus = libusb_bulk_transfer(g.printer->handle, g.printer->write_endp, print_buffer, g.print_bytes, - &bytes, 60000); + &bytes, 0); /* * Ignore timeout errors, but retain the number of bytes written to * avoid sending duplicate data... @@ -519,7 +519,7 @@ print_device(const char *uri, /* I - Device URI */ iostatus = libusb_bulk_transfer(g.printer->handle, g.printer->write_endp, print_buffer, g.print_bytes, - &bytes, 60000); + &bytes, 0); } /* @@ -534,7 +534,7 @@ print_device(const char *uri, /* I - Device URI */ iostatus = libusb_bulk_transfer(g.printer->handle, g.printer->write_endp, print_buffer, g.print_bytes, - &bytes, 60000); + &bytes, 0); } if (iostatus) @@ -2021,6 +2021,6 @@ soft_reset_printer( /* - * End of "$Id$". + * End of "$Id: usb-libusb.c 11456 2013-12-09 19:26:47Z msweet $". */ diff --git a/backend/usb-unix.c b/backend/usb-unix.c index 3fe18b68f..203380049 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: usb-unix.c 10996 2013-05-29 11:51:34Z msweet $" * * USB port backend for CUPS. * @@ -612,5 +612,5 @@ side_cb(int print_fd, /* I - Print file */ /* - * End of "$Id$". + * End of "$Id: usb-unix.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/backend/usb.c b/backend/usb.c index ee8c1f4ed..3ccbc0099 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $" * * USB port backend for CUPS. * @@ -260,5 +260,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ /* - * End of "$Id$". + * End of "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/berkeley/Makefile b/berkeley/Makefile index 991481ac0..6534f76cf 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Berkeley commands makefile for CUPS. # @@ -164,5 +164,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/berkeley/lpc.c b/berkeley/lpc.c index e8ccb91c0..ffd76296a 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: lpc.c 10996 2013-05-29 11:51:34Z msweet $" * * "lpc" command for CUPS. * @@ -446,5 +446,5 @@ show_status(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id$". + * End of "$Id: lpc.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 7e8d8baaa..1cde7b071 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: lpq.c 11101 2013-07-08 11:20:33Z msweet $" * * "lpq" command for CUPS. * @@ -679,5 +679,5 @@ usage(void) /* - * End of "$Id$". + * End of "$Id: lpq.c 11101 2013-07-08 11:20:33Z msweet $". */ diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 4b8957ffe..a90818d34 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: lpr.c 11101 2013-07-08 11:20:33Z msweet $" * * "lpr" command for CUPS. * @@ -436,5 +436,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: lpr.c 11101 2013-07-08 11:20:33Z msweet $". */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index e2d03e359..922bbbd40 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $" * * "lprm" command for CUPS. * @@ -213,5 +213,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index 7a73c058d..64635a375 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # CGI makefile for CUPS. # @@ -380,5 +380,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index 5589c1155..490a46bbe 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: admin.c 11345 2013-10-18 21:14:52Z msweet $" * * Administration CGI for CUPS. * @@ -4218,5 +4218,5 @@ get_points(double number, /* I - Original number */ /* - * End of "$Id$". + * End of "$Id: admin.c 11345 2013-10-18 21:14:52Z msweet $". */ diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 1f9690273..c5d0eef20 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Private CGI definitions for CUPS. * @@ -32,5 +32,5 @@ /* - * End of "$Id$". + * End of "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index 61eb7fc75..37732b513 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $" * * CGI support library definitions for CUPS. * @@ -115,5 +115,5 @@ extern const char *cgiText(const char *message); #endif /* !_CUPS_CGI_H_ */ /* - * End of "$Id$". + * End of "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index 6f2fd58a2..eb280df38 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: classes.c 10996 2013-05-29 11:51:34Z msweet $" * * Class status CGI for CUPS. * @@ -554,5 +554,5 @@ show_class(http_t *http, /* I - Connection to server */ /* - * End of "$Id$". + * End of "$Id: classes.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 801f088fd..997d22fad 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: help-index.c 10996 2013-05-29 11:51:34Z msweet $" * * Online help index routines for CUPS. * @@ -1324,5 +1324,5 @@ help_sort_words(help_word_t *w1, /* I - Second word */ /* - * End of "$Id$". + * End of "$Id: help-index.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index 41d8d93db..3618d606f 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $" * * Online help index definitions for CUPS. * @@ -83,5 +83,5 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query, #endif /* !_CUPS_HELP_INDEX_H_ */ /* - * End of "$Id$". + * End of "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/help.c b/cgi-bin/help.c index 215c98bc4..75f70d9c4 100644 --- a/cgi-bin/help.c +++ b/cgi-bin/help.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $" * * Online help CGI for CUPS. * @@ -393,5 +393,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/html.c b/cgi-bin/html.c index 9db5438eb..af58c88f5 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $" * * HTML support functions for CUPS. * @@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */ /* - * End of "$Id$". + * End of "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index 38120da08..e2df6ef10 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ipp-var.c 10996 2013-05-29 11:51:34Z msweet $" * * CGI <-> IPP variable routines for CUPS. * @@ -1589,5 +1589,5 @@ cgiText(const char *message) /* I - Message */ /* - * End of "$Id$". + * End of "$Id: ipp-var.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index e57b0218d..ccff8cf86 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: jobs.c 10996 2013-05-29 11:51:34Z msweet $" * * Job status CGI for CUPS. * @@ -210,5 +210,5 @@ do_job_op(http_t *http, /* I - HTTP connection */ /* - * End of "$Id$". + * End of "$Id: jobs.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 4aee5d9a4..6be2797b6 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $" * * Xcode documentation set generator. * @@ -482,5 +482,5 @@ write_nodes(const char *path, /* I - File to write */ /* - * End of "$Id$". + * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index 37b0f552d..d690c4573 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: printers.c 10996 2013-05-29 11:51:34Z msweet $" * * Printer status CGI for CUPS. * @@ -574,5 +574,5 @@ show_printer(http_t *http, /* I - Connection to server */ /* - * End of "$Id$". + * End of "$Id: printers.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/search.c b/cgi-bin/search.c index a6abd5978..ed67008a7 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: search.c 10996 2013-05-29 11:51:34Z msweet $" * * Search routines for CUPS. * @@ -377,5 +377,5 @@ cgiFreeSearch(void *search) /* I - Search context */ /* - * End of "$Id$". + * End of "$Id: search.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/template.c b/cgi-bin/template.c index cdf1544bb..0a71653fd 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: template.c 10996 2013-05-29 11:51:34Z msweet $" * * CGI template function. * @@ -729,5 +729,5 @@ cgi_puturi(const char *s, /* I - String to output */ /* - * End of "$Id$". + * End of "$Id: template.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index dfda3d7ea..cbe80ed82 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testcgi.c 10996 2013-05-29 11:51:34Z msweet $" * * CGI test program for CUPS. * @@ -71,5 +71,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testcgi.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index ce1b94b01..9feed6bb7 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $" * * Help index test program for CUPS. * @@ -109,5 +109,5 @@ list_nodes(const char *title, /* I - Title string */ /* - * End of "$Id$". + * End of "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 02c017365..c479b3a17 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $" * * CGI template test program for CUPS. * @@ -99,5 +99,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 660c8bb3a..382771d6d 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: var.c 10996 2013-05-29 11:51:34Z msweet $" * * CGI form variable and array functions for CUPS. * @@ -1307,5 +1307,5 @@ cgi_unlink_file(void) /* - * End of "$Id$". + * End of "$Id: var.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cgi-bin/websearch.c b/cgi-bin/websearch.c index 351f92db0..20d8d7e4b 100644 --- a/cgi-bin/websearch.c +++ b/cgi-bin/websearch.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $" * * Web search program for www.cups.org. * @@ -112,5 +112,5 @@ list_nodes(help_index_t *hi, /* I - Help index */ /* - * End of "$Id$". + * End of "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $". */ diff --git a/conf/Makefile b/conf/Makefile index 97df33f04..f4d63f8d4 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Configuration file makefile for CUPS. # @@ -139,5 +139,5 @@ uninstall: # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in index 36afecc40..4e7a2cd90 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: cups-files.conf.in 11201 2013-07-26 21:27:27Z msweet $" # # Sample file/directory/user/group configuration file for the CUPS scheduler. # See "man cups-files.conf" for a complete description of this file. @@ -97,5 +97,5 @@ PageLog @CUPS_LOGDIR@/page_log #TempDir @CUPS_REQUESTS@/tmp # -# End of "$Id$". +# End of "$Id: cups-files.conf.in 11201 2013-07-26 21:27:27Z msweet $". # diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 4e5517e4e..e671c16c2 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: cupsd.conf.in 11025 2013-06-07 01:00:33Z msweet $" # # Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a # complete description of this file. @@ -130,5 +130,5 @@ WebInterface @CUPS_WEBIF@ # -# End of "$Id$". +# End of "$Id: cupsd.conf.in 11025 2013-06-07 01:00:33Z msweet $". # diff --git a/conf/mime.convs.in b/conf/mime.convs.in index f460000dd..0685b1921 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $" # # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW # VERSIONS OF CUPS. Instead, create a "local.convs" file that @@ -59,5 +59,5 @@ application/vnd.cups-raster image/pwg-raster 100 rastertopwg @DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw 0 - # -# End of "$Id$". +# End of "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $". # diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in index 43855ab66..3b4565f09 100644 --- a/conf/snmp.conf.in +++ b/conf/snmp.conf.in @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: snmp.conf.in 11025 2013-06-07 01:00:33Z msweet $" # # Sample SNMP configuration file for CUPS. See "man cups-snmp.conf" for a # complete description of this file. @@ -9,5 +9,5 @@ @CUPS_SNMP_COMMUNITY@ # -# End of "$Id$". +# End of "$Id: snmp.conf.in 11025 2013-06-07 01:00:33Z msweet $". # diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index b961bc132..a32b0e3e1 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -20,8 +20,8 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION="1.7.1" -CUPS_REVISION="" +CUPS_VERSION=1.7.1 +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 diff --git a/config.h.in b/config.h.in index e708598ac..488202283 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: config.h.in 10996 2013-05-29 11:51:34Z msweet $" * * Configuration file for CUPS. * @@ -706,5 +706,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id$". + * End of "$Id: config.h.in 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/configure b/configure new file mode 100755 index 000000000..01ed99bd4 --- /dev/null +++ b/configure @@ -0,0 +1,11427 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.68. +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= +PACKAGE_URL= + +ac_unique_file="cups/cups.h" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_default_prefix=/ +ac_subst_vars='LTLIBOBJS +LIBOBJS +UNINSTALL_LANGUAGES +INSTALL_LANGUAGES +PYTHON +PHP +PHPCGI +PERL +JAVA +CUPS_WEBIF +DEFAULT_IPP_PORT +CUPS_SNMP_COMMUNITY +CUPS_SNMP_ADDRESS +DEFAULT_RAW_PRINTING +CUPS_MAX_COPIES +CUPS_DEFAULT_SMB_CONFIG_FILE +CUPS_DEFAULT_LPD_CONFIG_FILE +CUPS_DEFAULT_PRINTCAP +CUPS_PRIMARY_SYSTEM_GROUP +CUPS_SYSTEM_GROUPS +CUPS_GROUP +CUPS_USER +CUPS_DEFAULT_SHARED +CUPS_BROWSE_LOCAL_PROTOCOLS +CUPS_BROWSING +CUPS_ACCESS_LOG_LEVEL +CUPS_LOG_LEVEL +CUPS_FATAL_ERRORS +CUPS_LOG_FILE_PERM +CUPS_CUPSD_FILE_PERM +CUPS_CONFIG_FILE_PERM +CUPS_BUNDLEDIR +LANGUAGES +LAUNCHDLIBS +DEFAULT_LAUNCHD_CONF +IPPFIND_MAN +IPPFIND_BIN +DNSSD_BACKEND +DNSSDLIBS +LARGEFILE +PAMMODAUTH +PAMMOD +PAMLIBS +PAMFILE +PAMDIR +EXPORT_SSLLIBS +SSLLIBS +SSLFLAGS +IPPALIASES +CUPS_SERVERKEY +CUPS_SERVERCERT +LIBGCRYPTCONFIG +LIBGNUTLSCONFIG +PTHREAD_FLAGS +CUPS_DEFAULT_GSSSERVICENAME +KRB5CONFIG +LIBGSSAPI +CUPS_LISTEN_DOMAINSOCKET +CUPS_DEFAULT_DOMAINSOCKET +RELROFLAGS +PIEFLAGS +CXXLIBS +LDARCHFLAGS +ARCHFLAGS +UNITTESTS +OPTIM +INSTALL_STRIP +LIBTOOL +EXPORT_LDFLAGS +IMGLIBS +DSOLIBS +LINKCUPSIMAGE +LINKCUPS +EXTLINKCUPSIMAGE +EXTLINKCUPS +LIBCUPSSTATIC +LIBCUPSPPDC +LIBCUPSMIME +LIBCUPSIMAGE +LIBCUPSCGI +LIBCUPSBASE +LIBCUPS +DSOFLAGS +DSOXX +DSO +MAN8DIR +MAN8EXT +MAN7EXT +MAN5EXT +MAN1EXT +PMANDIR +AMANDIR +CUPS_STATEDIR +CUPS_SERVERROOT +INSTALL_SYSV +CUPS_SERVERBIN +CUPS_REQUESTS +CUPS_LOGDIR +CUPS_LOCALEDIR +CUPS_FONTPATH +CUPS_DOCROOT +MENUDIR +ICONDIR +CUPS_DATADIR +CUPS_CACHEDIR +XINETD +SMFMANIFESTDIR +RCSTOP +RCSTART +RCLEVELS +INITDDIR +INITDIR +PRIVATEINCLUDE +privateinclude +BUILDDIRS +INSTALLXPC +CUPS_SYSTEM_AUTHKEY +CUPS_DEFAULT_PRINTOPERATOR_AUTH +DBUS_NOTIFIERLIBS +DBUS_NOTIFIER +DBUSDIR +SERVERLIBS +BACKLIBS +ARFLAGS +LIBZ +INSTALL_GZIP +LIBWRAP +USBQUIRKS +LIBUSB +LIBMXML +EGREP +GREP +LIBPAPER +LIBMALLOC +PKGCONFIG +INSTALLSTATIC +INSTALL +CUPS_HTMLVIEW +XDGOPEN +SED +RMDIR +RM +MV +LN +LD +GZIP +CHMOD +AR +RANLIB +ac_ct_CXX +CXXFLAGS +CXX +CPP +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +AWK +CUPS_BUILD +CUPS_REVISION +CUPS_VERSION +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_cups_build +enable_static +enable_mallinfo +enable_libpaper +enable_libusb +enable_tcp_wrappers +enable_acl +enable_dbus +with_dbusdir +with_adminkey +with_operkey +with_components +with_privateinclude +with_rcdir +with_rclevels +with_rcstart +with_rcstop +with_smfmanifestdir +with_xinetd +with_lpdconfig +with_smbconfig +with_cachedir +with_icondir +with_menudir +with_docdir +with_fontpath +with_logdir +with_rundir +enable_shared +enable_libtool_unsupported +with_optim +enable_debug +enable_debug_guards +enable_debug_printfs +enable_unit_tests +with_archflags +with_ldarchflags +enable_relro +with_domainsocket +enable_gssapi +with_gssservicename +enable_threads +enable_ssl +enable_cdsassl +enable_gnutls +enable_openssl +with_openssl_libs +with_openssl_includes +enable_pam +with_pam_module +enable_largefile +enable_avahi +enable_dnssd +with_dnssd_libs +with_dnssd_includes +enable_launchd +with_languages +with_bundledir +with_config_file_perm +with_cupsd_file_perm +with_log_file_perm +with_fatal_errors +with_log_level +with_access_log_level +enable_browsing +with_local_protocols +enable_default_shared +with_cups_user +with_cups_group +with_system_groups +with_printcap +with_lpdconfigfile +with_smbconfigfile +with_max_copies +enable_raw_printing +with_snmp_address +with_snmp_community +with_ipp_port +enable_webif +with_java +with_perl +with_php +with_python +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures this package to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF +_ACEOF +fi + +if test -n "$ac_init_help"; then + + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-static install static libraries + --enable-mallinfo build with malloc debug logging + --enable-libpaper build with libpaper support + --enable-libusb use libusb for USB printing + --enable-tcp-wrappers use libwrap for TCP wrappers support + --enable-acl build with POSIX ACL support + --disable-dbus build without DBUS support + --disable-shared do not create shared libraries + --enable-libtool-unsupported + build with libtool (UNSUPPORTED!) + --enable-debug build with debugging symbols + --enable-debug-guards build with memory allocation guards + --enable-debug-printfs build with CUPS_DEBUG_LOG support + --enable-unit-tests build and run unit tests + --enable-relro build with the GCC relro option + --disable-gssapi disable GSSAPI support + --disable-threads disable multi-threading support + --disable-ssl disable SSL/TLS support + --enable-cdsassl use CDSA for SSL/TLS support, default=first + --enable-gnutls use GNU TLS for SSL/TLS support, default=second + --enable-openssl use OpenSSL for SSL/TLS support, default=third + --disable-pam disable PAM support + --disable-largefile omit support for large files + --disable-avahi disable DNS Service Discovery support using Avahi + --disable-dnssd disable DNS Service Discovery support using mDNSResponder + --disable-launchd disable launchd support + --disable-browsing disable Browsing by default + --disable-default-shared + disable DefaultShared by default + --disable-raw-printing do not allow raw printing by default + --enable-webif enable the web interface by default, default=no for OS X + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-cups-build set "cups-config --build" string + --with-dbusdir set DBUS configuration directory + --with-adminkey set the default SystemAuthKey value + --with-operkey set the default operator @AUTHKEY value + --with-components set components to build: + - "all" (default) builds everything + - "core" builds libcups and ipptool + --with-privateinclude set path for private include files, default=none + --with-rcdir set path for rc scripts + --with-rclevels set run levels for rc scripts + --with-rcstart set start number for rc scripts + --with-rcstop set stop number for rc scripts + --with-smfmanifestdir set path for Solaris SMF manifest + --with-xinetd set path for xinetd config files + --with-lpdconfig set URI for LPD config file + --with-smbconfig set URI for Samba config file + --with-cachedir set path for cache files + --with-icondir set path for application icons + --with-menudir set path for application menus + --with-docdir set path for documentation + --with-fontpath set font path for pstoraster + --with-logdir set path for log files + --with-rundir set transient run-time state directory + --with-optim set optimization flags + --with-archflags set default architecture flags + --with-ldarchflags set program architecture flags + --with-domainsocket set unix domain socket name + --with-gssservicename set default gss service name + --with-openssl-libs set directory for OpenSSL library + --with-openssl-includes set directory for OpenSSL includes + --with-pam-module specify the PAM module to use + --with-dnssd-libs set directory for DNS Service Discovery library + --with-dnssd-includes set directory for DNS Service Discovery includes + --with-languages set installed languages, default=all + --with-bundledir set OS X localization bundle directory + --with-config-file-perm set default ConfigFilePerm value, default=0640 + --with-cupsd-file-perm set default cupsd permissions, default=0500 + --with-log-file-perm set default LogFilePerm value, default=0644 + --with-fatal-errors set default FatalErrors value, default=config + --with-log-level set default LogLevel value, default=warn + --with-access-log-level set default AccessLogLevel value, default=actions + --with-local-protocols set default BrowseLocalProtocols, default="" + --with-cups-user set default user for CUPS + --with-cups-group set default group for CUPS + --with-system-groups set default system groups for CUPS + --with-printcap set default printcap file + --with-lpdconfigfile set default LPDConfigFile URI + --with-smbconfigfile set default SMBConfigFile URI + --with-max-copies set default max copies value, default=9999 + --with-snmp-address set SNMP query address, default=auto + --with-snmp-community set SNMP community, default=public + --with-ipp-port set port number for IPP, default=631 + --with-java set Java interpreter for web interfaces + --with-perl set Perl interpreter for web interfaces + --with-php set PHP interpreter for web interfaces + --with-python set Python interpreter for web interfaces + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to the package provider. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.68 + +Copyright (C) 2010 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_member +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by $as_me, which was +generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +uname=`uname` +uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` +uarch=`uname -m` + +case "$uname" in + Darwin*) + uname="Darwin" + if test $uversion -lt 120; then + as_fn_error $? "Sorry, this version of CUPS requires OS X 10.8 or higher." "$LINENO" 5 + fi + ;; + + GNU* | GNU/*) + uname="GNU" + ;; + Linux*) + uname="Linux" + ;; +esac + + + + + +ac_config_headers="$ac_config_headers config.h" + + +CUPS_VERSION=1.7.1 +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 +CUPS_BUILD="cups-$CUPS_VERSION" + + +# Check whether --with-cups_build was given. +if test "${with_cups_build+set}" = set; then : + withval=$with_cups_build; CUPS_BUILD="$withval" +fi + + + + + +cat >>confdefs.h <<_ACEOF +#define CUPS_SVERSION "CUPS v$CUPS_VERSION$CUPS_REVISION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define CUPS_MINIMAL "CUPS/$CUPS_VERSION$CUPS_REVISION" +_ACEOF + + +CFLAGS="${CFLAGS:=}" +CPPFLAGS="${CPPFLAGS:=}" +CXXFLAGS="${CXXFLAGS:=}" +LDFLAGS="${LDFLAGS:=}" + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in clang cc gcc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in clang cc gcc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in clang++ c++ g++ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in clang++ c++ g++ +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +# Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $AR in + [\\/]* | ?:[\\/]*) + ac_cv_path_AR="$AR" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +AR=$ac_cv_path_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "chmod", so it can be a program name with args. +set dummy chmod; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CHMOD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CHMOD in + [\\/]* | ?:[\\/]*) + ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +CHMOD=$ac_cv_path_CHMOD +if test -n "$CHMOD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5 +$as_echo "$CHMOD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "gzip", so it can be a program name with args. +set dummy gzip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GZIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GZIP in + [\\/]* | ?:[\\/]*) + ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GZIP=$ac_cv_path_GZIP +if test -n "$GZIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5 +$as_echo "$GZIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "ld", so it can be a program name with args. +set dummy ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LD in + [\\/]* | ?:[\\/]*) + ac_cv_path_LD="$LD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +LD=$ac_cv_path_LD +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "ln", so it can be a program name with args. +set dummy ln; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LN in + [\\/]* | ?:[\\/]*) + ac_cv_path_LN="$LN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +LN=$ac_cv_path_LN +if test -n "$LN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5 +$as_echo "$LN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "mv", so it can be a program name with args. +set dummy mv; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MV+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MV in + [\\/]* | ?:[\\/]*) + ac_cv_path_MV="$MV" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +MV=$ac_cv_path_MV +if test -n "$MV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5 +$as_echo "$MV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "rm", so it can be a program name with args. +set dummy rm; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_RM+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $RM in + [\\/]* | ?:[\\/]*) + ac_cv_path_RM="$RM" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +RM=$ac_cv_path_RM +if test -n "$RM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 +$as_echo "$RM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "rmdir", so it can be a program name with args. +set dummy rmdir; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_RMDIR+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $RMDIR in + [\\/]* | ?:[\\/]*) + ac_cv_path_RMDIR="$RMDIR" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +RMDIR=$ac_cv_path_RMDIR +if test -n "$RMDIR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 +$as_echo "$RMDIR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "sed", so it can be a program name with args. +set dummy sed; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $SED in + [\\/]* | ?:[\\/]*) + ac_cv_path_SED="$SED" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +SED=$ac_cv_path_SED +if test -n "$SED"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "xdg-open", so it can be a program name with args. +set dummy xdg-open; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XDGOPEN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $XDGOPEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_XDGOPEN="$XDGOPEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +XDGOPEN=$ac_cv_path_XDGOPEN +if test -n "$XDGOPEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XDGOPEN" >&5 +$as_echo "$XDGOPEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "x$XDGOPEN" = x; then + CUPS_HTMLVIEW="htmlview" +else + CUPS_HTMLVIEW="$XDGOPEN" +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 +$as_echo_n "checking for install-sh script... " >&6; } +INSTALL="`pwd`/install-sh" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 +$as_echo "using $INSTALL" >&6; } + +if test "x$AR" = x; then + as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 +fi +if test "x$CC" = x; then + as_fn_error $? "Unable to find required C compiler command." "$LINENO" 5 +fi + +INSTALLSTATIC="" +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; +fi + + +if test x$enable_static = xyes; then + echo Installing static libraries... + INSTALLSTATIC="installstatic" +fi + + + +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKGCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +$as_echo "$PKGCONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing abs" >&5 +$as_echo_n "checking for library containing abs... " >&6; } +if ${ac_cv_search_abs+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char abs (); +int +main () +{ +return abs (); + ; + return 0; +} +_ACEOF +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_abs=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_abs+:} false; then : + break +fi +done +if ${ac_cv_search_abs+:} false; then : + +else + ac_cv_search_abs=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_abs" >&5 +$as_echo "$ac_cv_search_abs" >&6; } +ac_res=$ac_cv_search_abs +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_ABS 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 +$as_echo_n "checking for library containing crypt... " >&6; } +if ${ac_cv_search_crypt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char crypt (); +int +main () +{ +return crypt (); + ; + return 0; +} +_ACEOF +for ac_lib in '' crypt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_crypt=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_crypt+:} false; then : + break +fi +done +if ${ac_cv_search_crypt+:} false; then : + +else + ac_cv_search_crypt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 +$as_echo "$ac_cv_search_crypt" >&6; } +ac_res=$ac_cv_search_crypt +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fmod" >&5 +$as_echo_n "checking for library containing fmod... " >&6; } +if ${ac_cv_search_fmod+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fmod (); +int +main () +{ +return fmod (); + ; + return 0; +} +_ACEOF +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fmod=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fmod+:} false; then : + break +fi +done +if ${ac_cv_search_fmod+:} false; then : + +else + ac_cv_search_fmod=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmod" >&5 +$as_echo "$ac_cv_search_fmod" >&6; } +ac_res=$ac_cv_search_fmod +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getspent" >&5 +$as_echo_n "checking for library containing getspent... " >&6; } +if ${ac_cv_search_getspent+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getspent (); +int +main () +{ +return getspent (); + ; + return 0; +} +_ACEOF +for ac_lib in '' sec gen; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_getspent=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_getspent+:} false; then : + break +fi +done +if ${ac_cv_search_getspent+:} false; then : + +else + ac_cv_search_getspent=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getspent" >&5 +$as_echo "$ac_cv_search_getspent" >&6; } +ac_res=$ac_cv_search_getspent +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +LIBMALLOC="" +# Check whether --enable-mallinfo was given. +if test "${enable_mallinfo+set}" = set; then : + enableval=$enable_mallinfo; +fi + + +if test x$enable_mallinfo = xyes; then + SAVELIBS="$LIBS" + LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing mallinfo" >&5 +$as_echo_n "checking for library containing mallinfo... " >&6; } +if ${ac_cv_search_mallinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mallinfo (); +int +main () +{ +return mallinfo (); + ; + return 0; +} +_ACEOF +for ac_lib in '' malloc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_mallinfo=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_mallinfo+:} false; then : + break +fi +done +if ${ac_cv_search_mallinfo+:} false; then : + +else + ac_cv_search_mallinfo=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mallinfo" >&5 +$as_echo "$ac_cv_search_mallinfo" >&6; } +ac_res=$ac_cv_search_mallinfo +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_MALLINFO 1" >>confdefs.h + +fi + + LIBMALLOC="$LIBS" + LIBS="$SAVELIBS" +fi + + + +# Check whether --enable-libpaper was given. +if test "${enable_libpaper+set}" = set; then : + enableval=$enable_libpaper; +fi + + +if test x$enable_libpaper = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for systempapername in -lpaper" >&5 +$as_echo_n "checking for systempapername in -lpaper... " >&6; } +if ${ac_cv_lib_paper_systempapername+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpaper $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char systempapername (); +int +main () +{ +return systempapername (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_paper_systempapername=yes +else + ac_cv_lib_paper_systempapername=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_paper_systempapername" >&5 +$as_echo "$ac_cv_lib_paper_systempapername" >&6; } +if test "x$ac_cv_lib_paper_systempapername" = xyes; then : + $as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h + + LIBPAPER="-lpaper" +else + LIBPAPER="" +fi + +else + LIBPAPER="" +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + $as_echo "#define HAVE_STDLIB_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" +if test "x$ac_cv_header_crypt_h" = xyes; then : + $as_echo "#define HAVE_CRYPT_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_langinfo_h" = xyes; then : + $as_echo "#define HAVE_LANGINFO_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" +if test "x$ac_cv_header_malloc_h" = xyes; then : + $as_echo "#define HAVE_MALLOC_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default" +if test "x$ac_cv_header_shadow_h" = xyes; then : + $as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes; then : + $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes; then : + $as_echo "#define HAVE_STRING_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = xyes; then : + $as_echo "#define HAVE_STRINGS_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "bstring.h" "ac_cv_header_bstring_h" "$ac_includes_default" +if test "x$ac_cv_header_bstring_h" = xyes; then : + $as_echo "#define HAVE_BSTRING_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "usersec.h" "ac_cv_header_usersec_h" "$ac_includes_default" +if test "x$ac_cv_header_usersec_h" = xyes; then : + $as_echo "#define HAVE_USERSEC_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ioctl_h" = xyes; then : + $as_echo "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_param_h" = xyes; then : + $as_echo "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/ucred.h" "ac_cv_header_sys_ucred_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ucred_h" = xyes; then : + $as_echo "#define HAVE_SYS_UCRED_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "scsi/sg.h" "ac_cv_header_scsi_sg_h" "$ac_includes_default" +if test "x$ac_cv_header_scsi_sg_h" = xyes; then : + $as_echo "#define HAVE_SCSI_SG_H 1" >>confdefs.h + +fi + + + +ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +if test "x$ac_cv_header_iconv_h" = xyes; then : + SAVELIBS="$LIBS" + LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing iconv_open" >&5 +$as_echo_n "checking for library containing iconv_open... " >&6; } +if ${ac_cv_search_iconv_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char iconv_open (); +int +main () +{ +return iconv_open (); + ; + return 0; +} +_ACEOF +for ac_lib in '' iconv; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_iconv_open=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_iconv_open+:} false; then : + break +fi +done +if ${ac_cv_search_iconv_open+:} false; then : + +else + ac_cv_search_iconv_open=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_iconv_open" >&5 +$as_echo "$ac_cv_search_iconv_open" >&6; } +ac_res=$ac_cv_search_iconv_open +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_ICONV_H 1" >>confdefs.h + + SAVELIBS="$SAVELIBS $LIBS" +fi + + LIBS="$SAVELIBS" +fi + + + +LIBMXML="" +ac_fn_c_check_header_mongrel "$LINENO" "mxml.h" "ac_cv_header_mxml_h" "$ac_includes_default" +if test "x$ac_cv_header_mxml_h" = xyes; then : + SAVELIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing mmxlNewElement" >&5 +$as_echo_n "checking for library containing mmxlNewElement... " >&6; } +if ${ac_cv_search_mmxlNewElement+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mmxlNewElement (); +int +main () +{ +return mmxlNewElement (); + ; + return 0; +} +_ACEOF +for ac_lib in '' mxml; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_mmxlNewElement=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_mmxlNewElement+:} false; then : + break +fi +done +if ${ac_cv_search_mmxlNewElement+:} false; then : + +else + ac_cv_search_mmxlNewElement=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mmxlNewElement" >&5 +$as_echo "$ac_cv_search_mmxlNewElement" >&6; } +ac_res=$ac_cv_search_mmxlNewElement +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_MXML_H 1" >>confdefs.h + + LIBMXML="-lmxml" +fi + + LIBS="$SAVELIBS" +fi + + + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mount_h" = xyes; then : + $as_echo "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_statfs_h" = xyes; then : + $as_echo "#define HAVE_SYS_STATFS_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_statvfs_h" = xyes; then : + $as_echo "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_vfs_h" = xyes; then : + $as_echo "#define HAVE_SYS_VFS_H 1" >>confdefs.h + +fi + + +for ac_func in statfs statvfs +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +for ac_func in strdup strlcat strlcpy +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then + echo Forcing snprintf emulation for HP-UX. +else + for ac_func in snprintf vsnprintf +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +fi + +for ac_func in random lrand48 arc4random +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +for ac_func in geteuid +do : + ac_fn_c_check_func "$LINENO" "geteuid" "ac_cv_func_geteuid" +if test "x$ac_cv_func_geteuid" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETEUID 1 +_ACEOF + +fi +done + + +for ac_func in setpgid +do : + ac_fn_c_check_func "$LINENO" "setpgid" "ac_cv_func_setpgid" +if test "x$ac_cv_func_setpgid" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETPGID 1 +_ACEOF + +fi +done + + +for ac_func in vsyslog +do : + ac_fn_c_check_func "$LINENO" "vsyslog" "ac_cv_func_vsyslog" +if test "x$ac_cv_func_vsyslog" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VSYSLOG 1 +_ACEOF + +fi +done + + +case "$uname" in + Linux | GNU) + # Do not use sigset on Linux or GNU HURD + ;; + *) + # Use sigset on other platforms, if available + for ac_func in sigset +do : + ac_fn_c_check_func "$LINENO" "sigset" "ac_cv_func_sigset" +if test "x$ac_cv_func_sigset" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SIGSET 1 +_ACEOF + +fi +done + + ;; +esac + +for ac_func in sigaction +do : + ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SIGACTION 1 +_ACEOF + +fi +done + + +for ac_func in waitpid wait3 +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff member in tm structure" >&5 +$as_echo_n "checking for tm_gmtoff member in tm structure... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +struct tm t; + int o = t.tm_gmtoff; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_gen member in stat structure" >&5 +$as_echo_n "checking for st_gen member in stat structure... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +struct stat t; + int o = t.st_gen; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_ST_GEN 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +for ac_func in removefile +do : + ac_fn_c_check_func "$LINENO" "removefile" "ac_cv_func_removefile" +if test "x$ac_cv_func_removefile" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_REMOVEFILE 1 +_ACEOF + +fi +done + + +# Check whether --enable-libusb was given. +if test "${enable_libusb+set}" = set; then : + enableval=$enable_libusb; +fi + + +LIBUSB="" +USBQUIRKS="" + + + +if test "x$PKGCONFIG" != x; then + if test x$enable_libusb = xyes -o $uname != Darwin; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5 +$as_echo_n "checking for libusb-1.0... " >&6; } + if $PKGCONFIG --exists libusb-1.0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h + + CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" + LIBUSB="`$PKGCONFIG --libs libusb-1.0`" + USBQUIRKS="\$(DATADIR)/usb" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +elif test x$enable_libusb = xyes; then + as_fn_error $? "Need pkg-config to enable libusb support." "$LINENO" 5 +fi + +# Check whether --enable-tcp_wrappers was given. +if test "${enable_tcp_wrappers+set}" = set; then : + enableval=$enable_tcp_wrappers; +fi + + +LIBWRAP="" + + +if test x$enable_tcp_wrappers = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hosts_access in -lwrap" >&5 +$as_echo_n "checking for hosts_access in -lwrap... " >&6; } +if ${ac_cv_lib_wrap_hosts_access+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwrap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char hosts_access (); +int +main () +{ +return hosts_access (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_wrap_hosts_access=yes +else + ac_cv_lib_wrap_hosts_access=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_hosts_access" >&5 +$as_echo "$ac_cv_lib_wrap_hosts_access" >&6; } +if test "x$ac_cv_lib_wrap_hosts_access" = xyes; then : + + ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default" +if test "x$ac_cv_header_tcpd_h" = xyes; then : + $as_echo "#define HAVE_TCPD_H 1" >>confdefs.h + + LIBWRAP="-lwrap" +fi + + +fi + +fi + +INSTALL_GZIP="" +LIBZ="" +ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5 +$as_echo_n "checking for gzgets in -lz... " >&6; } +if ${ac_cv_lib_z_gzgets+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gzgets (); +int +main () +{ +return gzgets (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_gzgets=yes +else + ac_cv_lib_z_gzgets=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5 +$as_echo "$ac_cv_lib_z_gzgets" >&6; } +if test "x$ac_cv_lib_z_gzgets" = xyes; then : + $as_echo "#define HAVE_LIBZ 1" >>confdefs.h + + LIBZ="-lz" + LIBS="$LIBS -lz" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 +$as_echo_n "checking for inflateCopy in -lz... " >&6; } +if ${ac_cv_lib_z_inflateCopy+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char inflateCopy (); +int +main () +{ +return inflateCopy (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_inflateCopy=yes +else + ac_cv_lib_z_inflateCopy=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5 +$as_echo "$ac_cv_lib_z_inflateCopy" >&6; } +if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : + $as_echo "#define HAVE_INFLATECOPY 1" >>confdefs.h + +fi + + if test "x$GZIP" != z; then + INSTALL_GZIP="-z" + fi +fi + +fi + + + + + +case $uname in + Darwin* | *BSD*) + ARFLAGS="-rcv" + ;; + *) + ARFLAGS="crvs" + ;; +esac + + + +BACKLIBS="" +SERVERLIBS="" + + + +SAVELIBS="$LIBS" +LIBS="" +# Check whether --enable-acl was given. +if test "${enable_acl+set}" = set; then : + enableval=$enable_acl; +fi + +if test "x$enable_acl" != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_init" >&5 +$as_echo_n "checking for library containing acl_init... " >&6; } +if ${ac_cv_search_acl_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acl_init (); +int +main () +{ +return acl_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' acl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_acl_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_acl_init+:} false; then : + break +fi +done +if ${ac_cv_search_acl_init+:} false; then : + +else + ac_cv_search_acl_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_init" >&5 +$as_echo "$ac_cv_search_acl_init" >&6; } +ac_res=$ac_cv_search_acl_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_ACL_INIT 1" >>confdefs.h + +fi + + SERVERLIBS="$SERVERLIBS $LIBS" +fi +LIBS="$SAVELIBS" + +if test -d /etc/dbus-1; then + DBUSDIR="/etc/dbus-1" +else + DBUSDIR="" +fi + +# Check whether --enable-dbus was given. +if test "${enable_dbus+set}" = set; then : + enableval=$enable_dbus; +fi + + +# Check whether --with-dbusdir was given. +if test "${with_dbusdir+set}" = set; then : + withval=$with_dbusdir; DBUSDIR="$withval" +fi + + +DBUS_NOTIFIER="" +DBUS_NOTIFIERLIBS="" + +if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 +$as_echo_n "checking for DBUS... " >&6; } + if $PKGCONFIG --exists dbus-1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_DBUS 1" >>confdefs.h + + CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" + SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`" + DBUS_NOTIFIER="dbus" + DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`" + SAVELIBS="$LIBS" + LIBS="$LIBS $DBUS_NOTIFIERLIBS" + ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append" +if test "x$ac_cv_func_dbus_message_iter_init_append" = xyes; then : + $as_echo "#define HAVE_DBUS_MESSAGE_ITER_INIT_APPEND 1" >>confdefs.h + +fi + + LIBS="$SAVELIBS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + + + + + +CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" +CUPS_DEFAULT_SYSTEM_AUTHKEY="" +CUPS_SYSTEM_AUTHKEY="" +INSTALLXPC="" + +case $uname in + Darwin*) + BACKLIBS="$BACKLIBS -framework IOKit" + SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" + LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS" + + ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" +if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes; then : + $as_echo "#define HAVE_APPLICATIONSERVICES_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CoreFoundation.h" "ac_cv_header_CoreFoundation_CoreFoundation_h" "$ac_includes_default" +if test "x$ac_cv_header_CoreFoundation_CoreFoundation_h" = xyes; then : + $as_echo "#define HAVE_COREFOUNDATION_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFPriv.h" "ac_cv_header_CoreFoundation_CFPriv_h" "$ac_includes_default" +if test "x$ac_cv_header_CoreFoundation_CFPriv_h" = xyes; then : + $as_echo "#define HAVE_CFPRIV_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFBundlePriv.h" "ac_cv_header_CoreFoundation_CFBundlePriv_h" "$ac_includes_default" +if test "x$ac_cv_header_CoreFoundation_CFBundlePriv_h" = xyes; then : + $as_echo "#define HAVE_CFBUNDLEPRIV_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "IOKit/pwr_mgt/IOPMLibPrivate.h" "ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h" "$ac_includes_default" +if test "x$ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h" = xyes; then : + $as_echo "#define HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H 1" >>confdefs.h + +fi + + + + for ac_func in SCDynamicStoreCopyComputerName +do : + ac_fn_c_check_func "$LINENO" "SCDynamicStoreCopyComputerName" "ac_cv_func_SCDynamicStoreCopyComputerName" +if test "x$ac_cv_func_SCDynamicStoreCopyComputerName" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1 +_ACEOF + +fi +done + + + ac_fn_c_check_header_mongrel "$LINENO" "membership.h" "ac_cv_header_membership_h" "$ac_includes_default" +if test "x$ac_cv_header_membership_h" = xyes; then : + $as_echo "#define HAVE_MEMBERSHIP_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "membershipPriv.h" "ac_cv_header_membershipPriv_h" "$ac_includes_default" +if test "x$ac_cv_header_membershipPriv_h" = xyes; then : + $as_echo "#define HAVE_MEMBERSHIPPRIV_H 1" >>confdefs.h + +fi + + + for ac_func in mbr_uid_to_uuid +do : + ac_fn_c_check_func "$LINENO" "mbr_uid_to_uuid" "ac_cv_func_mbr_uid_to_uuid" +if test "x$ac_cv_func_mbr_uid_to_uuid" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MBR_UID_TO_UUID 1 +_ACEOF + +fi +done + + + for ac_func in vproc_transaction_begin +do : + ac_fn_c_check_func "$LINENO" "vproc_transaction_begin" "ac_cv_func_vproc_transaction_begin" +if test "x$ac_cv_func_vproc_transaction_begin" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VPROC_TRANSACTION_BEGIN 1 +_ACEOF + +fi +done + + + ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + $as_echo "#define HAVE_DLFCN_H 1" >>confdefs.h + +fi + + + + ac_fn_c_check_header_mongrel "$LINENO" "notify.h" "ac_cv_header_notify_h" "$ac_includes_default" +if test "x$ac_cv_header_notify_h" = xyes; then : + $as_echo "#define HAVE_NOTIFY_H 1" >>confdefs.h + +fi + + + for ac_func in notify_post +do : + ac_fn_c_check_func "$LINENO" "notify_post" "ac_cv_func_notify_post" +if test "x$ac_cv_func_notify_post" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NOTIFY_POST 1 +_ACEOF + +fi +done + + + +# Check whether --with-adminkey was given. +if test "${with_adminkey+set}" = set; then : + withval=$with_adminkey; default_adminkey="$withval" +else + default_adminkey="default" +fi + + +# Check whether --with-operkey was given. +if test "${with_operkey+set}" = set; then : + withval=$with_operkey; default_operkey="$withval" +else + default_operkey="default" +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/Authorization.h" "ac_cv_header_Security_Authorization_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_Authorization_h" = xyes; then : + + $as_echo "#define HAVE_AUTHORIZATION_H 1" >>confdefs.h + + + if test "x$default_adminkey" != xdefault; then + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" + CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" + elif grep -q system.print.operator /etc/authorization; then + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" + else + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences" + fi + + if test "x$default_operkey" != xdefault; then + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" + elif grep -q system.print.operator /etc/authorization; then + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" + else + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin" + fi +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecBasePriv.h" "ac_cv_header_Security_SecBasePriv_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecBasePriv_h" = xyes; then : + $as_echo "#define HAVE_SECBASEPRIV_H 1" >>confdefs.h + +fi + + + + if test $uversion -ge 100; then + ac_fn_c_check_header_mongrel "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default" +if test "x$ac_cv_header_sandbox_h" = xyes; then : + $as_echo "#define HAVE_SANDBOX_H 1" >>confdefs.h + +fi + + + fi + if test $uversion -ge 110 -a $uversion -lt 120; then + # Broken public headers in 10.7.x... + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sandbox/private.h presence" >&5 +$as_echo_n "checking for sandbox/private.h presence... " >&6; } + if test -f /usr/local/include/sandbox/private.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS." "$LINENO" 5 + fi + fi + + ac_fn_c_check_header_mongrel "$LINENO" "xpc/xpc.h" "ac_cv_header_xpc_xpc_h" "$ac_includes_default" +if test "x$ac_cv_header_xpc_xpc_h" = xyes; then : + $as_echo "#define HAVE_XPC 1" >>confdefs.h + + INSTALLXPC="install-xpc" +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "xpc/private.h" "ac_cv_header_xpc_private_h" "$ac_includes_default" +if test "x$ac_cv_header_xpc_private_h" = xyes; then : + $as_echo "#define HAVE_XPC_PRIVATE_H 1" >>confdefs.h + +fi + + + ;; +esac + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_PRINTOPERATOR_AUTH "$CUPS_DEFAULT_PRINTOPERATOR_AUTH" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SYSTEM_AUTHKEY "$CUPS_DEFAULT_SYSTEM_AUTHKEY" +_ACEOF + + + + +COMPONENTS="all" + + +# Check whether --with-components was given. +if test "${with_components+set}" = set; then : + withval=$with_components; COMPONENTS="$withval" +fi + + +case "$COMPONENTS" in + all) + BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" + ;; + + core) + BUILDDIRS="data locale" + ;; + + *) + as_fn_error $? "Bad build component \"$COMPONENT\" specified!" "$LINENO" 5 + ;; +esac + + + + + + + +if test "$prefix" = "NONE"; then + prefix="/" +fi + +if test "$exec_prefix" = "NONE"; then + if test "$prefix" = "/"; then + exec_prefix="/usr" + else + exec_prefix="$prefix" + fi +fi + +if test "$bindir" = "\${exec_prefix}/bin"; then + bindir="$exec_prefix/bin" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_BINDIR "$bindir" +_ACEOF + + +if test "$sbindir" = "\${exec_prefix}/sbin"; then + sbindir="$exec_prefix/sbin" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_SBINDIR "$sbindir" +_ACEOF + + +if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then + sharedstatedir="/usr/com" +fi + +if test "$datarootdir" = "\${prefix}/share"; then + if test "$prefix" = "/"; then + datarootdir="/usr/share" + else + datarootdir="$prefix/share" + fi +fi + +if test "$datadir" = "\${prefix}/share"; then + if test "$prefix" = "/"; then + datadir="/usr/share" + else + datadir="$prefix/share" + fi +elif test "$datadir" = "\${datarootdir}"; then + datadir="$datarootdir" +fi + +if test "$includedir" = "\${prefix}/include" -a "$prefix" = "/"; then + includedir="/usr/include" +fi + +if test "$localstatedir" = "\${prefix}/var"; then + if test "$prefix" = "/"; then + if test "$uname" = Darwin; then + localstatedir="/private/var" + else + localstatedir="/var" + fi + else + localstatedir="$prefix/var" + fi +fi + +if test "$sysconfdir" = "\${prefix}/etc"; then + if test "$prefix" = "/"; then + if test "$uname" = Darwin; then + sysconfdir="/private/etc" + else + sysconfdir="/etc" + fi + else + sysconfdir="$prefix/etc" + fi +fi + +if test "$libdir" = "\${exec_prefix}/lib"; then + case "$uname" in + Linux*) + if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then + libdir="$exec_prefix/lib64" + fi + ;; + HP-UX*) + if test -d /usr/lib/hpux32; then + libdir="$exec_prefix/lib/hpux32" + fi + ;; + esac +fi + + +# Check whether --with-privateinclude was given. +if test "${with_privateinclude+set}" = set; then : + withval=$with_privateinclude; privateinclude="$withval" +else + privateinclude="" +fi + +if test "x$privateinclude" != x -a "x$privateinclude" != xnone; then + PRIVATEINCLUDE="$privateinclude/cups" +else + privateinclude="" + PRIVATEINCLUDE="" +fi + + + + +# Check whether --with-rcdir was given. +if test "${with_rcdir+set}" = set; then : + withval=$with_rcdir; rcdir="$withval" +else + rcdir="" +fi + + +# Check whether --with-rclevels was given. +if test "${with_rclevels+set}" = set; then : + withval=$with_rclevels; rclevels="$withval" +else + rclevels="2 3 5" +fi + + +# Check whether --with-rcstart was given. +if test "${with_rcstart+set}" = set; then : + withval=$with_rcstart; rcstart="$withval" +else + rcstart="99" +fi + + +# Check whether --with-rcstop was given. +if test "${with_rcstop+set}" = set; then : + withval=$with_rcstop; rcstop="$withval" +else + rcstop="00" +fi + + +# Check whether --with-smfmanifestdir was given. +if test "${with_smfmanifestdir+set}" = set; then : + withval=$with_smfmanifestdir; smfmanifestdir="$withval" +else + smfmanifestdir="" +fi + + +INITDIR="" +INITDDIR="" +RCLEVELS="$rclevels" +RCSTART="$rcstart" +RCSTOP="$rcstop" +SMFMANIFESTDIR="" + +if test x$rcdir = x; then + case "$uname" in + AIX*) + INITDIR="/etc/rc.d" + ;; + + Darwin*) + # Darwin and MacOS X... + if test -x /sbin/launchd; then + INITDDIR="/System/Library/LaunchDaemons" + else + INITDDIR="/System/Library/StartupItems/PrintingServices" + fi + ;; + + FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*) + # FreeBSD and OpenBSD + ;; + + HP-UX*) + INITDIR="/sbin" + RCLEVELS="2" + RCSTART="380" + RCSTOP="620" + ;; + + Linux | GNU | GNU/k*BSD*) + # Linux/HURD seems to choose an init.d directory at random... + if test -d /sbin/init.d; then + # SuSE + INITDIR="/sbin/init.d" + else + if test -d /etc/init.d; then + # Others + INITDIR="/etc" + else + # RedHat + INITDIR="/etc/rc.d" + fi + fi + RCSTART="81" + RCSTOP="36" + ;; + + NetBSD*) + # NetBSD + INITDDIR="/etc/rc.d" + ;; + + OSF1*) + INITDIR="/sbin" + ;; + + SunOS*) + # Solaris + if test "x$smfmanifestdir" != x; then + SMFMANIFESTDIR=$smfmanifestdir + else + INITDIR="/etc" + RCSTART="81" + fi + ;; + + *) + INITDIR="/etc" + ;; + + esac +elif test "x$rcdir" != xno; then + if test "x$rclevels" = x; then + INITDDIR="$rcdir" + else + INITDIR="$rcdir" + fi +fi + + + + + + + + + +# Check whether --with-xinetd was given. +if test "${with_xinetd+set}" = set; then : + withval=$with_xinetd; XINETD="$withval" +else + XINETD="" +fi + + +if test "x$XINETD" = x -a ! -x /sbin/launchd; then + for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do + if test -d $dir; then + XINETD="$dir" + break + fi + done +elif test "x$XINETD" = xno; then + XINETD="" +fi + + + + +# Check whether --with-lpdconfig was given. +if test "${with_lpdconfig+set}" = set; then : + withval=$with_lpdconfig; LPDCONFIG="$withval" +else + LPDCONFIG="" +fi + + +if test "x$LPDCONFIG" = x; then + if test -f /System/Library/LaunchDaemons/org.cups.cups-lpd.plist; then + LPDCONFIG="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist" + elif test "x$XINETD" != x; then + LPDCONFIG="xinetd://$XINETD/cups-lpd" + fi +fi + +if test "x$LPDCONFIG" = xoff; then + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_LPD_CONFIG "" +_ACEOF + +else + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_LPD_CONFIG "$LPDCONFIG" +_ACEOF + +fi + + +# Check whether --with-smbconfig was given. +if test "${with_smbconfig+set}" = set; then : + withval=$with_smbconfig; SMBCONFIG="$withval" +else + SMBCONFIG="" +fi + + +if test "x$SMBCONFIG" = x; then + if test -f /System/Library/LaunchDaemons/smbd.plist; then + SMBCONFIG="launchd:///System/Library/LaunchDaemons/smbd.plist" + else + for dir in /etc /etc/samba /usr/local/etc; do + if test -f $dir/smb.conf; then + SMBCONFIG="samba://$dir/smb.conf" + break + fi + done + fi +fi + +if test "x$SMBCONFIG" = xoff; then + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SMB_CONFIG "" +_ACEOF + +else + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SMB_CONFIG "$SMBCONFIG" +_ACEOF + +fi + +# Cache data... + +# Check whether --with-cachedir was given. +if test "${with_cachedir+set}" = set; then : + withval=$with_cachedir; cachedir="$withval" +else + cachedir="" +fi + + +if test x$cachedir = x; then + if test "x$uname" = xDarwin; then + CUPS_CACHEDIR="$localstatedir/spool/cups/cache" + else + CUPS_CACHEDIR="$localstatedir/cache/cups" + fi +else + CUPS_CACHEDIR="$cachedir" +fi +cat >>confdefs.h <<_ACEOF +#define CUPS_CACHEDIR "$CUPS_CACHEDIR" +_ACEOF + + + +# Data files +CUPS_DATADIR="$datadir/cups" +cat >>confdefs.h <<_ACEOF +#define CUPS_DATADIR "$datadir/cups" +_ACEOF + + + +# Icon directory + +# Check whether --with-icondir was given. +if test "${with_icondir+set}" = set; then : + withval=$with_icondir; icondir="$withval" +else + icondir="" +fi + + +if test "x$icondir" = x -a -d /usr/share/icons; then + ICONDIR="/usr/share/icons" +else + ICONDIR="$icondir" +fi + + + +# Menu directory + +# Check whether --with-menudir was given. +if test "${with_menudir+set}" = set; then : + withval=$with_menudir; menudir="$withval" +else + menudir="" +fi + + +if test "x$menudir" = x -a -d /usr/share/applications; then + MENUDIR="/usr/share/applications" +else + MENUDIR="$menudir" +fi + + + +# Documentation files + +# Check whether --with-docdir was given. +if test "${with_docdir+set}" = set; then : + withval=$with_docdir; docdir="$withval" +else + docdir="" +fi + + +if test x$docdir = x; then + CUPS_DOCROOT="$datadir/doc/cups" + docdir="$datadir/doc/cups" +else + CUPS_DOCROOT="$docdir" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_DOCROOT "$docdir" +_ACEOF + + + +# Fonts + +# Check whether --with-fontpath was given. +if test "${with_fontpath+set}" = set; then : + withval=$with_fontpath; fontpath="$withval" +else + fontpath="" +fi + + +if test "x$fontpath" = "x"; then + CUPS_FONTPATH="$datadir/cups/fonts" +else + CUPS_FONTPATH="$fontpath" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_FONTPATH "$CUPS_FONTPATH" +_ACEOF + + +# Locale data +if test "$localedir" = "\${datarootdir}/locale"; then + case "$uname" in + Linux | GNU | *BSD* | Darwin*) + CUPS_LOCALEDIR="$datarootdir/locale" + ;; + + OSF1* | AIX*) + CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg" + ;; + + *) + # This is the standard System V location... + CUPS_LOCALEDIR="$exec_prefix/lib/locale" + ;; + esac +else + CUPS_LOCALEDIR="$localedir" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_LOCALEDIR "$CUPS_LOCALEDIR" +_ACEOF + + + +# Log files... + +# Check whether --with-logdir was given. +if test "${with_logdir+set}" = set; then : + withval=$with_logdir; logdir="$withval" +else + logdir="" +fi + + +if test x$logdir = x; then + CUPS_LOGDIR="$localstatedir/log/cups" + cat >>confdefs.h <<_ACEOF +#define CUPS_LOGDIR "$localstatedir/log/cups" +_ACEOF + +else + CUPS_LOGDIR="$logdir" +fi +cat >>confdefs.h <<_ACEOF +#define CUPS_LOGDIR "$CUPS_LOGDIR" +_ACEOF + + + +# Longer-term spool data +CUPS_REQUESTS="$localstatedir/spool/cups" +cat >>confdefs.h <<_ACEOF +#define CUPS_REQUESTS "$localstatedir/spool/cups" +_ACEOF + + + +# Server executables... +case "$uname" in + *BSD* | Darwin*) + # *BSD and Darwin (MacOS X) + INSTALL_SYSV="" + CUPS_SERVERBIN="$exec_prefix/libexec/cups" + ;; + *) + # All others + INSTALL_SYSV="install-sysv" + CUPS_SERVERBIN="$exec_prefix/lib/cups" + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define CUPS_SERVERBIN "$CUPS_SERVERBIN" +_ACEOF + + + + +# Configuration files +CUPS_SERVERROOT="$sysconfdir/cups" +cat >>confdefs.h <<_ACEOF +#define CUPS_SERVERROOT "$sysconfdir/cups" +_ACEOF + + + +# Transient run-time state + +# Check whether --with-rundir was given. +if test "${with_rundir+set}" = set; then : + withval=$with_rundir; CUPS_STATEDIR="$withval" +else + + case "$uname" in + Darwin*) + # Darwin (OS X) + CUPS_STATEDIR="$CUPS_SERVERROOT" + ;; + *) + # All others + CUPS_STATEDIR="$localstatedir/run/cups" + ;; + esac +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_STATEDIR "$CUPS_STATEDIR" +_ACEOF + + + + + +if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then + # New GNU "standards" break previous ones, so make sure we use + # the right default location for the operating system... + mandir="\${prefix}/man" +fi + +if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then + case "$uname" in + Darwin* | Linux | GNU | *BSD* | AIX*) + # Darwin, MacOS X, Linux, GNU HURD, *BSD, and AIX + mandir="/usr/share/man" + AMANDIR="/usr/share/man" + PMANDIR="/usr/share/man" + ;; + *) + # All others + mandir="/usr/man" + AMANDIR="/usr/man" + PMANDIR="/usr/man" + ;; + esac +else + AMANDIR="$mandir" + PMANDIR="$mandir" +fi + + + + +case "$uname" in + SunOS* | HP-UX*) + # Solaris and HP-UX + MAN1EXT=1 + MAN5EXT=5 + MAN7EXT=7 + MAN8EXT=1m + MAN8DIR=1m + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and OS X + MAN1EXT=1.gz + MAN5EXT=5.gz + MAN7EXT=7.gz + MAN8EXT=8.gz + MAN8DIR=8 + ;; + *) + # All others + MAN1EXT=1 + MAN5EXT=5 + MAN7EXT=7 + MAN8EXT=8 + MAN8DIR=8 + ;; +esac + + + + + + + + + + +PICFLAG=1 +DSOFLAGS="${DSOFLAGS:=}" + +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; +fi + + +cupsbase="cups" +LIBCUPSBASE="lib$cupsbase" +LIBCUPSSTATIC="lib$cupsbase.a" + +if test x$enable_shared != xno; then + case "$uname" in + SunOS*) + LIBCUPS="lib$cupsbase.so.2" + LIBCUPSCGI="libcupscgi.so.1" + LIBCUPSIMAGE="libcupsimage.so.2" + LIBCUPSMIME="libcupsmime.so.1" + LIBCUPSPPDC="libcupsppdc.so.1" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)" + ;; + UNIX_S*) + LIBCUPS="lib$cupsbase.so.2" + LIBCUPSCGI="libcupscgi.so.1" + LIBCUPSIMAGE="libcupsimage.so.2" + LIBCUPSMIME="libcupsmime.so.1" + LIBCUPSPPDC="libcupsppdc.so.1" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)" + ;; + HP-UX*) + case "$uarch" in + ia64) + LIBCUPS="lib$cupsbase.so.2" + LIBCUPSCGI="libcupscgi.so.1" + LIBCUPSIMAGE="libcupsimage.so.2" + LIBCUPSMIME="libcupsmime.so.1" + LIBCUPSPPDC="libcupsppdc.so.1" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`" + ;; + *) + LIBCUPS="lib$cupsbase.sl.2" + LIBCUPSCGI="libcupscgi.sl.1" + LIBCUPSIMAGE="libcupsimage.sl.2" + LIBCUPSMIME="libcupsmime.sl.1" + LIBCUPSPPDC="libcupsppdc.sl.1" + DSO="\$(LD)" + DSOXX="\$(LD)" + DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`" + ;; + esac + ;; + IRIX) + LIBCUPS="lib$cupsbase.so.2" + LIBCUPSCGI="libcupscgi.so.1" + LIBCUPSIMAGE="libcupsimage.so.2" + LIBCUPSMIME="libcupsmime.so.1" + LIBCUPSPPDC="libcupsppdc.so.1" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)" + ;; + OSF1* | Linux | GNU | *BSD*) + LIBCUPS="lib$cupsbase.so.2" + LIBCUPSCGI="libcupscgi.so.1" + LIBCUPSIMAGE="libcupsimage.so.2" + LIBCUPSMIME="libcupsmime.so.1" + LIBCUPSPPDC="libcupsppdc.so.1" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" + ;; + Darwin*) + LIBCUPS="lib$cupsbase.2.dylib" + LIBCUPSCGI="libcupscgi.1.dylib" + LIBCUPSIMAGE="libcupsimage.2.dylib" + LIBCUPSMIME="libcupsmime.1.dylib" + LIBCUPSPPDC="libcupsppdc.1.dylib" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc" + ;; + AIX*) + LIBCUPS="lib${cupsbase}_s.a" + LIBCUPSBASE="${cupsbase}_s" + LIBCUPSCGI="libcupscgi_s.a" + LIBCUPSIMAGE="libcupsimage_s.a" + LIBCUPSMIME="libcupsmime_s.a" + LIBCUPSPPDC="libcupsppdc_s.a" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)" + ;; + *) + echo "Warning: shared libraries may not be supported. Trying -shared" + echo " option with compiler." + LIBCUPS="lib$cupsbase.so.2" + LIBCUPSCGI="libcupscgi.so.1" + LIBCUPSIMAGE="libcupsimage.so.2" + LIBCUPSMIME="libcupsmime.so.1" + LIBCUPSPPDC="libcupsppdc.so.1" + DSO="\$(CC)" + DSOXX="\$(CXX)" + DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" + ;; + esac +else + PICFLAG=0 + LIBCUPS="lib$cupsbase.a" + LIBCUPSCGI="libcupscgi.a" + LIBCUPSIMAGE="libcupsimage.a" + LIBCUPSMIME="libcupsmime.a" + LIBCUPSPPDC="libcupsppdc.a" + DSO=":" + DSOXX=":" +fi + + + + + + + + + + + + +if test x$enable_shared = xno; then + LINKCUPS="../cups/lib$cupsbase.a" + LINKCUPSIMAGE="../filter/libcupsimage.a" + + EXTLINKCUPS="-lcups" + EXTLINKCUPSIMAGE="-lcupsimage" +else + if test $uname = AIX; then + LINKCUPS="-l${cupsbase}_s" + LINKCUPSIMAGE="-lcupsimage_s" + + EXTLINKCUPS="-lcups_s" + EXTLINKCUPSIMAGE="-lcupsimage_s" + else + LINKCUPS="-l${cupsbase}" + LINKCUPSIMAGE="-lcupsimage" + + EXTLINKCUPS="-lcups" + EXTLINKCUPSIMAGE="-lcupsimage" + fi +fi + + + + + + +EXPORT_LDFLAGS="" + +if test "$DSO" != ":"; then + # When using DSOs the image libraries are linked to libcupsimage.so + # rather than to the executables. This makes things smaller if you + # are using any static libraries, and it also allows us to distribute + # a single DSO rather than a bunch... + DSOLIBS="\$(LIBZ)" + IMGLIBS="" + + # Tell the run-time linkers where to find a DSO. Some platforms + # need this option, even when the library is installed in a + # standard location... + case $uname in + HP-UX*) + # HP-UX needs the path, even for /usr/lib... + case "$uarch" in + ia64) + DSOFLAGS="-Wl,+s,+b,$libdir $DSOFLAGS" + ;; + *) + DSOFLAGS="+s +b $libdir $DSOFLAGS" + ;; + esac + LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir" + EXPORT_LDFLAGS="-Wl,+s,+b,$libdir" + ;; + SunOS*) + # Solaris... + if test $exec_prefix != /usr; then + DSOFLAGS="-R$libdir $DSOFLAGS" + LDFLAGS="$LDFLAGS -R$libdir" + EXPORT_LDFLAGS="-R$libdir" + fi + ;; + *BSD*) + # *BSD... + if test $exec_prefix != /usr; then + DSOFLAGS="-Wl,-R$libdir $DSOFLAGS" + LDFLAGS="$LDFLAGS -Wl,-R$libdir" + EXPORT_LDFLAGS="-Wl,-R$libdir" + fi + ;; + Linux | GNU) + # Linux, and HURD... + if test $exec_prefix != /usr; then + DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS" + LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir" + EXPORT_LDFLAGS="-Wl,-rpath,$libdir" + fi + ;; + esac +else + DSOLIBS="" + IMGLIBS="\$(LIBZ)" +fi + + + + + + + +# Check whether --enable-libtool_unsupported was given. +if test "${enable_libtool_unsupported+set}" = set; then : + enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then + LIBTOOL="$enable_libtool_unsupported" + enable_shared=no + echo "WARNING: libtool is not supported or endorsed by Apple Inc." + echo " WE DO NOT PROVIDE SUPPORT FOR LIBTOOL PROBLEMS." + else + LIBTOOL="" + fi +fi + + + + +if test x$LIBTOOL != x; then + LIBCUPS="libcups.la" + LIBCUPSIMAGE="libcupsimage.la" + LINKCUPS="../cups/\$(LIBCUPS)" + LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)" + DSO="\$(CC)" +fi + + + +INSTALL_STRIP="" +OPTIM="" + + + + +# Check whether --with-optim was given. +if test "${with_optim+set}" = set; then : + withval=$with_optim; +fi + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +fi + +# Check whether --enable-debug_guards was given. +if test "${enable_debug_guards+set}" = set; then : + enableval=$enable_debug_guards; +fi + +# Check whether --enable-debug_printfs was given. +if test "${enable_debug_printfs+set}" = set; then : + enableval=$enable_debug_printfs; +fi + +# Check whether --enable-unit_tests was given. +if test "${enable_unit_tests+set}" = set; then : + enableval=$enable_unit_tests; +fi + + +if test x$enable_debug = xyes; then + OPTIM="-g" +else + INSTALL_STRIP="-s" +fi + +if test x$enable_debug_printfs = xyes; then + CFLAGS="$CFLAGS -DDEBUG" + CXXFLAGS="$CXXFLAGS -DDEBUG" +fi + +if test x$enable_debug_guards = xyes; then + CFLAGS="$CFLAGS -DDEBUG_GUARDS" + CXXFLAGS="$CXXFLAGS -DDEBUG_GUARDS" +fi + +if test x$enable_unit_tests = xyes; then + UNITTESTS="unittests" +else + UNITTESTS="" +fi + + + +# Check whether --with-archflags was given. +if test "${with_archflags+set}" = set; then : + withval=$with_archflags; +fi + + +# Check whether --with-ldarchflags was given. +if test "${with_ldarchflags+set}" = set; then : + withval=$with_ldarchflags; +fi + + +if test -z "$with_archflags"; then + ARCHFLAGS="" +else + ARCHFLAGS="$with_archflags" +fi + +if test -z "$with_ldarchflags"; then + if test "$uname" = Darwin; then + # Only create Intel programs by default + LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch ppc64//'`" + else + LDARCHFLAGS="$ARCHFLAGS" + fi +else + LDARCHFLAGS="$with_ldarchflags" +fi + + + + +# Check whether --enable-relro was given. +if test "${enable_relro+set}" = set; then : + enableval=$enable_relro; +fi + + +CXXLIBS="${CXXLIBS:=}" + + +PIEFLAGS="" + + +RELROFLAGS="" + + +if test -n "$GCC"; then + # Add GCC-specific compiler options... + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + # Default to optimize-for-size and debug + OPTIM="-Os -g" + else + OPTIM="$with_optim $OPTIM" + fi + fi + + # Generate position-independent code as needed... + if test $PICFLAG = 1 -a $uname != AIX; then + OPTIM="-fPIC $OPTIM" + fi + + # The -fstack-protector option is available with some versions of + # GCC and adds "stack canaries" which detect when the return address + # has been overwritten, preventing many types of exploit attacks. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -fstack-protector" >&5 +$as_echo_n "checking if GCC supports -fstack-protector... " >&6; } + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test "x$LSB_BUILD" = xy; then + # Can't use stack-protector with LSB binaries... + OPTIM="$OPTIM -fno-stack-protector" + else + OPTIM="$OPTIM -fstack-protector" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$OLDCFLAGS" + + if test "x$LSB_BUILD" != xy; then + # The -fPIE option is available with some versions of GCC and + # adds randomization of addresses, which avoids another class of + # exploits that depend on a fixed address for common functions. + # + # Not available to LSB binaries... + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -fPIE" >&5 +$as_echo_n "checking if GCC supports -fPIE... " >&6; } + OLDCFLAGS="$CFLAGS" + case "$uname" in + Darwin*) + CFLAGS="$CFLAGS -fPIE -Wl,-pie" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + PIEFLAGS="-fPIE -Wl,-pie" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + *) + CFLAGS="$CFLAGS -fPIE -pie" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + PIEFLAGS="-fPIE -pie" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + esac + CFLAGS="$OLDCFLAGS" + fi + + if test "x$with_optim" = x; then + # Add useful warning options for tracking down problems... + OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM" + + # Additional warning options for development testing... + if test -d .svn; then + OPTIM="-Wshadow -Werror $OPTIM" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -Wno-tautological-compare" >&5 +$as_echo_n "checking if GCC supports -Wno-tautological-compare... " >&6; } + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wno-tautological-compare" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + OPTIM="$OPTIM -Wno-tautological-compare" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$OLDCFLAGS" + fi + fi + + case "$uname" in + Darwin*) + # -D_FORTIFY_SOURCE=2 adds additional object size + # checking, basically wrapping all string functions + # with buffer-limited ones. Not strictly needed for + # CUPS since we already use buffer-limited calls, but + # this will catch any additions that are broken. + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + ;; + + Linux*) + # The -z relro option is provided by the Linux linker command to + # make relocatable data read-only. + if test x$enable_relro = xyes; then + RELROFLAGS="-Wl,-z,relro" + fi + ;; + esac +else + # Add vendor-specific compiler options... + case $uname in + AIX*) + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + OPTIM="-O2 -qmaxmem=6000" + else + OPTIM="$with_optim $OPTIM" + fi + fi + ;; + HP-UX*) + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + OPTIM="+O2" + else + OPTIM="$with_optim $OPTIM" + fi + fi + + CFLAGS="-Ae $CFLAGS" + + if test $PICFLAG = 1; then + OPTIM="+z $OPTIM" + fi + ;; + OSF*) + # Tru64 UNIX aka Digital UNIX aka OSF/1 + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + OPTIM="-O" + else + OPTIM="$with_optim" + fi + fi + ;; + SunOS*) + # Solaris + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + OPTIM="-xO2" + else + OPTIM="$with_optim $OPTIM" + fi + fi + + if test $PICFLAG = 1; then + OPTIM="-KPIC $OPTIM" + fi + ;; + UNIX_SVR*) + # UnixWare + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + OPTIM="-O" + else + OPTIM="$with_optim $OPTIM" + fi + fi + + if test $PICFLAG = 1; then + OPTIM="-KPIC $OPTIM" + fi + ;; + *) + # Running some other operating system; inform the user they + # should contribute the necessary options to + # cups-support@cups.org... + echo "Building CUPS with default compiler optimizations; contact" + echo "cups-bugs@cups.org with uname and compiler options needed" + echo "for your platform, or set the CFLAGS and LDFLAGS environment" + echo "variables before running configure." + ;; + esac +fi + +# Add general compiler options per platform... +case $uname in + HP-UX*) + # HP-UX 10.20 (at least) needs this definition to get the + # h_errno global... + OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED" + + # HP-UX 11.00 (at least) needs this definition to get the + # u_short type used by the IP headers... + OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE" + + # HP-UX 11.23 (at least) needs this definition to get the + # IPv6 header to work... + OPTIM="$OPTIM -D_HPUX_SOURCE" + ;; + + Linux*) + # glibc 2.8 and higher breaks peer credentials unless you + # define _GNU_SOURCE... + OPTIM="$OPTIM -D_GNU_SOURCE" + ;; + + OSF*) + # Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told + # to be POSIX-compliant... + OPTIM="$OPTIM -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_OSF_SOURCE" + ;; +esac + + + + +ac_fn_c_check_header_mongrel "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "$ac_includes_default" +if test "x$ac_cv_header_resolv_h" = xyes; then : + $as_echo "#define HAVE_RESOLV_H 1" >>confdefs.h + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +$as_echo_n "checking for library containing socket... " >&6; } +if ${ac_cv_search_socket+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char socket (); +int +main () +{ +return socket (); + ; + return 0; +} +_ACEOF +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_socket=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_socket+:} false; then : + break +fi +done +if ${ac_cv_search_socket+:} false; then : + +else + ac_cv_search_socket=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +$as_echo "$ac_cv_search_socket" >&6; } +ac_res=$ac_cv_search_socket +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyaddr" >&5 +$as_echo_n "checking for library containing gethostbyaddr... " >&6; } +if ${ac_cv_search_gethostbyaddr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyaddr (); +int +main () +{ +return gethostbyaddr (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_gethostbyaddr=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_gethostbyaddr+:} false; then : + break +fi +done +if ${ac_cv_search_gethostbyaddr+:} false; then : + +else + ac_cv_search_gethostbyaddr=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyaddr" >&5 +$as_echo "$ac_cv_search_gethostbyaddr" >&6; } +ac_res=$ac_cv_search_gethostbyaddr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getifaddrs" >&5 +$as_echo_n "checking for library containing getifaddrs... " >&6; } +if ${ac_cv_search_getifaddrs+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getifaddrs (); +int +main () +{ +return getifaddrs (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_getifaddrs=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_getifaddrs+:} false; then : + break +fi +done +if ${ac_cv_search_getifaddrs+:} false; then : + +else + ac_cv_search_getifaddrs=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getifaddrs" >&5 +$as_echo "$ac_cv_search_getifaddrs" >&6; } +ac_res=$ac_cv_search_getifaddrs +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing hstrerror" >&5 +$as_echo_n "checking for library containing hstrerror... " >&6; } +if ${ac_cv_search_hstrerror+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char hstrerror (); +int +main () +{ +return hstrerror (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl socket resolv; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_hstrerror=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_hstrerror+:} false; then : + break +fi +done +if ${ac_cv_search_hstrerror+:} false; then : + +else + ac_cv_search_hstrerror=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_hstrerror" >&5 +$as_echo "$ac_cv_search_hstrerror" >&6; } +ac_res=$ac_cv_search_hstrerror +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_HSTRERROR 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing rresvport_af" >&5 +$as_echo_n "checking for library containing rresvport_af... " >&6; } +if ${ac_cv_search_rresvport_af+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rresvport_af (); +int +main () +{ +return rresvport_af (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_rresvport_af=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_rresvport_af+:} false; then : + break +fi +done +if ${ac_cv_search_rresvport_af+:} false; then : + +else + ac_cv_search_rresvport_af=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_rresvport_af" >&5 +$as_echo "$ac_cv_search_rresvport_af" >&6; } +ac_res=$ac_cv_search_rresvport_af +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_RRESVPORT_AF 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_init" >&5 +$as_echo_n "checking for library containing __res_init... " >&6; } +if ${ac_cv_search___res_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_init (); +int +main () +{ +return __res_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv bind; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search___res_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search___res_init+:} false; then : + break +fi +done +if ${ac_cv_search___res_init+:} false; then : + +else + ac_cv_search___res_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_init" >&5 +$as_echo "$ac_cv_search___res_init" >&6; } +ac_res=$ac_cv_search___res_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_RES_INIT 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_init" >&5 +$as_echo_n "checking for library containing res_9_init... " >&6; } +if ${ac_cv_search_res_9_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_9_init (); +int +main () +{ +return res_9_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv bind; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_res_9_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_res_9_init+:} false; then : + break +fi +done +if ${ac_cv_search_res_9_init+:} false; then : + +else + ac_cv_search_res_9_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_init" >&5 +$as_echo "$ac_cv_search_res_9_init" >&6; } +ac_res=$ac_cv_search_res_9_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_RES_INIT 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_init" >&5 +$as_echo_n "checking for library containing res_init... " >&6; } +if ${ac_cv_search_res_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_init (); +int +main () +{ +return res_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv bind; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_res_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_res_init+:} false; then : + break +fi +done +if ${ac_cv_search_res_init+:} false; then : + +else + ac_cv_search_res_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_init" >&5 +$as_echo "$ac_cv_search_res_init" >&6; } +ac_res=$ac_cv_search_res_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_RES_INIT 1" >>confdefs.h + +fi + +fi + +fi + + +# Tru64 5.1b leaks file descriptors with these functions; disable until +# we can come up with a test for this... +if test "$uname" != "OSF1"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 +$as_echo_n "checking for library containing getaddrinfo... " >&6; } +if ${ac_cv_search_getaddrinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getaddrinfo (); +int +main () +{ +return getaddrinfo (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_getaddrinfo=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_getaddrinfo+:} false; then : + break +fi +done +if ${ac_cv_search_getaddrinfo+:} false; then : + +else + ac_cv_search_getaddrinfo=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5 +$as_echo "$ac_cv_search_getaddrinfo" >&6; } +ac_res=$ac_cv_search_getaddrinfo +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5 +$as_echo_n "checking for library containing getnameinfo... " >&6; } +if ${ac_cv_search_getnameinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getnameinfo (); +int +main () +{ +return getnameinfo (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_getnameinfo=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_getnameinfo+:} false; then : + break +fi +done +if ${ac_cv_search_getnameinfo+:} false; then : + +else + ac_cv_search_getnameinfo=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5 +$as_echo "$ac_cv_search_getnameinfo" >&6; } +ac_res=$ac_cv_search_getnameinfo +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + $as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h + +fi + +fi + +ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include +" +if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : + +fi + +ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sockio_h" = xyes; then : + $as_echo "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h + +fi + + + +CUPS_DEFAULT_DOMAINSOCKET="" + + +# Check whether --with-domainsocket was given. +if test "${with_domainsocket+set}" = set; then : + withval=$with_domainsocket; default_domainsocket="$withval" +else + default_domainsocket="" +fi + + +if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then + if test "x$default_domainsocket" = x; then + case "$uname" in + Darwin*) + # Darwin and MaxOS X do their own thing... + CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" + ;; + *) + # All others use FHS standard... + CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock" + ;; + esac + else + CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket" + fi + + CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET" + + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_DOMAINSOCKET "$CUPS_DEFAULT_DOMAINSOCKET" +_ACEOF + +else + CUPS_LISTEN_DOMAINSOCKET="" +fi + + + + +for ac_header in AppleTalk/at_proto.h +do : + ac_fn_c_check_header_compile "$LINENO" "AppleTalk/at_proto.h" "ac_cv_header_AppleTalk_at_proto_h" "#include +" +if test "x$ac_cv_header_AppleTalk_at_proto_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_APPLETALK_AT_PROTO_H 1 +_ACEOF + $as_echo "#define HAVE_APPLETALK_AT_PROTO_H 1" >>confdefs.h + +fi + +done + + + + +ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" +if test "x$ac_cv_func_poll" = xyes; then : + $as_echo "#define HAVE_POLL 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create" +if test "x$ac_cv_func_epoll_create" = xyes; then : + $as_echo "#define HAVE_EPOLL 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "kqueue" "ac_cv_func_kqueue" +if test "x$ac_cv_func_kqueue" = xyes; then : + $as_echo "#define HAVE_KQUEUE 1" >>confdefs.h + +fi + + + + +# Check whether --enable-gssapi was given. +if test "${enable_gssapi+set}" = set; then : + enableval=$enable_gssapi; +fi + + +LIBGSSAPI="" + + +if test x$enable_gssapi != xno; then + # Extract the first word of "krb5-config", so it can be a program name with args. +set dummy krb5-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_KRB5CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $KRB5CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_KRB5CONFIG="$KRB5CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +KRB5CONFIG=$ac_cv_path_KRB5CONFIG +if test -n "$KRB5CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5CONFIG" >&5 +$as_echo "$KRB5CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$KRB5CONFIG" != x; then + case "$uname" in + Darwin) + # OS X weak-links to the Kerberos framework... + LIBGSSAPI="-weak_framework Kerberos" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS framework" >&5 +$as_echo_n "checking for GSS framework... " >&6; } + if test -d /System/Library/Frameworks/GSS.framework; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LIBGSSAPI="$LIBGSSAPI -weak_framework GSS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + SunOS*) + # Solaris has a non-standard krb5-config, don't use it! + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgss" >&5 +$as_echo_n "checking for gss_display_status in -lgss... " >&6; } +if ${ac_cv_lib_gss_gss_display_status+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgss $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gss_display_status (); +int +main () +{ +return gss_display_status (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gss_gss_display_status=yes +else + ac_cv_lib_gss_gss_display_status=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_display_status" >&5 +$as_echo "$ac_cv_lib_gss_gss_display_status" >&6; } +if test "x$ac_cv_lib_gss_gss_display_status" = xyes; then : + +$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h + + CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" + LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" +fi + + ;; + *) + # Other platforms just ask for GSSAPI + CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" + LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" + ;; + esac + +$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h + + else + # Check for vendor-specific implementations... + case "$uname" in + HP-UX*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgss" >&5 +$as_echo_n "checking for gss_display_status in -lgss... " >&6; } +if ${ac_cv_lib_gss_gss_display_status+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgss $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gss_display_status (); +int +main () +{ +return gss_display_status (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gss_gss_display_status=yes +else + ac_cv_lib_gss_gss_display_status=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_display_status" >&5 +$as_echo "$ac_cv_lib_gss_gss_display_status" >&6; } +if test "x$ac_cv_lib_gss_gss_display_status" = xyes; then : + +$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h + + LIBGSSAPI="-lgss -lgssapi_krb5" +fi + + ;; + SunOS*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgss" >&5 +$as_echo_n "checking for gss_display_status in -lgss... " >&6; } +if ${ac_cv_lib_gss_gss_display_status+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgss $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gss_display_status (); +int +main () +{ +return gss_display_status (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gss_gss_display_status=yes +else + ac_cv_lib_gss_gss_display_status=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_display_status" >&5 +$as_echo "$ac_cv_lib_gss_gss_display_status" >&6; } +if test "x$ac_cv_lib_gss_gss_display_status" = xyes; then : + +$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h + + LIBGSSAPI="-lgss" +fi + + ;; + esac + fi + + if test "x$LIBGSSAPI" != x; then + ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_krb5_h" = xyes; then : + $as_echo "#define HAVE_KRB5_H 1" >>confdefs.h + +fi + + + if test -d /System/Library/Frameworks/GSS.framework; then + gssdir="/System/Library/Frameworks/GSS.framework" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS/gssapi.h presence" >&5 +$as_echo_n "checking for GSS/gssapi.h presence... " >&6; } + if test -f $gssdir/Headers/gssapi.h; then + $as_echo "#define HAVE_GSS_GSSAPI_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS/gssapi_generic.h presence" >&5 +$as_echo_n "checking for GSS/gssapi_generic.h presence... " >&6; } + if test -f $gssdir/Headers/gssapi_generic.h; then + $as_echo "#define HAVE_GSSAPI_GENERIC_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS/gssapi_spi.h presence" >&5 +$as_echo_n "checking for GSS/gssapi_spi.h presence... " >&6; } + if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS/gssapi_spi.h usability" >&5 +$as_echo_n "checking for GSS/gssapi_spi.h usability... " >&6; } + if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_GSS_GSSAPI_SPI_H 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test $uversion -ge 110 -a $uversion -lt 120; then + # Broken public headers in 10.7.x... + as_fn_error $? "Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS." "$LINENO" 5 + fi + fi + else + ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_h" = xyes; then : + $as_echo "#define HAVE_GSSAPI_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_gssapi_h" = xyes; then : + $as_echo "#define HAVE_GSSAPI_GSSAPI_H 1" >>confdefs.h + +fi + + + fi + + SAVELIBS="$LIBS" + LIBS="$LIBS $LIBGSSAPI" + + ac_fn_c_check_func "$LINENO" "__ApplePrivate_gss_acquire_cred_ex_f" "ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f" +if test "x$ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f" = xyes; then : + $as_echo "#define HAVE_GSS_ACQUIRE_CRED_EX_F 1" >>confdefs.h + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS_C_NT_HOSTBASED_SERVICE" >&5 +$as_echo_n "checking for GSS_C_NT_HOSTBASED_SERVICE... " >&6; } + if test x$ac_cv_header_gssapi_gssapi_h = xyes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ + gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + elif test x$ac_cv_header_gss_gssapi_h = xyes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ + gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ + gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + LIBS="$SAVELIBS" + fi +fi + + +# Check whether --with-gssservicename was given. +if test "${with_gssservicename+set}" = set; then : + withval=$with_gssservicename; default_gssservicename="$withval" +else + default_gssservicename="default" +fi + + +if test x$default_gssservicename != xno; then + if test "x$default_gssservicename" = "xdefault"; then + CUPS_DEFAULT_GSSSERVICENAME="host" + else + CUPS_DEFAULT_GSSSERVICENAME="$default_gssservicename" + fi +else + CUPS_DEFAULT_GSSSERVICENAME="" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_GSSSERVICENAME "$CUPS_DEFAULT_GSSSERVICENAME" +_ACEOF + + + + +# Check whether --enable-threads was given. +if test "${enable_threads+set}" = set; then : + enableval=$enable_threads; +fi + + +have_pthread=no +PTHREAD_FLAGS="" + +if test "x$enable_threads" != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : + $as_echo "#define HAVE_PTHREAD_H 1" >>confdefs.h + +fi + + + + if test x$ac_cv_header_pthread_h = xyes; then + for flag in -lpthreads -lpthread -pthread; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create using $flag" >&5 +$as_echo_n "checking for pthread_create using $flag... " >&6; } + SAVELIBS="$LIBS" + LIBS="$flag $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +pthread_create(0, 0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_pthread=yes +else + LIBS="$SAVELIBS" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread" >&5 +$as_echo "$have_pthread" >&6; } + + if test $have_pthread = yes; then + PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT" + + # Solaris requires -D_POSIX_PTHREAD_SEMANTICS to + # be POSIX-compliant... :( + if test $uname = SunOS; then + PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS" + fi + break + fi + done + fi +fi + + + + + +# Check whether --enable-ssl was given. +if test "${enable_ssl+set}" = set; then : + enableval=$enable_ssl; +fi + +# Check whether --enable-cdsassl was given. +if test "${enable_cdsassl+set}" = set; then : + enableval=$enable_cdsassl; +fi + +# Check whether --enable-gnutls was given. +if test "${enable_gnutls+set}" = set; then : + enableval=$enable_gnutls; +fi + +# Check whether --enable-openssl was given. +if test "${enable_openssl+set}" = set; then : + enableval=$enable_openssl; +fi + + +# Check whether --with-openssl-libs was given. +if test "${with_openssl_libs+set}" = set; then : + withval=$with_openssl_libs; LDFLAGS="-L$withval $LDFLAGS" + DSOFLAGS="-L$withval $DSOFLAGS" +fi + + +# Check whether --with-openssl-includes was given. +if test "${with_openssl_includes+set}" = set; then : + withval=$with_openssl_includes; CFLAGS="-I$withval $CFLAGS" + CPPFLAGS="-I$withval $CPPFLAGS" +fi + + +SSLFLAGS="" +SSLLIBS="" +have_ssl=0 +CUPS_SERVERCERT="" +CUPS_SERVERKEY="" + +if test x$enable_ssl != xno; then + if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then + if test $uname = Darwin; then + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecureTransport.h" "ac_cv_header_Security_SecureTransport_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecureTransport_h" = xyes; then : + + have_ssl=1 + $as_echo "#define HAVE_SSL 1" >>confdefs.h + + $as_echo "#define HAVE_CDSASSL 1" >>confdefs.h + + CUPS_SERVERCERT="/Library/Keychains/System.keychain" + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecureTransportPriv.h" "ac_cv_header_Security_SecureTransportPriv_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecureTransportPriv_h" = xyes; then : + $as_echo "#define HAVE_SECURETRANSPORTPRIV_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecCertificate.h" "ac_cv_header_Security_SecCertificate_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecCertificate_h" = xyes; then : + $as_echo "#define HAVE_SECCERTIFICATE_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecItem.h" "ac_cv_header_Security_SecItem_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecItem_h" = xyes; then : + $as_echo "#define HAVE_SECITEM_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_compile "$LINENO" "Security/SecItemPriv.h" "ac_cv_header_Security_SecItemPriv_h" "#include +" +if test "x$ac_cv_header_Security_SecItemPriv_h" = xyes; then : + $as_echo "#define HAVE_SECITEMPRIV_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecPolicy.h" "ac_cv_header_Security_SecPolicy_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecPolicy_h" = xyes; then : + $as_echo "#define HAVE_SECPOLICY_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecPolicyPriv.h" "ac_cv_header_Security_SecPolicyPriv_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecPolicyPriv_h" = xyes; then : + $as_echo "#define HAVE_SECPOLICYPRIV_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecBasePriv.h" "ac_cv_header_Security_SecBasePriv_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecBasePriv_h" = xyes; then : + $as_echo "#define HAVE_SECBASEPRIV_H 1" >>confdefs.h + +fi + + + ac_fn_c_check_header_mongrel "$LINENO" "Security/SecIdentitySearchPriv.h" "ac_cv_header_Security_SecIdentitySearchPriv_h" "$ac_includes_default" +if test "x$ac_cv_header_Security_SecIdentitySearchPriv_h" = xyes; then : + $as_echo "#define HAVE_SECIDENTITYSEARCHPRIV_H 1" >>confdefs.h + +fi + + + + $as_echo "#define HAVE_CSSMERRORSTRING 1" >>confdefs.h + +fi + + + fi + fi + + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + # Extract the first word of "libgnutls-config", so it can be a program name with args. +set dummy libgnutls-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LIBGNUTLSCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LIBGNUTLSCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_LIBGNUTLSCONFIG="$LIBGNUTLSCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +LIBGNUTLSCONFIG=$ac_cv_path_LIBGNUTLSCONFIG +if test -n "$LIBGNUTLSCONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLSCONFIG" >&5 +$as_echo "$LIBGNUTLSCONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "libgcrypt-config", so it can be a program name with args. +set dummy libgcrypt-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LIBGCRYPTCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LIBGCRYPTCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_LIBGCRYPTCONFIG="$LIBGCRYPTCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +LIBGCRYPTCONFIG=$ac_cv_path_LIBGCRYPTCONFIG +if test -n "$LIBGCRYPTCONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPTCONFIG" >&5 +$as_echo "$LIBGCRYPTCONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` + SSLFLAGS=`$PKGCONFIG --cflags gnutls` + $as_echo "#define HAVE_SSL 1" >>confdefs.h + + $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h + + elif test "x$LIBGNUTLSCONFIG" != x; then + have_ssl=1 + SSLLIBS=`$LIBGNUTLSCONFIG --libs` + SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` + $as_echo "#define HAVE_SSL 1" >>confdefs.h + + $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h + + fi + + if test $have_ssl = 1; then + CUPS_SERVERCERT="ssl/server.crt" + CUPS_SERVERKEY="ssl/server.key" + + if $PKGCONFIG --exists gcrypt; then + SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" + SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" + elif test "x$LIBGCRYPTCONFIG" != x; then + SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" + SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" + fi + fi + fi + + if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then + ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_ssl_h" = xyes; then : + + SAVELIBS="$LIBS" + + + for libcrypto in \ + "-lcrypto" \ + "-lcrypto -lrsaref" \ + "-lcrypto -lRSAglue -lrsaref" + do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5 +$as_echo_n "checking for SSL_new in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_new+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $libcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_new (); +int +main () +{ +return SSL_new (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_new=yes +else + ac_cv_lib_ssl_SSL_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; } +if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then : + have_ssl=1 + SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT" + SSLLIBS="-lssl $libcrypto" + $as_echo "#define HAVE_SSL 1" >>confdefs.h + + $as_echo "#define HAVE_LIBSSL 1" >>confdefs.h + +fi + + + if test "x${SSLLIBS}" != "x"; then + break + fi + done + + if test "x${SSLLIBS}" != "x"; then + CUPS_SERVERCERT="ssl/server.crt" + CUPS_SERVERKEY="ssl/server.key" + + LIBS="$SAVELIBS $SSLLIBS" + for ac_func in SSL_set_tlsext_host_name +do : + ac_fn_c_check_func "$LINENO" "SSL_set_tlsext_host_name" "ac_cv_func_SSL_set_tlsext_host_name" +if test "x$ac_cv_func_SSL_set_tlsext_host_name" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1 +_ACEOF + +fi +done + + fi + + LIBS="$SAVELIBS" +fi + + + fi +fi + +IPPALIASES="http" +if test $have_ssl = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSLLIBS=\"$SSLLIBS\"" >&5 +$as_echo " Using SSLLIBS=\"$SSLLIBS\"" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSLFLAGS=\"$SSLFLAGS\"" >&5 +$as_echo " Using SSLFLAGS=\"$SSLFLAGS\"" >&6; } + IPPALIASES="http https ipps" +elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes -o x$enable_openssl = xyes; then + as_fn_error $? "Unable to enable SSL support." "$LINENO" 5 +fi + + + + + + + +EXPORT_SSLLIBS="$SSLLIBS" + + + + +# Check whether --enable-pam was given. +if test "${enable_pam+set}" = set; then : + enableval=$enable_pam; +fi + + +# Check whether --with-pam_module was given. +if test "${with_pam_module+set}" = set; then : + withval=$with_pam_module; +fi + + +if test $uname = AIX; then + enable_pam=no +fi + +PAMDIR="" +PAMFILE="pam.std" +PAMLIBS="" +PAMMOD="pam_unknown.so" +PAMMODAUTH="pam_unknown.so" + +if test x$enable_pam != xno; then + SAVELIBS="$LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF + + LIBS="-ldl $LIBS" + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 +$as_echo_n "checking for pam_start in -lpam... " >&6; } +if ${ac_cv_lib_pam_pam_start+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_start (); +int +main () +{ +return pam_start (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_start=yes +else + ac_cv_lib_pam_pam_start=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; } +if test "x$ac_cv_lib_pam_pam_start" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPAM 1 +_ACEOF + + LIBS="-lpam $LIBS" + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_set_item in -lpam" >&5 +$as_echo_n "checking for pam_set_item in -lpam... " >&6; } +if ${ac_cv_lib_pam_pam_set_item+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_set_item (); +int +main () +{ +return pam_set_item (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_set_item=yes +else + ac_cv_lib_pam_pam_set_item=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_set_item" >&5 +$as_echo "$ac_cv_lib_pam_pam_set_item" >&6; } +if test "x$ac_cv_lib_pam_pam_set_item" = xyes; then : + $as_echo "#define HAVE_PAM_SET_ITEM 1" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_setcred in -lpam" >&5 +$as_echo_n "checking for pam_setcred in -lpam... " >&6; } +if ${ac_cv_lib_pam_pam_setcred+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_setcred (); +int +main () +{ +return pam_setcred (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_setcred=yes +else + ac_cv_lib_pam_pam_setcred=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_setcred" >&5 +$as_echo "$ac_cv_lib_pam_pam_setcred" >&6; } +if test "x$ac_cv_lib_pam_pam_setcred" = xyes; then : + $as_echo "#define HAVE_PAM_SETCRED 1" >>confdefs.h + +fi + + ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default" +if test "x$ac_cv_header_security_pam_appl_h" = xyes; then : + +fi + + + if test x$ac_cv_header_security_pam_appl_h != xyes; then + ac_fn_c_check_header_mongrel "$LINENO" "pam/pam_appl.h" "ac_cv_header_pam_pam_appl_h" "$ac_includes_default" +if test "x$ac_cv_header_pam_pam_appl_h" = xyes; then : + $as_echo "#define HAVE_PAM_PAM_APPL_H 1" >>confdefs.h + +fi + + + fi + + if test x$ac_cv_lib_pam_pam_start != xno; then + # Set the necessary libraries for PAM... + if test x$ac_cv_lib_dl_dlopen != xno; then + PAMLIBS="-lpam -ldl" + else + PAMLIBS="-lpam" + fi + + # Find the PAM configuration directory, if any... + for dir in /private/etc/pam.d /etc/pam.d; do + if test -d $dir; then + PAMDIR=$dir + break; + fi + done + fi + + LIBS="$SAVELIBS" + + case "$uname" in + Darwin*) + # Darwin/OS X + if test "x$with_pam_module" != x; then + PAMFILE="pam.$with_pam_module" + elif test -f /usr/lib/pam/pam_opendirectory.so.2; then + PAMFILE="pam.opendirectory" + else + PAMFILE="pam.securityserver" + fi + ;; + + *) + # All others; this test might need to be updated + # as Linux distributors move things around... + if test "x$with_pam_module" != x; then + PAMMOD="pam_${with_pam_module}.so" + elif test -f /lib/security/pam_unix2.so; then + PAMMOD="pam_unix2.so" + elif test -f /lib/security/pam_unix.so; then + PAMMOD="pam_unix.so" + fi + + if test "x$PAMMOD" = xpam_unix.so; then + PAMMODAUTH="$PAMMOD shadow nodelay" + else + PAMMODAUTH="$PAMMOD nodelay" + fi + ;; + esac +fi + + + + + + + + + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi +fi + + +LARGEFILE="" +if test x$enable_largefile != xno; then + LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + + if test x$ac_cv_sys_large_files = x1; then + LARGEFILE="$LARGEFILE -D_LARGE_FILES" + fi + + if test x$ac_cv_sys_file_offset_bits = x64; then + LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64" + fi +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if ${ac_cv_c_long_long+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$GCC" = yes; then + ac_cv_c_long_long=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +long long int i; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_long_long=yes +else + ac_cv_c_long_long=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_long_long" >&5 +$as_echo "$ac_cv_c_long_long" >&6; } + +if test $ac_cv_c_long_long = yes; then + $as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" +if test "x$ac_cv_func_strtoll" = xyes; then : + $as_echo "#define HAVE_STRTOLL 1" >>confdefs.h + +fi + + + + +# Check whether --enable-avahi was given. +if test "${enable_avahi+set}" = set; then : + enableval=$enable_avahi; +fi + +# Check whether --enable-dnssd was given. +if test "${enable_dnssd+set}" = set; then : + enableval=$enable_dnssd; +fi + + +# Check whether --with-dnssd-libs was given. +if test "${with_dnssd_libs+set}" = set; then : + withval=$with_dnssd_libs; LDFLAGS="-L$withval $LDFLAGS" + DSOFLAGS="-L$withval $DSOFLAGS" +fi + + +# Check whether --with-dnssd-includes was given. +if test "${with_dnssd_includes+set}" = set; then : + withval=$with_dnssd_includes; CFLAGS="-I$withval $CFLAGS" + CPPFLAGS="-I$withval $CPPFLAGS" +fi + + +DNSSDLIBS="" +DNSSD_BACKEND="" +IPPFIND_BIN="" +IPPFIND_MAN="" + +if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Avahi" >&5 +$as_echo_n "checking for Avahi... " >&6; } + if $PKGCONFIG --exists avahi-client; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" + DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" + DNSSD_BACKEND="dnssd" + IPPFIND_BIN="ippfind" + IPPFIND_MAN="ippfind.\$(MAN1EXT)" + $as_echo "#define HAVE_AVAHI 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + +if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default" +if test "x$ac_cv_header_dns_sd_h" = xyes; then : + + case "$uname" in + Darwin*) + # Darwin and MacOS X... + $as_echo "#define HAVE_DNSSD 1" >>confdefs.h + + DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" + DNSSD_BACKEND="dnssd" + IPPFIND_BIN="ippfind" + IPPFIND_MAN="ippfind.\$(MAN1EXT)" + ;; + *) + # All others... + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for current version of dns_sd library" >&5 +$as_echo_n "checking for current version of dns_sd library... " >&6; } + SAVELIBS="$LIBS" + LIBS="$LIBS -ldns_sd" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int constant = kDNSServiceFlagsShareConnection; + unsigned char txtRecord[100]; + uint8_t valueLen; + TXTRecordGetValuePtr(sizeof(txtRecord), + txtRecord, "value", &valueLen); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_DNSSD 1" >>confdefs.h + + DNSSDLIBS="-ldns_sd" + DNSSD_BACKEND="dnssd" +else + IPPFIND_BIN="ippfind" + IPPFIND_MAN="ippfind.\$(MAN1EXT)" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + LIBS="$SAVELIBS" + ;; + esac + +fi + + +fi + + + + + + + + + +# Check whether --enable-launchd was given. +if test "${enable_launchd+set}" = set; then : + enableval=$enable_launchd; +fi + + +DEFAULT_LAUNCHD_CONF="" +LAUNCHDLIBS="" + +if test x$enable_launchd != xno; then + ac_fn_c_check_func "$LINENO" "launch_msg" "ac_cv_func_launch_msg" +if test "x$ac_cv_func_launch_msg" = xyes; then : + $as_echo "#define HAVE_LAUNCHD 1" >>confdefs.h + +fi + + ac_fn_c_check_header_mongrel "$LINENO" "launch.h" "ac_cv_header_launch_h" "$ac_includes_default" +if test "x$ac_cv_header_launch_h" = xyes; then : + $as_echo "#define HAVE_LAUNCH_H 1" >>confdefs.h + +fi + + + + case "$uname" in + Darwin*) + # Darwin, MacOS X + DEFAULT_LAUNCHD_CONF="/System/Library/LaunchDaemons/org.cups.cupsd.plist" + # liblaunch is already part of libSystem + ;; + *) + # All others; this test will need to be updated + ;; + esac +fi + + + + + + +LANGUAGES="`ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`" + + +# Check whether --with-languages was given. +if test "${with_languages+set}" = set; then : + withval=$with_languages; + case "$withval" in + none | no) LANGUAGES="" ;; + all) ;; + *) LANGUAGES="$withval" ;; + esac +fi + + + + +# Check whether --with-bundledir was given. +if test "${with_bundledir+set}" = set; then : + withval=$with_bundledir; CUPS_BUNDLEDIR="$withval" +else + if test "x$uname" = xDarwin -a $uversion -ge 100; then + CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A" + LANGUAGES="" + else + CUPS_BUNDLEDIR="" + fi +fi + + + +if test "x$CUPS_BUNDLEDIR" != x; then + cat >>confdefs.h <<_ACEOF +#define CUPS_BUNDLEDIR "$CUPS_BUNDLEDIR" +_ACEOF + +fi + + +# Check whether --with-config_file_perm was given. +if test "${with_config_file_perm+set}" = set; then : + withval=$with_config_file_perm; CUPS_CONFIG_FILE_PERM="$withval" +else + if test "x$uname" = xDarwin; then + CUPS_CONFIG_FILE_PERM="644" + else + CUPS_CONFIG_FILE_PERM="640" + fi +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_CONFIG_FILE_PERM 0$CUPS_CONFIG_FILE_PERM +_ACEOF + + + +# Check whether --with-cupsd_file_perm was given. +if test "${with_cupsd_file_perm+set}" = set; then : + withval=$with_cupsd_file_perm; CUPS_CUPSD_FILE_PERM="$withval" +else + CUPS_CUPSD_FILE_PERM="500" +fi + + + + +# Check whether --with-log_file_perm was given. +if test "${with_log_file_perm+set}" = set; then : + withval=$with_log_file_perm; CUPS_LOG_FILE_PERM="$withval" +else + CUPS_LOG_FILE_PERM="644" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_LOG_FILE_PERM 0$CUPS_LOG_FILE_PERM +_ACEOF + + + +# Check whether --with-fatal_errors was given. +if test "${with_fatal_errors+set}" = set; then : + withval=$with_fatal_errors; CUPS_FATAL_ERRORS="$withval" +else + CUPS_FATAL_ERRORS="config" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_FATAL_ERRORS "$CUPS_FATAL_ERRORS" +_ACEOF + + + +# Check whether --with-log_level was given. +if test "${with_log_level+set}" = set; then : + withval=$with_log_level; CUPS_LOG_LEVEL="$withval" +else + CUPS_LOG_LEVEL="warn" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_LOG_LEVEL "$CUPS_LOG_LEVEL" +_ACEOF + + + +# Check whether --with-access_log_level was given. +if test "${with_access_log_level+set}" = set; then : + withval=$with_access_log_level; CUPS_ACCESS_LOG_LEVEL="$withval" +else + CUPS_ACCESS_LOG_LEVEL="actions" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "$CUPS_ACCESS_LOG_LEVEL" +_ACEOF + + +# Check whether --enable-browsing was given. +if test "${enable_browsing+set}" = set; then : + enableval=$enable_browsing; +fi + +if test "x$enable_browsing" = xno; then + CUPS_BROWSING="No" + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_BROWSING 0 +_ACEOF + +else + CUPS_BROWSING="Yes" + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_BROWSING 1 +_ACEOF + +fi + + + +# Check whether --with-local_protocols was given. +if test "${with_local_protocols+set}" = set; then : + withval=$with_local_protocols; default_local_protocols="$withval" +else + default_local_protocols="default" +fi + + +if test x$with_local_protocols != xno; then + if test "x$default_local_protocols" = "xdefault"; then + if test "x$DNSSD_BACKEND" != "x"; then + CUPS_BROWSE_LOCAL_PROTOCOLS="dnssd" + else + CUPS_BROWSE_LOCAL_PROTOCOLS="" + fi + else + CUPS_BROWSE_LOCAL_PROTOCOLS="$default_local_protocols" + fi +else + CUPS_BROWSE_LOCAL_PROTOCOLS="" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "$CUPS_BROWSE_LOCAL_PROTOCOLS" +_ACEOF + + +# Check whether --enable-default_shared was given. +if test "${enable_default_shared+set}" = set; then : + enableval=$enable_default_shared; +fi + +if test "x$enable_default_shared" = xno; then + CUPS_DEFAULT_SHARED="No" + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_DEFAULT_SHARED 0 +_ACEOF + +else + CUPS_DEFAULT_SHARED="Yes" + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_DEFAULT_SHARED 1 +_ACEOF + +fi + + + +# Check whether --with-cups_user was given. +if test "${with_cups_user+set}" = set; then : + withval=$with_cups_user; CUPS_USER="$withval" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default print user" >&5 +$as_echo_n "checking for default print user... " >&6; } + if test x$uname = xDarwin; then + if test x`id -u _lp 2>/dev/null` = x; then + CUPS_USER="lp"; + else + CUPS_USER="_lp"; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_USER" >&5 +$as_echo "$CUPS_USER" >&6; } + elif test -f /etc/passwd; then + CUPS_USER="" + for user in lp lpd guest daemon nobody; do + if test "`grep \^${user}: /etc/passwd`" != ""; then + CUPS_USER="$user" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $user" >&5 +$as_echo "$user" >&6; } + break; + fi + done + + if test x$CUPS_USER = x; then + CUPS_USER="nobody" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + fi + else + CUPS_USER="nobody" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no password file" >&5 +$as_echo "no password file" >&6; } + fi +fi + + +if test "x$CUPS_USER" = "xroot" -o "x$CUPS_USER" = "x0"; then + as_fn_error $? "The default user for CUPS cannot be root!" "$LINENO" 5 +fi + + +# Check whether --with-cups_group was given. +if test "${with_cups_group+set}" = set; then : + withval=$with_cups_group; CUPS_GROUP="$withval" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default print group" >&5 +$as_echo_n "checking for default print group... " >&6; } + if test x$uname = xDarwin; then + if test x`id -g _lp 2>/dev/null` = x; then + CUPS_GROUP="lp"; + else + CUPS_GROUP="_lp"; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_GROUP" >&5 +$as_echo "$CUPS_GROUP" >&6; } + elif test -f /etc/group; then + GROUP_LIST="_lp lp nobody" + CUPS_GROUP="" + for group in $GROUP_LIST; do + if test "`grep \^${group}: /etc/group`" != ""; then + CUPS_GROUP="$group" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $group" >&5 +$as_echo "$group" >&6; } + break; + fi + done + + if test x$CUPS_GROUP = x; then + CUPS_GROUP="nobody" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + fi + else + CUPS_GROUP="nobody" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no group file" >&5 +$as_echo "no group file" >&6; } + fi +fi + + +if test "x$CUPS_GROUP" = "xroot" -o "x$CUPS_GROUP" = "xwheel" -o "x$CUPS_GROUP" = "x0"; then + as_fn_error $? "The default group for CUPS cannot be root!" "$LINENO" 5 +fi + + +# Check whether --with-system_groups was given. +if test "${with_system_groups+set}" = set; then : + withval=$with_system_groups; CUPS_SYSTEM_GROUPS="$withval" +else + if test x$uname = xDarwin; then + CUPS_SYSTEM_GROUPS="admin" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default system groups" >&5 +$as_echo_n "checking for default system groups... " >&6; } + if test -f /etc/group; then + CUPS_SYSTEM_GROUPS="" + GROUP_LIST="lpadmin sys system root" + for group in $GROUP_LIST; do + if test "`grep \^${group}: /etc/group`" != ""; then + if test "x$CUPS_SYSTEM_GROUPS" = x; then + CUPS_SYSTEM_GROUPS="$group" + else + CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group" + fi + fi + done + + if test "x$CUPS_SYSTEM_GROUPS" = x; then + CUPS_SYSTEM_GROUPS="$GROUP_LIST" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no groups found" >&5 +$as_echo "no groups found" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$CUPS_SYSTEM_GROUPS\"" >&5 +$as_echo "\"$CUPS_SYSTEM_GROUPS\"" >&6; } + fi + else + CUPS_SYSTEM_GROUPS="$GROUP_LIST" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no group file" >&5 +$as_echo "no group file" >&6; } + fi + fi +fi + + +CUPS_PRIMARY_SYSTEM_GROUP="`echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'`" + +for group in $CUPS_SYSTEM_GROUPS; do + if test "x$CUPS_GROUP" = "x$group"; then + as_fn_error $? "The default system groups cannot contain the default CUPS group!" "$LINENO" 5 + fi +done + + + + + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_USER "$CUPS_USER" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_GROUP "$CUPS_GROUP" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SYSTEM_GROUPS "$CUPS_SYSTEM_GROUPS" +_ACEOF + + + +# Check whether --with-printcap was given. +if test "${with_printcap+set}" = set; then : + withval=$with_printcap; default_printcap="$withval" +else + default_printcap="default" +fi + + +if test x$default_printcap != xno; then + if test "x$default_printcap" = "xdefault"; then + case $uname in + Darwin*) + if test $uversion -ge 90; then + CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist" + else + CUPS_DEFAULT_PRINTCAP="/etc/printcap" + fi + ;; + SunOS*) + CUPS_DEFAULT_PRINTCAP="/etc/printers.conf" + ;; + *) + CUPS_DEFAULT_PRINTCAP="/etc/printcap" + ;; + esac + else + CUPS_DEFAULT_PRINTCAP="$default_printcap" + fi +else + CUPS_DEFAULT_PRINTCAP="" +fi + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_PRINTCAP "$CUPS_DEFAULT_PRINTCAP" +_ACEOF + + + +# Check whether --with-lpdconfigfile was given. +if test "${with_lpdconfigfile+set}" = set; then : + withval=$with_lpdconfigfile; default_lpdconfigfile="$withval" +else + default_lpdconfigfile="default" +fi + + +if test x$default_lpdconfigfile != xno; then + if test "x$default_lpdconfigfile" = "xdefault"; then + case $uname in + Darwin*) + CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist" + ;; + *) + if test "x$XINETD" != x; then + CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd://$XINETD/cups-lpd" + else + CUPS_DEFAULT_LPD_CONFIG_FILE="" + fi + ;; + esac + else + CUPS_DEFAULT_LPD_CONFIG_FILE="$default_lpdconfigfile" + fi +else + CUPS_DEFAULT_LPD_CONFIG_FILE="" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_LPD_CONFIG_FILE "$CUPS_DEFAULT_LPD_CONFIG_FILE" +_ACEOF + + + + +# Check whether --with-smbconfigfile was given. +if test "${with_smbconfigfile+set}" = set; then : + withval=$with_smbconfigfile; default_smbconfigfile="$withval" +else + default_smbconfigfile="default" +fi + + +if test x$default_smbconfigfile != xno; then + if test "x$default_smbconfigfile" = "xdefault"; then + if test -f /etc/smb.conf; then + CUPS_DEFAULT_SMB_CONFIG_FILE="samba:///etc/smb.conf" + else + CUPS_DEFAULT_SMB_CONFIG_FILE="" + fi + else + CUPS_DEFAULT_SMB_CONFIG_FILE="$default_smbconfigfile" + fi +else + CUPS_DEFAULT_SMB_CONFIG_FILE="" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SMB_CONFIG_FILE "$CUPS_DEFAULT_SMB_CONFIG_FILE" +_ACEOF + + + + +# Check whether --with-max-copies was given. +if test "${with_max_copies+set}" = set; then : + withval=$with_max_copies; CUPS_MAX_COPIES="$withval" +else + CUPS_MAX_COPIES="9999" +fi + + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_MAX_COPIES $CUPS_MAX_COPIES +_ACEOF + + +# Check whether --enable-raw_printing was given. +if test "${enable_raw_printing+set}" = set; then : + enableval=$enable_raw_printing; +fi + +if test "x$enable_raw_printing" != xno; then + DEFAULT_RAW_PRINTING="" +else + DEFAULT_RAW_PRINTING="#" +fi + + + +# Check whether --with-snmp-address was given. +if test "${with_snmp_address+set}" = set; then : + withval=$with_snmp_address; if test "x$withval" = x; then + CUPS_SNMP_ADDRESS="" + else + CUPS_SNMP_ADDRESS="Address $withval" + fi +else + if test "x$uname" = xDarwin; then + CUPS_SNMP_ADDRESS="" + else + CUPS_SNMP_ADDRESS="Address @LOCAL" + fi +fi + + + +# Check whether --with-snmp-community was given. +if test "${with_snmp_community+set}" = set; then : + withval=$with_snmp_community; CUPS_SNMP_COMMUNITY="Community $withval" +else + CUPS_SNMP_COMMUNITY="Community public" +fi + + + + + + +# Check whether --with-ipp-port was given. +if test "${with_ipp_port+set}" = set; then : + withval=$with_ipp_port; DEFAULT_IPP_PORT="$withval" +else + DEFAULT_IPP_PORT="631" +fi + + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_IPP_PORT $DEFAULT_IPP_PORT +_ACEOF + + +# Check whether --enable-webif was given. +if test "${enable_webif+set}" = set; then : + enableval=$enable_webif; +fi + +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 + + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_WEBIF $CUPS_DEFAULT_WEBIF +_ACEOF + + + + + +# Check whether --with-java was given. +if test "${with_java+set}" = set; then : + withval=$with_java; CUPS_JAVA="$withval" +else + CUPS_JAVA="" +fi + + +if test "x$CUPS_JAVA" = x; then + # Extract the first word of "java", so it can be a program name with args. +set dummy java; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_JAVA+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $JAVA in + [\\/]* | ?:[\\/]*) + ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +JAVA=$ac_cv_path_JAVA +if test -n "$JAVA"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5 +$as_echo "$JAVA" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + CUPS_JAVA="$JAVA" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_JAVA "$CUPS_JAVA" +_ACEOF + + +if test "x$CUPS_JAVA" != x; then + $as_echo "#define HAVE_JAVA 1" >>confdefs.h + +fi + + +# Check whether --with-perl was given. +if test "${with_perl+set}" = set; then : + withval=$with_perl; CUPS_PERL="$withval" +else + CUPS_PERL="" +fi + + +if test "x$CUPS_PERL" = x; then + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + CUPS_PERL="$PERL" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_PERL "$CUPS_PERL" +_ACEOF + + +if test "x$CUPS_PERL" != x; then + $as_echo "#define HAVE_PERL 1" >>confdefs.h + +fi + + +# Check whether --with-php was given. +if test "${with_php+set}" = set; then : + withval=$with_php; CUPS_PHP="$withval" +else + CUPS_PHP="" +fi + + +if test "x$CUPS_PHP" = x; then + # Extract the first word of "php-cgi", so it can be a program name with args. +set dummy php-cgi; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PHPCGI+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PHPCGI in + [\\/]* | ?:[\\/]*) + ac_cv_path_PHPCGI="$PHPCGI" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PHPCGI="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PHPCGI=$ac_cv_path_PHPCGI +if test -n "$PHPCGI"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHPCGI" >&5 +$as_echo "$PHPCGI" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$PHPCGI" = x; then + # Extract the first word of "php", so it can be a program name with args. +set dummy php; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PHP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PHP in + [\\/]* | ?:[\\/]*) + ac_cv_path_PHP="$PHP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PHP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PHP=$ac_cv_path_PHP +if test -n "$PHP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5 +$as_echo "$PHP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + CUPS_PHP="$PHP" + else + CUPS_PHP="$PHPCGI" + fi +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_PHP "$CUPS_PHP" +_ACEOF + + +if test "x$CUPS_PHP" = x; then + CUPS_PHP="no" +else + $as_echo "#define HAVE_PHP 1" >>confdefs.h + +fi + + +# Check whether --with-python was given. +if test "${with_python+set}" = set; then : + withval=$with_python; CUPS_PYTHON="$withval" +else + CUPS_PYTHON="" +fi + + +if test "x$CUPS_PYTHON" = x; then + # Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + CUPS_PYTHON="$PYTHON" +fi + +cat >>confdefs.h <<_ACEOF +#define CUPS_PYTHON "$CUPS_PYTHON" +_ACEOF + + +if test "x$CUPS_PYTHON" != x; then + $as_echo "#define HAVE_PYTHON 1" >>confdefs.h + +fi + + + +INSTALL_LANGUAGES="" +UNINSTALL_LANGUAGES="" +LANGFILES="" +if test "x$LANGUAGES" != x; then + INSTALL_LANGUAGES="install-languages" + UNINSTALL_LANGUAGES="uninstall-languages" + for lang in $LANGUAGES; do + if test -f doc/$lang/index.html.in; then + LANGFILES="$LANGFILES doc/$lang/index.html" + fi + + if test -f templates/$lang/header.tmpl.in; then + LANGFILES="$LANGFILES templates/$lang/header.tmpl" + fi + done +elif test "x$CUPS_BUNDLEDIR" != x; then + INSTALL_LANGUAGES="install-langbundle" + UNINSTALL_LANGUAGES="uninstall-langbundle" +fi + + + + +ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config data/testprint desktop/cups.desktop doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html doc/index.html man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist templates/header.tmpl packaging/cups.list $LANGFILES" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Report bugs to the package provider." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +config.status +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2010 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "Makedefs") CONFIG_FILES="$CONFIG_FILES Makedefs" ;; + "conf/cups-files.conf") CONFIG_FILES="$CONFIG_FILES conf/cups-files.conf" ;; + "conf/cupsd.conf") CONFIG_FILES="$CONFIG_FILES conf/cupsd.conf" ;; + "conf/mime.convs") CONFIG_FILES="$CONFIG_FILES conf/mime.convs" ;; + "conf/pam.std") CONFIG_FILES="$CONFIG_FILES conf/pam.std" ;; + "conf/snmp.conf") CONFIG_FILES="$CONFIG_FILES conf/snmp.conf" ;; + "cups-config") CONFIG_FILES="$CONFIG_FILES cups-config" ;; + "data/testprint") CONFIG_FILES="$CONFIG_FILES data/testprint" ;; + "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;; + "doc/help/ref-cups-files-conf.html") CONFIG_FILES="$CONFIG_FILES doc/help/ref-cups-files-conf.html" ;; + "doc/help/ref-cupsd-conf.html") CONFIG_FILES="$CONFIG_FILES doc/help/ref-cupsd-conf.html" ;; + "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;; + "man/client.conf.man") CONFIG_FILES="$CONFIG_FILES man/client.conf.man" ;; + "man/cups-deviced.man") CONFIG_FILES="$CONFIG_FILES man/cups-deviced.man" ;; + "man/cups-driverd.man") CONFIG_FILES="$CONFIG_FILES man/cups-driverd.man" ;; + "man/cups-files.conf.man") CONFIG_FILES="$CONFIG_FILES man/cups-files.conf.man" ;; + "man/cups-lpd.man") CONFIG_FILES="$CONFIG_FILES man/cups-lpd.man" ;; + "man/cups-snmp.man") CONFIG_FILES="$CONFIG_FILES man/cups-snmp.man" ;; + "man/cupsaddsmb.man") CONFIG_FILES="$CONFIG_FILES man/cupsaddsmb.man" ;; + "man/cupsd.conf.man") CONFIG_FILES="$CONFIG_FILES man/cupsd.conf.man" ;; + "man/cupsd.man") CONFIG_FILES="$CONFIG_FILES man/cupsd.man" ;; + "man/lpoptions.man") CONFIG_FILES="$CONFIG_FILES man/lpoptions.man" ;; + "scheduler/cups-lpd.xinetd") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpd.xinetd" ;; + "scheduler/cups.sh") CONFIG_FILES="$CONFIG_FILES scheduler/cups.sh" ;; + "scheduler/cups.xml") CONFIG_FILES="$CONFIG_FILES scheduler/cups.xml" ;; + "scheduler/org.cups.cups-lpd.plist") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cups-lpd.plist" ;; + "templates/header.tmpl") CONFIG_FILES="$CONFIG_FILES templates/header.tmpl" ;; + "packaging/cups.list") CONFIG_FILES="$CONFIG_FILES packaging/cups.list" ;; + "$LANGFILES") CONFIG_FILES="$CONFIG_FILES $LANGFILES" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; + + + esac + +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + +chmod +x cups-config + diff --git a/configure.in b/configure.in index c9bde6700..4a5d80437 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -dnl "$Id$" +dnl "$Id: configure.in 11109 2013-07-08 21:15:13Z msweet $" dnl dnl Configuration script for CUPS. dnl @@ -92,5 +92,5 @@ AC_OUTPUT(Makedefs chmod +x cups-config dnl -dnl End of "$Id$". +dnl End of "$Id: configure.in 11109 2013-07-08 21:15:13Z msweet $". dnl diff --git a/cups-config.in b/cups-config.in index 436800a64..07726c5fa 100755 --- a/cups-config.in +++ b/cups-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# "$Id$" +# "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $" # # CUPS configuration utility. # @@ -142,5 +142,5 @@ while test $# -gt 0; do done # -# End of "$Id$". +# End of "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/cups/Makefile b/cups/Makefile index c68ef2fc4..e3647f3de 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # API library Makefile for CUPS. # @@ -639,5 +639,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/cups/adminutil.c b/cups/adminutil.c index a84a5363e..580511b8f 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: adminutil.c 10996 2013-05-29 11:51:34Z msweet $" * * Administration utility API definitions for CUPS. * @@ -2337,5 +2337,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ /* - * End of "$Id$". + * End of "$Id: adminutil.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 52dfe9260..f03d2facb 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $" * * Administration utility API definitions for CUPS. * @@ -77,5 +77,5 @@ extern int cupsAdminSetServerSettings(http_t *http, #endif /* !_CUPS_ADMINUTIL_H_ */ /* - * End of "$Id$". + * End of "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/array-private.h b/cups/array-private.h index 4d3c29734..74b0c9bf0 100644 --- a/cups/array-private.h +++ b/cups/array-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $" * * Private array definitions for CUPS. * @@ -48,5 +48,5 @@ extern cups_array_t *_cupsArrayNewStrings(const char *s, char delim) #endif /* !_CUPS_ARRAY_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $". */ diff --git a/cups/array.c b/cups/array.c index 9fbba6205..29ae6d95e 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: array.c 10996 2013-05-29 11:51:34Z msweet $" * * Sorted array routines for CUPS. * @@ -1362,5 +1362,5 @@ cups_array_find(cups_array_t *a, /* I - Array */ /* - * End of "$Id$". + * End of "$Id: array.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/array.h b/cups/array.h index 385b7dffc..7a5fc584d 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $" * * Sorted array definitions for CUPS. * @@ -88,5 +88,5 @@ extern void *cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2; #endif /* !_CUPS_ARRAY_H_ */ /* - * End of "$Id$". + * End of "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/attr.c b/cups/attr.c index bc241a517..c3ab07b1f 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: attr.c 10996 2013-05-29 11:51:34Z msweet $" * * PPD model-specific attribute routines for CUPS. * @@ -331,5 +331,5 @@ _ppdNormalizeMakeAndModel( /* - * End of "$Id$". + * End of "$Id: attr.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/auth.c b/cups/auth.c index 8efb34b33..9d38b3911 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: auth.c 10996 2013-05-29 11:51:34Z msweet $" * * Authentication functions for CUPS. * @@ -888,5 +888,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id$". + * End of "$Id: auth.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 7fa8c97f5..66fa1ce4d 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: backchannel.c 10996 2013-05-29 11:51:34Z msweet $" * * Backchannel functions for CUPS. * @@ -195,5 +195,5 @@ cups_setup(fd_set *set, /* I - Set for select() */ /* - * End of "$Id$". + * End of "$Id: backchannel.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/backend.c b/cups/backend.c index 372c04d81..0789471e9 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: backend.c 10996 2013-05-29 11:51:34Z msweet $" * * Backend functions for CUPS. * @@ -150,5 +150,5 @@ quote_string(const char *s) /* I - String to write */ /* - * End of "$Id$". + * End of "$Id: backend.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/backend.h b/cups/backend.h index 85941c71a..127c02790 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $" * * Backend definitions for CUPS. * @@ -74,5 +74,5 @@ extern void cupsBackendReport(const char *device_scheme, #endif /* !_CUPS_BACKEND_H_ */ /* - * End of "$Id$". + * End of "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/conflicts.c b/cups/conflicts.c index ae048d135..2ec8b7eb6 100644 --- a/cups/conflicts.c +++ b/cups/conflicts.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: conflicts.c 3933 2012-10-01 03:01:10Z msweet $" * * Option marking routines for CUPS. * @@ -1210,5 +1210,5 @@ ppd_test_constraints( /* - * End of "$Id$". + * End of "$Id: conflicts.c 3933 2012-10-01 03:01:10Z msweet $". */ diff --git a/cups/cups-private.h b/cups/cups-private.h index cd32e6f82..9328cdadf 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cups-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Private definitions for CUPS. * @@ -281,5 +281,5 @@ extern char *_cupsUserDefault(char *name, size_t namesize); #endif /* !_CUPS_CUPS_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: cups-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/cups.h b/cups/cups.h index b47291078..17f93a628 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cups.h 11367 2013-10-28 15:35:57Z msweet $" * * API definitions for CUPS. * @@ -627,5 +627,5 @@ extern const char *cupsUserAgent(void) _CUPS_API_1_7; #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id$". + * End of "$Id: cups.h 11367 2013-10-28 15:35:57Z msweet $". */ diff --git a/cups/custom.c b/cups/custom.c index 3d1d724fa..28c1fed40 100644 --- a/cups/custom.c +++ b/cups/custom.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: custom.c 10996 2013-05-29 11:51:34Z msweet $" * * PPD custom option routines for CUPS. * @@ -118,5 +118,5 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* - * End of "$Id$". + * End of "$Id: custom.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/debug-private.h b/cups/debug-private.h index 26c75a379..8968aebfe 100644 --- a/cups/debug-private.h +++ b/cups/debug-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Private debugging macros for CUPS. * @@ -113,5 +113,5 @@ extern int _cups_gettimeofday(struct timeval *tv, void *tz); #endif /* !_CUPS_DEBUG_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/debug.c b/cups/debug.c index 27ade63ca..6df860cb7 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: debug.c 4027 2012-11-16 01:00:05Z msweet $" * * Debugging functions for CUPS. * @@ -650,5 +650,5 @@ _cups_debug_set(const char *logfile, /* I - Log file or NULL */ /* - * End of "$Id$". + * End of "$Id: debug.c 4027 2012-11-16 01:00:05Z msweet $". */ diff --git a/cups/dest-job.c b/cups/dest-job.c index 85009faec..f346444c6 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dest-job.c 4274 2013-04-09 20:10:23Z msweet $" * * Destination job support for CUPS. * @@ -362,5 +362,5 @@ cupsStartDestDocument( /* - * End of "$Id$". + * End of "$Id: dest-job.c 4274 2013-04-09 20:10:23Z msweet $". */ diff --git a/cups/dest-localization.c b/cups/dest-localization.c index fefb0f9e2..9c3cfae15 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dest-localization.c 4216 2013-03-11 13:57:36Z msweet $" * * Destination localization support for CUPS. * @@ -383,5 +383,5 @@ cups_scan_strings(char *buffer) /* I - Start of string */ /* - * End of "$Id$". + * End of "$Id: dest-localization.c 4216 2013-03-11 13:57:36Z msweet $". */ diff --git a/cups/dest-options.c b/cups/dest-options.c index 4b03189c5..ec3924ad7 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dest-options.c 11085 2013-07-03 13:53:05Z msweet $" * * Destination option/media support for CUPS. * @@ -2267,5 +2267,5 @@ cups_update_ready(http_t *http, /* I - Connection to destination */ /* - * End of "$Id$". + * End of "$Id: dest-options.c 11085 2013-07-03 13:53:05Z msweet $". */ diff --git a/cups/dest.c b/cups/dest.c index 36481f808..cdf1c4491 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dest.c 11141 2013-07-16 14:58:25Z msweet $" * * User-defined destination (and option) support for CUPS. * @@ -3891,5 +3891,5 @@ cups_make_string( /* - * End of "$Id$". + * End of "$Id: dest.c 11141 2013-07-16 14:58:25Z msweet $". */ diff --git a/cups/dir.c b/cups/dir.c index d30009ecf..1bae123e2 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $" * * Directory routines for CUPS. * @@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ #endif /* WIN32 */ /* - * End of "$Id$". + * End of "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/dir.h b/cups/dir.h index 75e5b1e61..ad8278c45 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $" * * Public directory definitions for CUPS. * @@ -65,5 +65,5 @@ extern void cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2; #endif /* !_CUPS_DIR_H_ */ /* - * End of "$Id$". + * End of "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/emit.c b/cups/emit.c index 777488ff1..a9c35bb94 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: emit.c 10996 2013-05-29 11:51:34Z msweet $" * * PPD code emission routines for CUPS. * @@ -1225,5 +1225,5 @@ ppd_handle_media(ppd_file_t *ppd) /* I - PPD file */ /* - * End of "$Id$". + * End of "$Id: emit.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/encode.c b/cups/encode.c index 667e0d304..32465526a 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: encode.c 11115 2013-07-10 14:35:53Z msweet $" * * Option encoding routines for CUPS. * @@ -872,5 +872,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ /* - * End of "$Id$". + * End of "$Id: encode.c 11115 2013-07-10 14:35:53Z msweet $". */ diff --git a/cups/file-private.h b/cups/file-private.h index 60a250148..bb83c40c7 100644 --- a/cups/file-private.h +++ b/cups/file-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: file-private.h 3275 2011-05-20 07:26:13Z msweet $" * * Private file definitions for CUPS. * @@ -133,5 +133,5 @@ extern void _cupsFileCheckFilter(void *context, #endif /* !_CUPS_FILE_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: file-private.h 3275 2011-05-20 07:26:13Z msweet $". */ diff --git a/cups/file.c b/cups/file.c index c76758d9d..8142a44e4 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: file.c 11374 2013-11-04 23:49:10Z msweet $" * * File functions for CUPS. * @@ -2670,5 +2670,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ /* - * End of "$Id$". + * End of "$Id: file.c 11374 2013-11-04 23:49:10Z msweet $". */ diff --git a/cups/file.h b/cups/file.h index a3defede1..e7994b7dc 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: file.h 10996 2013-05-29 11:51:34Z msweet $" * * Public file definitions for CUPS. * @@ -112,5 +112,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, #endif /* !_CUPS_FILE_H_ */ /* - * End of "$Id$". + * End of "$Id: file.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/getdevices.c b/cups/getdevices.c index 0d5397858..ea862a7ea 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $" * * cupsGetDevices implementation for CUPS. * @@ -280,5 +280,5 @@ cupsGetDevices( /* - * End of "$Id$". + * End of "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $". */ diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index 8111e224d..02903a799 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $" * * Network interface functions for CUPS. * @@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */ /* - * End of "$Id$". + * End of "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/getputfile.c b/cups/getputfile.c index b4be78ae5..33c5e5b8f 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: getputfile.c 11153 2013-07-17 14:10:21Z msweet $" * * Get/put file functions for CUPS. * @@ -518,5 +518,5 @@ cupsPutFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE /* - * End of "$Id$". + * End of "$Id: getputfile.c 11153 2013-07-17 14:10:21Z msweet $". */ diff --git a/cups/globals.c b/cups/globals.c index 41a5854cd..9eb9c5a28 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: globals.c 11113 2013-07-10 14:08:39Z msweet $" * * Global variable access routines for CUPS. * @@ -392,5 +392,5 @@ cups_globals_init(void) /* - * End of "$Id$". + * End of "$Id: globals.c 11113 2013-07-10 14:08:39Z msweet $". */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 747837228..236baef4c 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: http-addr.c 11374 2013-11-04 23:49:10Z msweet $" * * HTTP address routines for CUPS. * @@ -754,5 +754,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */ /* - * End of "$Id$". + * End of "$Id: http-addr.c 11374 2013-11-04 23:49:10Z msweet $". */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index c2b5dc57b..631cb52cc 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: http-addrlist.c 11374 2013-11-04 23:49:10Z msweet $" * * HTTP address list routines for CUPS. * @@ -874,5 +874,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p /* - * End of "$Id$". + * End of "$Id: http-addrlist.c 11374 2013-11-04 23:49:10Z msweet $". */ diff --git a/cups/http-private.h b/cups/http-private.h index e402b1aab..99a85c39e 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: http-private.h 11392 2013-11-06 01:29:56Z msweet $" * * Private HTTP definitions for CUPS. * @@ -437,5 +437,5 @@ extern int _httpWait(http_t *http, int msec, int usessl); #endif /* !_CUPS_HTTP_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: http-private.h 11392 2013-11-06 01:29:56Z msweet $". */ diff --git a/cups/http-support.c b/cups/http-support.c index 0678c272e..a4250beec 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: http-support.c 11445 2013-12-05 19:57:43Z msweet $" * * HTTP support routines for CUPS. * @@ -206,10 +206,10 @@ httpAssembleURI( if (!ptr) goto assemble_overflow; - if (!strcmp(scheme, "mailto")) + if (!strcmp(scheme, "mailto") || !strcmp(scheme, "tel")) { /* - * mailto: only has :, no //... + * mailto: and tel: only have :, no //... */ if (ptr < end) @@ -220,7 +220,7 @@ httpAssembleURI( else { /* - * Schemes other than mailto: all have //... + * Schemes other than mailto: and tel: all have //... */ if ((ptr + 2) < end) @@ -1080,7 +1080,7 @@ httpSeparateURI( *port = 515; else if (!strcmp(scheme, "socket")) /* Not yet registered with IANA... */ *port = 9100; - else if (strcmp(scheme, "file") && strcmp(scheme, "mailto")) + else if (strcmp(scheme, "file") && strcmp(scheme, "mailto") && strcmp(scheme, "tel")) status = HTTP_URI_STATUS_UNKNOWN_SCHEME; /* @@ -2382,5 +2382,5 @@ http_resolve_cb( /* - * End of "$Id$". + * End of "$Id: http-support.c 11445 2013-12-05 19:57:43Z msweet $". */ diff --git a/cups/http.c b/cups/http.c index d6e655fbc..579a3173b 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: http.c 11392 2013-11-06 01:29:56Z msweet $" * * HTTP routines for CUPS. * @@ -5898,5 +5898,5 @@ http_write_ssl(http_t *http, /* I - Connection to server */ /* - * End of "$Id$". + * End of "$Id: http.c 11392 2013-11-06 01:29:56Z msweet $". */ diff --git a/cups/http.h b/cups/http.h index a7a25753d..f9c83a88e 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: http.h 11085 2013-07-03 13:53:05Z msweet $" * * Hyper-Text Transport Protocol definitions for CUPS. * @@ -623,5 +623,5 @@ extern http_state_t httpWriteResponse(http_t *http, #endif /* !_CUPS_HTTP_H_ */ /* - * End of "$Id$". + * End of "$Id: http.h 11085 2013-07-03 13:53:05Z msweet $". */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 3dd6451cc..210c2e796 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ipp-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Private IPP definitions for CUPS. * @@ -77,5 +77,5 @@ extern _ipp_option_t *_ippFindOption(const char *name); #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id$". + * End of "$Id: ipp-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index f6380d8ac..604d65b4c 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ipp-support.c 11085 2013-07-03 13:53:05Z msweet $" * * Internet Printing Protocol support functions for CUPS. * @@ -2248,5 +2248,5 @@ ipp_col_string(ipp_t *col, /* I - Collection attribute */ /* - * End of "$Id$". + * End of "$Id: ipp-support.c 11085 2013-07-03 13:53:05Z msweet $". */ diff --git a/cups/ipp.c b/cups/ipp.c index fc813d658..fe1ee2e74 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ipp.c 11113 2013-07-10 14:08:39Z msweet $" * * Internet Printing Protocol functions for CUPS. * @@ -7064,5 +7064,5 @@ ipp_write_file(int *fd, /* I - File descriptor */ /* - * End of "$Id$". + * End of "$Id: ipp.c 11113 2013-07-10 14:08:39Z msweet $". */ diff --git a/cups/ipp.h b/cups/ipp.h index 10ff50c1a..c02254710 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ipp.h 11085 2013-07-03 13:53:05Z msweet $" * * Internet Printing Protocol definitions for CUPS. * @@ -992,5 +992,5 @@ extern int ippValidateAttributes(ipp_t *ipp) _CUPS_API_1_7; #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id$". + * End of "$Id: ipp.h 11085 2013-07-03 13:53:05Z msweet $". */ diff --git a/cups/langprintf.c b/cups/langprintf.c index f63a473f7..af641c91d 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: langprintf.c 10996 2013-05-29 11:51:34Z msweet $" * * Localized printf/puts functions for CUPS. * @@ -348,5 +348,5 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */ /* - * End of "$Id$". + * End of "$Id: langprintf.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/language-private.h b/cups/language-private.h index cf5b482b4..93cdf0831 100644 --- a/cups/language-private.h +++ b/cups/language-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: language-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Private localization support for CUPS. * @@ -82,5 +82,5 @@ extern void _cupsSetLocale(char *argv[]); #endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: language-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/language.c b/cups/language.c index e201038eb..0836f6d96 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: language.c 11424 2013-11-08 19:51:01Z msweet $" * * I18N/language support for CUPS. * @@ -1586,5 +1586,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id$". + * End of "$Id: language.c 11424 2013-11-08 19:51:01Z msweet $". */ diff --git a/cups/language.h b/cups/language.h index 0b8acdee4..4fcf9e84f 100644 --- a/cups/language.h +++ b/cups/language.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: language.h 10996 2013-05-29 11:51:34Z msweet $" * * Multi-language support for CUPS. * @@ -111,5 +111,5 @@ extern cups_lang_t *cupsLangGet(const char *language); #endif /* !_CUPS_LANGUAGE_H_ */ /* - * End of "$Id$". + * End of "$Id: language.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/localize.c b/cups/localize.c index 13f44c018..5a9b55f95 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: localize.c 10996 2013-05-29 11:51:34Z msweet $" * * PPD localization routines for CUPS. * @@ -775,5 +775,5 @@ ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */ /* - * End of "$Id$". + * End of "$Id: localize.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/mark.c b/cups/mark.c index b44a31a92..23a399701 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: mark.c 10996 2013-05-29 11:51:34Z msweet $" * * Option marking routines for CUPS. * @@ -1097,5 +1097,5 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id$". + * End of "$Id: mark.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/md5-private.h b/cups/md5-private.h index 3667cf0b3..7b9464262 100644 --- a/cups/md5-private.h +++ b/cups/md5-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: md5-private.h 10996 2013-05-29 11:51:34Z msweet $" * * Private MD5 definitions for CUPS. * @@ -75,5 +75,5 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]); #endif /* !_CUPS_MD5_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: md5-private.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/md5.c b/cups/md5.c index 843890d4d..c3e73133a 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: md5.c 11374 2013-11-04 23:49:10Z msweet $" * * Private MD5 implementation for CUPS. * @@ -342,5 +342,5 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) /* - * End of "$Id$". + * End of "$Id: md5.c 11374 2013-11-04 23:49:10Z msweet $". */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index a0dc2cf5b..135282c50 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: md5passwd.c 10996 2013-05-29 11:51:34Z msweet $" * * MD5 password support for CUPS. * @@ -138,5 +138,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ /* - * End of "$Id$". + * End of "$Id: md5passwd.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/notify.c b/cups/notify.c index 69363aa15..7e5cebb28 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: notify.c 10996 2013-05-29 11:51:34Z msweet $" * * Notification routines for CUPS. * @@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ /* - * End of "$Id$". + * End of "$Id: notify.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/options.c b/cups/options.c index 14b88c959..d02500995 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: options.c 10996 2013-05-29 11:51:34Z msweet $" * * Option routines for CUPS. * @@ -707,5 +707,5 @@ cups_find_option( /* - * End of "$Id$". + * End of "$Id: options.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/page.c b/cups/page.c index 824393d90..7c496c68c 100644 --- a/cups/page.c +++ b/cups/page.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: page.c 10996 2013-05-29 11:51:34Z msweet $" * * Page size functions for CUPS. * @@ -392,5 +392,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id$". + * End of "$Id: page.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index ceae66df9..307d9e9bf 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ppd-cache.c 4274 2013-04-09 20:10:23Z msweet $" * * PPD cache implementation for CUPS. * @@ -2726,5 +2726,5 @@ pwg_unppdize_name(const char *ppd, /* I - PPD keyword */ /* - * End of "$Id$". + * End of "$Id: ppd-cache.c 4274 2013-04-09 20:10:23Z msweet $". */ diff --git a/cups/ppd-private.h b/cups/ppd-private.h index c6c25325b..4b8c4ba09 100644 --- a/cups/ppd-private.h +++ b/cups/ppd-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ppd-private.h 4274 2013-04-09 20:10:23Z msweet $" * * Private PPD definitions for CUPS. * @@ -221,5 +221,5 @@ extern const char *_pwgPageSizeForMedia(pwg_media_t *media, #endif /* !_CUPS_PPD_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: ppd-private.h 4274 2013-04-09 20:10:23Z msweet $". */ diff --git a/cups/ppd.c b/cups/ppd.c index 6813ea0e6..c172c3d74 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ppd.c 10996 2013-05-29 11:51:34Z msweet $" * * PPD file routines for CUPS. * @@ -3394,5 +3394,5 @@ ppd_update_filters(ppd_file_t *ppd,/* I - PPD file */ /* - * End of "$Id$". + * End of "$Id: ppd.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/ppd.h b/cups/ppd.h index 56d2b0eae..d234a59cd 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ppd.h 11056 2013-06-25 14:27:30Z msweet $" * * PostScript Printer Description definitions for CUPS. * @@ -474,5 +474,5 @@ extern int ppdPageSizeLimits(ppd_file_t *ppd, #endif /* !_CUPS_PPD_H_ */ /* - * End of "$Id$". + * End of "$Id: ppd.h 11056 2013-06-25 14:27:30Z msweet $". */ diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 87ed7b724..657e1fef7 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: pwg-media.c 11240 2013-08-14 20:33:55Z msweet $" * * PWG media name API implementation for CUPS. * @@ -1185,5 +1185,5 @@ pwg_scan_measurement( /* - * End of "$Id$". + * End of "$Id: pwg-media.c 11240 2013-08-14 20:33:55Z msweet $". */ diff --git a/cups/pwg-private.h b/cups/pwg-private.h index d012e308f..1f1bc7cff 100644 --- a/cups/pwg-private.h +++ b/cups/pwg-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: pwg-private.h 11240 2013-08-14 20:33:55Z msweet $" * * Private PWG media API definitions for CUPS. * @@ -74,5 +74,5 @@ extern const pwg_media_t *_pwgMediaTable(size_t *num_media); #endif /* !_CUPS_PWG_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: pwg-private.h 11240 2013-08-14 20:33:55Z msweet $". */ diff --git a/cups/pwg.h b/cups/pwg.h index 505778e15..43e0e1c84 100644 --- a/cups/pwg.h +++ b/cups/pwg.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: pwg.h 4274 2013-04-09 20:10:23Z msweet $" * * PWG media API definitions for CUPS. * @@ -90,5 +90,5 @@ extern pwg_media_t *pwgMediaForSize(int width, int length) _CUPS_API_1_7; #endif /* !_CUPS_PWG_H_ */ /* - * End of "$Id$". + * End of "$Id: pwg.h 4274 2013-04-09 20:10:23Z msweet $". */ diff --git a/cups/raster-private.h b/cups/raster-private.h index 0e9118fcb..ebd5d7210 100644 --- a/cups/raster-private.h +++ b/cups/raster-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: raster-private.h 3794 2012-04-23 22:44:16Z msweet $" * * Private image library definitions for CUPS. * @@ -62,5 +62,5 @@ extern void _cupsRasterClearError(void); #endif /* !_CUPS_RASTER_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: raster-private.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/raster.h b/cups/raster.h index cfacc906d..dde34f249 100644 --- a/cups/raster.h +++ b/cups/raster.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: raster.h 4027 2012-11-16 01:00:05Z msweet $" * * Raster file definitions for CUPS. * @@ -401,5 +401,5 @@ extern cups_raster_t *cupsRasterOpenIO(cups_raster_iocb_t iocb, void *ctx, #endif /* !_CUPS_RASTER_H_ */ /* - * End of "$Id$". + * End of "$Id: raster.h 4027 2012-11-16 01:00:05Z msweet $". */ diff --git a/cups/request.c b/cups/request.c index 0ccb49965..817169b6a 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: request.c 11174 2013-07-23 12:33:52Z msweet $" * * IPP utilities for CUPS. * @@ -1177,5 +1177,5 @@ _cupsSetHTTPError(http_status_t status) /* I - HTTP status code */ /* - * End of "$Id$". + * End of "$Id: request.c 11174 2013-07-23 12:33:52Z msweet $". */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index cec6372a7..cad2a2b40 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: sidechannel.c 10996 2013-05-29 11:51:34Z msweet $" * * Side-channel API code for CUPS. * @@ -638,5 +638,5 @@ cupsSideChannelWrite( /* - * End of "$Id$". + * End of "$Id: sidechannel.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 48353d1ee..4694bb974 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: sidechannel.h 10996 2013-05-29 11:51:34Z msweet $" * * Side-channel API definitions for CUPS. * @@ -143,5 +143,5 @@ extern cups_sc_status_t cupsSideChannelSNMPWalk(const char *oid, double timeout, #endif /* !_CUPS_SIDECHANNEL_H_ */ /* - * End of "$Id$". + * End of "$Id: sidechannel.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/snmp-private.h b/cups/snmp-private.h index 49f5b60fa..9661243b7 100644 --- a/cups/snmp-private.h +++ b/cups/snmp-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: snmp-private.h 3794 2012-04-23 22:44:16Z msweet $" * * Private SNMP definitions for CUPS. * @@ -142,5 +142,5 @@ extern int _cupsSNMPWrite(int fd, http_addr_t *address, int version, /* - * End of "$Id$". + * End of "$Id: snmp-private.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/snmp.c b/cups/snmp.c index 034db89a9..b50d3d57a 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: snmp.c 4167 2013-02-04 19:27:13Z msweet $" * * SNMP functions for CUPS. * @@ -1729,5 +1729,5 @@ snmp_set_error(cups_snmp_t *packet, /* I - Packet */ /* - * End of "$Id$". + * End of "$Id: snmp.c 4167 2013-02-04 19:27:13Z msweet $". */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 9af6b90f8..4029d2c1d 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: snprintf.c 10996 2013-05-29 11:51:34Z msweet $" * * snprintf functions for CUPS. * @@ -361,6 +361,6 @@ _cups_snprintf(char *buffer, /* O - Output buffer */ /* - * End of "$Id$". + * End of "$Id: snprintf.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/sspi.c b/cups/sspi.c index 0efcb5679..ff79e5a68 100644 --- a/cups/sspi.c +++ b/cups/sspi.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: sspi.c 3247 2011-05-12 06:22:31Z msweet $" * * Windows SSPI SSL implementation for CUPS. * @@ -1481,5 +1481,5 @@ cleanup: /* - * End of "$Id$". + * End of "$Id: sspi.c 3247 2011-05-12 06:22:31Z msweet $". */ diff --git a/cups/string-private.h b/cups/string-private.h index 8255bfdfb..305983ebd 100644 --- a/cups/string-private.h +++ b/cups/string-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: string-private.h 11021 2013-06-06 22:08:14Z msweet $" * * Private string definitions for CUPS. * @@ -210,5 +210,5 @@ extern double _cupsStrScand(const char *buf, char **bufptr, #endif /* !_CUPS_STRING_H_ */ /* - * End of "$Id$". + * End of "$Id: string-private.h 11021 2013-06-06 22:08:14Z msweet $". */ diff --git a/cups/string.c b/cups/string.c index 7a862f661..16a3d95a4 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: string.c 10996 2013-05-29 11:51:34Z msweet $" * * String functions for CUPS. * @@ -759,5 +759,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ /* - * End of "$Id$". + * End of "$Id: string.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/tempfile.c b/cups/tempfile.c index 75c95d6fb..6973702c1 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: tempfile.c 10996 2013-05-29 11:51:34Z msweet $" * * Temp file utilities for CUPS. * @@ -229,5 +229,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ /* - * End of "$Id$". + * End of "$Id: tempfile.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/testadmin.c b/cups/testadmin.c index 28dafa7f2..04b02f1c9 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testadmin.c 10996 2013-05-29 11:51:34Z msweet $" * * Admin function test program for CUPS. * @@ -117,5 +117,5 @@ show_settings( /* - * End of "$Id$". + * End of "$Id: testadmin.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/testarray.c b/cups/testarray.c index d3e677427..8003dfc31 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testarray.c 10996 2013-05-29 11:51:34Z msweet $" * * Array test program for CUPS. * @@ -558,5 +558,5 @@ load_words(const char *filename, /* I - File to load */ /* - * End of "$Id$". + * End of "$Id: testarray.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/testconflicts.c b/cups/testconflicts.c index 269c53ec3..0ccca8252 100644 --- a/cups/testconflicts.c +++ b/cups/testconflicts.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $" * * PPD constraint test program for CUPS. * @@ -134,5 +134,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/cups/testcups.c b/cups/testcups.c index b4b79569c..0f6c24e75 100644 --- a/cups/testcups.c +++ b/cups/testcups.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testcups.c 11205 2013-07-31 18:06:15Z msweet $" * * CUPS API test program for CUPS. * @@ -589,5 +589,5 @@ show_diffs(cups_dest_t *a, /* I - First destination */ /* - * End of "$Id$". + * End of "$Id: testcups.c 11205 2013-07-31 18:06:15Z msweet $". */ diff --git a/cups/testfile.c b/cups/testfile.c index e3b44638b..2c86d821d 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testfile.c 10996 2013-05-29 11:51:34Z msweet $" * * File test program for CUPS. * @@ -817,5 +817,5 @@ read_write_tests(int compression) /* I - Use compression? */ /* - * End of "$Id$". + * End of "$Id: testfile.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/testhttp.c b/cups/testhttp.c index a1fbc37aa..71fe4df84 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,22 +1,18 @@ /* - * "$Id$" + * "$Id: testhttp.c 11445 2013-12-05 19:57:43Z msweet $" * - * HTTP test program for CUPS. + * HTTP test program for CUPS. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Main entry. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -105,6 +101,9 @@ static uri_test_t uri_tests[] = /* URI test data */ { HTTP_URI_STATUS_OK, "socket://192.168.1.1:9101/", "socket", "", "192.168.1.1", "/", 9101, 9101, HTTP_URI_CODING_MOST }, + { HTTP_URI_STATUS_OK, "tel:8005551212", + "tel", "", "", "8005551212", 0, 0, + HTTP_URI_CODING_MOST }, { HTTP_URI_STATUS_OK, "ipp://username:password@[v1.fe80::200:1234:5678:9abc+eth0]:999/ipp", "ipp", "username:password", "fe80::200:1234:5678:9abc%eth0", "/ipp", 999, 999, HTTP_URI_CODING_MOST }, @@ -832,5 +831,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testhttp.c 11445 2013-12-05 19:57:43Z msweet $". */ diff --git a/cups/testi18n.c b/cups/testi18n.c index 84645a859..e5d3b8c10 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testi18n.c 10996 2013-05-29 11:51:34Z msweet $" * * Internationalization test for CUPS. * @@ -615,5 +615,5 @@ print_utf8(const char *msg, /* I - Message String */ /* - * End of "$Id$" + * End of "$Id: testi18n.c 10996 2013-05-29 11:51:34Z msweet $" */ diff --git a/cups/testipp.c b/cups/testipp.c index c96a4b05b..decbfefa9 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testipp.c 11215 2013-08-02 15:24:51Z msweet $" * * IPP test program for CUPS. * @@ -1019,5 +1019,5 @@ write_cb(_ippdata_t *data, /* I - Data */ /* - * End of "$Id$". + * End of "$Id: testipp.c 11215 2013-08-02 15:24:51Z msweet $". */ diff --git a/cups/testlang.c b/cups/testlang.c index 701c14db4..7c16f821b 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testlang.c 10996 2013-05-29 11:51:34Z msweet $" * * Localization test program for CUPS. * @@ -110,5 +110,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testlang.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/testoptions.c b/cups/testoptions.c index 1cd72794f..d14b64f8d 100644 --- a/cups/testoptions.c +++ b/cups/testoptions.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testoptions.c 1992 2010-03-24 14:32:08Z msweet $" * * Option test program for CUPS. * @@ -112,5 +112,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testoptions.c 1992 2010-03-24 14:32:08Z msweet $". */ diff --git a/cups/testppd.c b/cups/testppd.c index aee7db465..640c4801f 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testppd.c 11060 2013-06-25 15:02:18Z msweet $" * * PPD test program for CUPS. * @@ -1109,5 +1109,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: testppd.c 11060 2013-06-25 15:02:18Z msweet $". */ diff --git a/cups/testpwg.c b/cups/testpwg.c index dfa9f402a..c054accb6 100644 --- a/cups/testpwg.c +++ b/cups/testpwg.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testpwg.c 11240 2013-08-14 20:33:55Z msweet $" * * PWG test program for CUPS. * @@ -566,5 +566,5 @@ test_ppd_cache(_ppd_cache_t *pc, /* I - PWG mapping data */ /* - * End of "$Id$". + * End of "$Id: testpwg.c 11240 2013-08-14 20:33:55Z msweet $". */ diff --git a/cups/testsnmp.c b/cups/testsnmp.c index f1498c834..b60c2b795 100644 --- a/cups/testsnmp.c +++ b/cups/testsnmp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testsnmp.c 3411 2011-09-07 22:31:27Z msweet $" * * SNMP test program for CUPS. * @@ -300,5 +300,5 @@ usage(void) /* - * End of "$Id$". + * End of "$Id: testsnmp.c 3411 2011-09-07 22:31:27Z msweet $". */ diff --git a/cups/thread-private.h b/cups/thread-private.h index b16eec187..3409be44f 100644 --- a/cups/thread-private.h +++ b/cups/thread-private.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $" * * Private threading definitions for CUPS. * @@ -94,5 +94,5 @@ extern int _cupsThreadCreate(_cups_thread_func_t func, void *arg); #endif /* !_CUPS_THREAD_PRIVATE_H_ */ /* - * End of "$Id$". + * End of "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/thread.c b/cups/thread.c index da1882e9d..0f623298b 100644 --- a/cups/thread.c +++ b/cups/thread.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: thread.c 3794 2012-04-23 22:44:16Z msweet $" * * Threading primitives for CUPS. * @@ -332,5 +332,5 @@ _cupsThreadCreate( /* - * End of "$Id$". + * End of "$Id: thread.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/transcode.c b/cups/transcode.c index 380807f95..131b0741c 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: transcode.c 10996 2013-05-29 11:51:34Z msweet $" * * Transcoding support for CUPS. * @@ -716,5 +716,5 @@ cupsUTF32ToUTF8( /* - * End of "$Id$" + * End of "$Id: transcode.c 10996 2013-05-29 11:51:34Z msweet $" */ diff --git a/cups/transcode.h b/cups/transcode.h index cafea33c5..da95d0cd6 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: transcode.h 10996 2013-05-29 11:51:34Z msweet $" * * Transcoding definitions for CUPS. * @@ -77,5 +77,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, /* - * End of "$Id$" + * End of "$Id: transcode.h 10996 2013-05-29 11:51:34Z msweet $" */ diff --git a/cups/usersys.c b/cups/usersys.c index 9a2df68b6..70372b41e 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,43 +1,18 @@ /* - * "$Id$" + * "$Id: usersys.c 11510 2014-01-08 16:00:25Z msweet $" * - * User, system, and password routines for CUPS. + * User, system, and password routines for CUPS. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * cupsEncryption() - Get the current encryption settings. - * cupsGetPassword() - Get a password from the user. - * cupsGetPassword2() - Get a password from the user using the advanced - * password callback. - * cupsServer() - Return the hostname/address of the current - * server. - * cupsSetClientCertCB() - Set the client certificate callback. - * cupsSetCredentials() - Set the default credentials to be used for - * SSL/TLS connections. - * cupsSetEncryption() - Set the encryption preference. - * cupsSetPasswordCB() - Set the password callback for CUPS. - * cupsSetPasswordCB2() - Set the advanced password callback for CUPS. - * cupsSetServer() - Set the default server name and port. - * cupsSetServerCertCB() - Set the server certificate callback. - * cupsSetUser() - Set the default user name. - * cupsSetUserAgent() - Set the default HTTP User-Agent string. - * cupsUser() - Return the current user's name. - * cupsUserAgent() - Return the default HTTP User-Agent string. - * _cupsGetPassword() - Get a password from the user. - * _cupsGSSServiceName() - Get the GSS (Kerberos) service name. - * _cupsSetDefaults() - Set the default server, port, and encryption. - * cups_read_client_conf() - Read a client.conf file. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -875,7 +850,25 @@ _cupsSetDefaults(void) cups_expiredcerts = getenv("CUPS_EXPIREDCERTS"); if ((cups_user = getenv("CUPS_USER")) == NULL) - cups_user = getenv("USER"); + { + /* + * Try the USER environment variable... + */ + + if ((cups_user = getenv("USER")) != NULL) + { + /* + * Validate USER matches the current UID, otherwise don't allow it to + * override things... This makes sure that printing after doing su or + * sudo records the correct username. + */ + + struct passwd *pw; /* Account information */ + + if ((pw = getpwnam(cups_user)) == NULL || pw->pw_uid != getuid()) + cups_user = NULL; + } + } /* * Then, if needed, read the ~/.cups/client.conf or /etc/cups/client.conf @@ -885,7 +878,13 @@ _cupsSetDefaults(void) if (cg->encryption == (http_encryption_t)-1 || !cg->server[0] || !cg->user[0] || !cg->ipp_port) { +# ifdef HAVE_GETEUID + if ((geteuid() == getuid() || !getuid()) && getegid() == getgid() && (home = getenv("HOME")) != NULL) +# elif !defined(WIN32) + if (getuid() && (home = getenv("HOME")) != NULL) +# else if ((home = getenv("HOME")) != NULL) +# endif /* HAVE_GETEUID */ { /* * Look for ~/.cups/client.conf... @@ -1137,5 +1136,5 @@ cups_read_client_conf( /* - * End of "$Id$". + * End of "$Id: usersys.c 11510 2014-01-08 16:00:25Z msweet $". */ diff --git a/cups/util.c b/cups/util.c index 8b3070917..602b6b683 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: util.c 10996 2013-05-29 11:51:34Z msweet $" * * Printing utilities for CUPS. * @@ -1850,5 +1850,5 @@ cups_get_printer_uri( /* - * End of "$Id$". + * End of "$Id: util.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/cups/versioning.h b/cups/versioning.h index 6e9be4d15..fe2e30bf7 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: versioning.h 11056 2013-06-25 14:27:30Z msweet $" * * API versioning definitions for CUPS. * @@ -157,5 +157,5 @@ #endif /* !_CUPS_VERSIONING_H_ */ /* - * End of "$Id$". + * End of "$Id: versioning.h 11056 2013-06-25 14:27:30Z msweet $". */ diff --git a/data/Makefile b/data/Makefile index 4f7f68034..7753b7dbe 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Datafile makefile for CUPS. # @@ -146,5 +146,5 @@ uninstall: # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/data/epson.h b/data/epson.h index 13cb1a346..1b0fe9fe4 100644 --- a/data/epson.h +++ b/data/epson.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $" * * This file contains model number definitions for the CUPS sample * ESC/P driver. @@ -23,5 +23,5 @@ /* - * End of "$Id$". + * End of "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $". */ diff --git a/data/hp.h b/data/hp.h index c70034316..3a5ba3dab 100644 --- a/data/hp.h +++ b/data/hp.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $" * * This file contains model number definitions for the CUPS sample * HP driver. @@ -20,5 +20,5 @@ /* - * End of "$Id$". + * End of "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $". */ diff --git a/data/label.h b/data/label.h index 4b6fba64f..38cdc37b5 100644 --- a/data/label.h +++ b/data/label.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: label.h 624 2008-02-16 00:27:39Z msweet $" * * This file contains model number definitions for the CUPS sample * label printer driver. @@ -24,5 +24,5 @@ #define INTELLITECH_PCL 0x20 /* Intellitech PCL-based printers */ /* - * End of "$Id$". + * End of "$Id: label.h 624 2008-02-16 00:27:39Z msweet $". */ diff --git a/desktop/Makefile b/desktop/Makefile index 9d786f6f0..c4fdd7679 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $" # # Desktop makefile for CUPS. # @@ -131,5 +131,5 @@ uninstall: # -# End of "$Id$". +# End of "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $". # diff --git a/doc/Makefile b/doc/Makefile index 620ad128c..0db512cc0 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 11109 2013-07-08 21:15:13Z msweet $" # # Documentation makefile for CUPS. # diff --git a/doc/ca/index.html.in b/doc/ca/index.html.in index 77542d3ba..9ca3f8fc6 100644 --- a/doc/ca/index.html.in +++ b/doc/ca/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS i el seu logotip són marques registrades de -Apple Inc. CUPS té copyright 2007-2013 d'Apple +Apple Inc. CUPS té copyright 2007-2014 d'Apple Inc. Tots els drets reservats. diff --git a/doc/cs/index.html.in b/doc/cs/index.html.in index 38f4a6f48..a5641f6f8 100644 --- a/doc/cs/index.html.in +++ b/doc/cs/index.html.in @@ -101,7 +101,7 @@ HEIGHT="128" ALT="CUPS">   CUPS a logo CUPS jsou ochranné známky společnosti Apple Inc. CUPS je chráněn autorskými -právy 2007-2013 Apple Inc. VÅ¡echna práva vyhrazena. +právy 2007-2014 Apple Inc. VÅ¡echna práva vyhrazena. diff --git a/doc/es/index.html.in b/doc/es/index.html.in index d4ef79759..d62bce48e 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -101,7 +101,7 @@ HEIGHT="128" ALT="CUPS">   CUPS y el logo de CUPS son marcas registradas de Apple Inc. Los derechos -de copia de CUPS 2007-2013 son de Apple Inc. Todos los derechos reservados. +de copia de CUPS 2007-2014 son de Apple Inc. Todos los derechos reservados. diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in index 3345a489b..23ca4f9c0 100644 --- a/doc/fr/index.html.in +++ b/doc/fr/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS et le logo CUPS sont des marques déposées de -Apple Inc. CUPS est sous copyright 2007-2013 Apple +Apple Inc. CUPS est sous copyright 2007-2014 Apple Inc. Tous droits réservés. diff --git a/doc/help/spec-cmp.html b/doc/help/spec-cmp.html index def4599f8..9b01233ce 100644 --- a/doc/help/spec-cmp.html +++ b/doc/help/spec-cmp.html @@ -1,4 +1,4 @@ - + @@ -11,9 +11,10 @@

This developer guide documents the guidelines and processes we use when developing and maintaining CUPS and related software. Our goal is to provide reliable and efficient software and documentation that addresses the needs of our users.

+

Overview

-

CUPS is developed by Apple Inc. and distributed as open source software under a combination of GNU GPL2 and GNU LGPL2 licenses with exceptions to allow linking to OpenSSL (which has a GPL-incompatible license) and for developers on Apple's operating systems to develop CUPS-based software until alternate license terms. Significant contributions to CUPS must be licensed to Apple using the Apple Contributor Agreement.

+

CUPS is developed by Apple Inc. and distributed as open source software under a combination of GNU GPL2 and GNU LGPL2 licenses with exceptions to allow linking to OpenSSL (which has a GPL-incompatible license) and for developers on Apple's operating systems to develop CUPS-based software until alternate license terms. Significant contributions to CUPS must be licensed to Apple using the Apple Contributor Agreement.

Apple releases updates to the CUPS software approximately every three months. Each release has a version number consisting of the major version (currently 1), minor version (currently 6), and patch version (starting at 0) separated by the period, for example "1.6.0". Releases where only the patch version number changes will contain only bug fixes to the previous release, for example "1.6.1" includes bug fixes for the "1.6.0" release. New features require the major or minor version numbers to change, for example "1.6.0" release contains new features compared to the "1.5.3" release. Multiple beta and "candidate" releases generally precede each new feature release, for example "1.5b1", "1.5b2", and "1.5rc1" preceded the "1.5.0" release. Finally, we also post regular Subversion snapshot releases, for example "1.6svn-r10486", which represent a snapshot of the development for the next feature release.

@@ -26,48 +27,26 @@

How to Contact the Developers

-

The CUPS Mailing Lists are the primary means of asking questions and informally discussing issues and feature requests with the CUPS developers and other experienced CUPS users and developers. Table 1 shows the available mailing lists and their focus:

- -
- - - - - - - - - - - - - - - - - - - - - -
Table 1: CUPS Mailing Lists
ListFocus/Purpose
cupsGeneral discussion and usage questions for the CUPS software
cups-bugsDiscussion of bugs and issues in the CUPS software
cups-commitReport of all commits to the Subversion repository (read-only)
cups-devDevelopment questions and discussion of new features in the CUPS software
+

The CUPS.org mailing lists are the primary means of asking questions and informally discussing issues and feature requests with the CUPS developers and other experienced CUPS users and developers. The cups@cups.org mailing list is intended for CUPS usage questions and new software announcements while the cups-devel@cups.org mailing list provides a forum for CUPS developers and monitoring new bugs.

How to Submit a Bug Report or Feature Request

-

The CUPS "Bugs & Features" page provides access to the CUPS Software Trouble Report (STR) database and is the formal way to submit a bug report or feature request to the CUPS developers. Please note, however, that we do not provide answers to usage questions or resolve problems in third-party software on this page - use the CUPS Mailing Lists for that instead.

+

The CUPS.org Bugs page provides access to the CUPS Software Trouble Report (STR) database and is the formal way to submit a bug report or feature request to the CUPS developers. Please note, however, that we do not provide answers to usage questions or resolve problems in third-party software on this page - use the CUPS.org mailing lists for that instead.

+ +

Unlike discussions that occur on the CUPS.org mailing lists, formal bug reports and feature requests must be acted on by the CUPS developers. This does not mean that every bug report is resolved or every feature request is implemented, but we do respond and keep track of them all for posterity.

-

Unlike discussions that occur on the CUPS Mailing Lists, formal bug reports and feature requests must be acted on by the CUPS developers. This does not mean that every bug report is resolved or every feature request is implemented, but we do respond and keep track of them all for posterity.

+
Note: -
Please use the search feature of the Bugs & Features page before submitting a new bug report or feature request. If you see an existing report that matches your issue, please post a message to that report ("I have this issue as well", "I would also like to see", etc.) rather than submitting a new report. This helps speed the resolution of your issue by reducing the CUPS developers' work load and identifying popular issues.
+

Please use the search feature of the Bugs page before submitting a new bug report or feature request. If you see an existing report that matches your issue, please post a message to that report ("I have this issue as well", "I would also like to see", etc.) rather than submitting a new report. This helps speed the resolution of your issue by reducing the CUPS developers' work load and identifying popular issues.

How to Prepare a Patch

-

When submitting a bug report or feature request, you can include patch files that resolve the bug or implement the feature to speed the inclusion of that bug fix or feature in a new CUPS release. For changes to existing files, we prefer a unified diff against the current Subversion trunk branch, which can be generated easily using the following Subversion command:

+

When submitting a bug report or feature request, you can include patch files that resolve the bug or implement the feature to speed the inclusion of that bug fix or feature in a new CUPS release. For changes to existing files, we prefer a unified diff against the current GIT "master" branch, which can be generated easily using the following Git command:

-svn diff >filename.patch
+git format-patch remotes/trunk >filename.patch

If you produce a patch using a released source archive, use one of the following commands instead:

@@ -82,7 +61,7 @@ diff -urN olddirectory directory >filename.patch
Note: -

Patches and files must conform to the standards outlined in the "Coding Guidelines" and "Makefile Guidelines" sections in this document. In addition, since Apple Inc. provides CUPS under multiple licenses, we require that you license significant changes and files to us for inclusion in CUPS. The CUPS developers will inform you if licensing is required.

+

Patches and files must conform to the standards outlined in the "Coding Guidelines" and "Makefile Guidelines" sections in this document. In addition, since Apple Inc. provides CUPS under multiple licenses, we require that you license significant changes and files to us for inclusion in CUPS. The CUPS developers will inform you if licensing is required.

Software Development Practices

@@ -151,6 +130,8 @@ MAJOR.MINORsvn-rREV subversion.apache.org +

A public read-only Git mirror is maintained for external developers. Details can be found on the CUPS.org Software page.

+

Source files are "checked in" with each change so that modifications can be tracked, and each checkin must reference any applicable STRs. The following format must be used for commit log messages:

@@ -159,27 +140,7 @@ Summary of the change on one line followed by bug number (STR #NNNN)
 Detailed list of changes.
-

Primary development occurs on the trunk branch, with changes merged back to release branches as needed. Table 2 shows the URLs developers use for the various CUPS sub-projects and branches:

- -
- - - - - - - - - - - - - - - - - -
Table 2: CUPS Subversion URLs
URLPurpose
https://svn.cups.org/public/cups/trunk/Primary CUPS development branch
https://svn.cups.org/public/cups/branches/CUPS maintenance branches (merge-only)
https://svn.cups.org/public/cups/tags/CUPS release tags (read-only)
+

Primary development occurs on the trunk branch, with changes merged back to release branches as needed.

The branch for a MAJOR.MINOR release are created when the first production release (MAJOR.MINOR.0) is made using the name "branch-MAJOR.MINOR". Release tags are created for every beta, candidate, and production release using the name "release-MAJOR.MINORbNUMBER", "release-MAJOR.MINORrcNUMBER", or "release-MAJOR.MINOR.PATCH", respectively. No release tags are created for developer snapshots.

@@ -193,7 +154,7 @@ Detailed list of changes.

Build System

-

The CUPS build system uses GNU autoconf to tailor the library to the local operating system. Project files for the current release of Visual C++ are also provided for Microsoft Windows®. To improve portability, makefiles must not make use of features unique to GNU make. See the Makefile Guidelines section for a description of the allowed make features and makefile guidelines.

+

The CUPS build system uses GNU autoconf to tailor the library to the local operating system. Project files for the current release of Microsoft Visual Studio are also provided for Microsoft Windows®. To improve portability, makefiles must not make use of features unique to GNU make. See the Makefile Guidelines section for a description of the allowed make features and makefile guidelines.

Additional GNU build programs such as GNU automake and GNU libtool must not be used. GNU automake produces non-portable makefiles which depend on GNU-specific extensions, and GNU libtool is not portable or reliable enough for CUPS.

@@ -216,7 +177,7 @@ tools/makesrcdist version rpmbuild -ta cups-version-source.tar.gz -

The cups.list file is generated by the configure script and produces binary packages for many platforms using the EPM software. Table 3 shows the targets that are available for each type of binary package:

+

The cups.list file is generated by the configure script and produces binary packages for many platforms using the EPM software. Table 3 shows the targets that are available for each type of binary package:

@@ -224,10 +185,6 @@ rpmbuild -ta cups-version-source.tar.gz - - - - @@ -236,10 +193,6 @@ rpmbuild -ta cups-version-source.tar.gz - - - - @@ -252,18 +205,10 @@ rpmbuild -ta cups-version-source.tar.gz - - - - - - - -
Table 3: Binary Package Targets
Target Type of Package
aixAIX installp
bsd *BSD pkg_installdeb Debian dpkg
depotHP-UX swinstall
epm Portable tarball with install scriptrpm RPM binary
setldTru64 UNIX setld
slackware Slackware install
swinstallHP-UX swinstall

Finally, the tools/testrpm and tools/testosx scripts can be used to create binary packages from the current working copy for testing on Linux and OS X, respectively:

@@ -290,7 +235,7 @@ make test

Trouble Report Processing

-

A Software Trouble Report ("STR") must be submitted every time a user or vendor experiences a problem with the CUPS software. Trouble reports are maintained on the Bugs & Features page with one of the following states:

+

A Software Trouble Report ("STR") must be submitted every time a user or vendor experiences a problem with the CUPS software. Trouble reports are maintained on the Bugs page with one of the following states:

    @@ -407,34 +352,28 @@ make test

    The ".cxx" extension is used because it is the only common C++ extension between Linux, OS X, UNIX, and Windows.

    -

    The top of each source file contains a header giving the name of the file, the purpose or nature of the source file, the copyright and licensing notice, and the functions contained in the file. The file name and revision information is provided by the Subversion "$Id$" tag:

    +

    The top of each source file contains a header giving the name of the file, the purpose or nature of the source file, and the copyright and licensing notice. The file name and revision information is provided by the Subversion "$Id$" tag:

     /*
  * "$Id$"
  *
- *   Description of file contents.
- *
- *   Copyright 2012 by Apple Inc.
+ * Description of file contents.
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * Copyright 2013 by Apple Inc.
  *
- * Contents:
- *
- *   function1() - Description 1.
- *   function2() - Description 2.
- *   function3() - Description 3.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  */

    For source files that are subject to the Apple OS-Developed Software exception, the following additional comment appears after the contact information:

    - *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.

    The bottom of each source file contains a trailer giving the name of the file using the Subversion "$Id$" tag. The primary purpose of this is to mark the end of a source file; if the trailer is missing it is possible that code has been lost near the end of the file:

    @@ -446,6 +385,17 @@ make test +

    Header Files

    + +

    All public header files must include the versioning.h header file, or a header that does so. Function declarations are then "decorated" with the correct _CUPS_API_major_minor macro to define its availability based on the build environment, for example:

    + +
    +extern int cupsDoThis(int foo, int bar) _CUPS_API_2_0;
+
    + +

    Private API header files must be named with the suffix "-private", for example the cups.h header file defines all of the public CUPS APIs while the cups-private.h header file defines all of the private CUPS APIs as well. Typically a private API header file will include the corresponding public API header file.

    + +

    Comments

    All source code utilizes block comments within functions to describe the operations being performed by a group of statements; avoid putting a comment per line unless absolutely necessary, and then consider refactoring the code so that it is not necessary. C source files use the block comment format ("/* comment */") since many vendor C compilers still do not support C99/C++ comments ("// comment"):

    @@ -637,15 +587,15 @@ enum # # "$Id$" # -# Makefile for ... +# Makefile for ... # -# Copyright 2012 by Apple Inc. +# Copyright 2013 by Apple Inc. # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # @@ -881,7 +831,7 @@ libname.a: $(OBJECTS)

    Shared Libraries

    -

    Shared libraries have a prefix of "lib" and the extension ".dylib", ".sl", ".so", or "_s.a" depending on the operating system. A typical shared library is composed of several targets that look like:

    +

    Shared libraries have a prefix of "lib" and the extension ".dylib" or ".so" depending on the operating system. A typical shared library is composed of several targets that look like:

     libname.so: $(OBJECTS)
@@ -891,13 +841,6 @@ libname.so: $(OBJECTS)
 → $(LN) libname.so.$(DSOVERSION) libname.so.$(DSOMAJOR)
 → $(LN) libname.so.$(DSOVERSION) libname.so
 
-libname.sl: $(OBJECTS)
-→ echo $(DSOCOMMAND) libname.sl.$(DSOVERSION) ...
-→ $(DSOCOMMAND) libname.sl.$(DSOVERSION) $(OBJECTS)
-→ $(RM) libname.sl libname.sl.$(DSOMAJOR)
-→ $(LN) libname.sl.$(DSOVERSION) libname.sl.$(DSOMAJOR)
-→ $(LN) libname.sl.$(DSOVERSION) libname.sl
-
 libname.dylib: $(OBJECTS)
 → echo $(DSOCOMMAND) libname.$(DSOVERSION).dylib ...
 → $(DSOCOMMAND) libname.$(DSOVERSION).dylib \
@@ -909,14 +852,6 @@ libname.dylib: $(OBJECTS)
 → $(RM) libname.$(DSOMAJOR).dylib
 → $(LN) libname.$(DSOVERSION).dylib libname.$(DSOMAJOR).dylib
 → $(LN) libname.$(DSOVERSION).dylib libname.dylib
-
-libname_s.a: $(OBJECTS)
-→ echo $(DSOCOMMAND) libname_s.o ...
-→ $(DSOCOMMAND) libname_s.o $(OBJECTS) $(LIBS)
-→ echo $(LIBCOMMAND) libname_s.a libname_s.o
-→ $(RM) $@
-→ $(LIBCOMMAND) libname_s.a libname_s.o
-→ $(CHMOD) +x libname_s.a
    diff --git a/doc/index.html.in b/doc/index.html.in index 857a43049..460c33ba9 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS and the CUPS logo are trademarks of -Apple Inc. Copyright 2007-2013 Apple +Apple Inc. Copyright 2007-2014 Apple Inc. All rights reserved. diff --git a/doc/it/index.html.in b/doc/it/index.html.in index 939a2a60e..8f0c1e883 100644 --- a/doc/it/index.html.in +++ b/doc/it/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS e il logo di CUPS sono marchi registrati da -Apple Inc. Copyright 2007-2013 Apple +Apple Inc. Copyright 2007-2014 Apple Inc. Tutti i diritti sono riservati. diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index e62d8f1e9..73219abcf 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS and the CUPS logo are trademarks of -Apple Inc. CUPS is copyright 2007-2013 Apple +Apple Inc. CUPS is copyright 2007-2014 Apple Inc. All rights reserved. diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index d1300e12d..6ab2e52a9 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -97,7 +97,7 @@ HEIGHT="128" ALT="CUPS">   -CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены. +CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2014) компании Apple Inc. Все права защищены. diff --git a/examples/Makefile b/examples/Makefile index da08298b3..f4737a64d 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $" # # PPD compiler example makefile for CUPS. # @@ -124,5 +124,5 @@ uninstall: # -# End of "$Id$". +# End of "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $". # diff --git a/examples/ppdx.c b/examples/ppdx.c index 61588cad1..920f8db12 100644 --- a/examples/ppdx.c +++ b/examples/ppdx.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $" * * Example code for encoding and decoding large amounts of data in a PPD file. * This would typically be used in a driver to save configuration/state @@ -310,5 +310,5 @@ ppdxWriteData(const char *name, /* I - Base name of keyword */ /* - * End of "$Id$". + * End of "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/examples/ppdx.h b/examples/ppdx.h index 1be6928da..14f34b349 100644 --- a/examples/ppdx.h +++ b/examples/ppdx.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $" * * Header for PPD data encoding example code. * @@ -78,5 +78,5 @@ extern void ppdxWriteData(const char *name, const void *data, #endif /* !_PPDX_H */ /* - * End of "$Id$". + * End of "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/examples/testppdx.c b/examples/testppdx.c index f1c168688..372f3d554 100644 --- a/examples/testppdx.c +++ b/examples/testppdx.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $" * * Test program for PPD data encoding example code. * @@ -113,5 +113,5 @@ main(void) /* - * End of "$Id$". + * End of "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/examples/testppdx.ppd b/examples/testppdx.ppd index 179b1ec6c..2e58df66d 100644 --- a/examples/testppdx.ppd +++ b/examples/testppdx.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id$" +*% "$Id: testppdx.ppd 3833 2012-05-23 22:51:18Z msweet $" *% *% Test PPD file for data encoding example. *% @@ -109,7 +109,7 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id$". +*% End of "$Id: testppdx.ppd 3833 2012-05-23 22:51:18Z msweet $". *% *EXData0000: "eNqlVm1v2zYQ/hz/ipvWznLgl6T7siXrgCJ2AANBEyQpNmAtAlqiLG4SKZBU7LTIf9/dUW9Og32ZAFsieffcc88dKS2OR3AM0Zt1+ibCJxoA3EvnobJma0UJmbFwc7OEVHgBUicmVXoLci/KqpCAQznvHC9MWSmc3Smfn3WzdG2TBGYGPCJXVbqH2fIBQR+Wq5vb1cWH+9XyfRTBbNs" *EXData0001: "GcwTaG6zIqkrh7evgzDVk1Xb3MO7k9N3sHmCDxWRWeuk53KfSxf4paC087ZOvDLaTcF54WUptcdnoVO0KavaS9um7EBYCT6XAQhnK2n9E5hsEIc9yQ6XvUw8RkEelzKVVhQI2TAMEIXYzQGWClmoTU002L1GgmwVIpraF0ozXYoOGUkZXa0vVh/vVnO/91FA2+UqycHlpi5SyMWjhI0" diff --git a/filter/Makefile b/filter/Makefile index 08451e9c4..99d2ee050 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Filter makefile for CUPS. # @@ -398,5 +398,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/filter/commandtops.c b/filter/commandtops.c index fd8e35a02..a75809c24 100644 --- a/filter/commandtops.c +++ b/filter/commandtops.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: commandtops.c 3794 2012-04-23 22:44:16Z msweet $" * * PostScript command filter for CUPS. * @@ -534,5 +534,5 @@ report_levels(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id$". + * End of "$Id: commandtops.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/filter/common.c b/filter/common.c index b80f4d5b5..2d52e781c 100644 --- a/filter/common.c +++ b/filter/common.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: common.c 10996 2013-05-29 11:51:34Z msweet $" * * Common filter routines for CUPS. * @@ -531,5 +531,5 @@ WriteTextComment(const char *name, /* I - Comment name ("Title", etc.) */ /* - * End of "$Id$". + * End of "$Id: common.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/common.h b/filter/common.h index bbaf99eed..9693ce8d3 100644 --- a/filter/common.h +++ b/filter/common.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: common.h 10996 2013-05-29 11:51:34Z msweet $" * * Common filter definitions for CUPS. * @@ -74,5 +74,5 @@ extern void WriteTextComment(const char *name, const char *value); /* - * End of "$Id$". + * End of "$Id: common.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/error.c b/filter/error.c index c1cd0d3b1..994cfb86d 100644 --- a/filter/error.c +++ b/filter/error.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: error.c 10996 2013-05-29 11:51:34Z msweet $" * * Raster error handling for CUPS. * @@ -282,5 +282,5 @@ get_error_buffer(void) /* - * End of "$Id$". + * End of "$Id: error.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/gziptoany.c b/filter/gziptoany.c index a1b1e2b84..81a3f17d8 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: gziptoany.c 10996 2013-05-29 11:51:34Z msweet $" * * GZIP/raw pre-filter for CUPS. * @@ -108,5 +108,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: gziptoany.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/interpret.c b/filter/interpret.c index 77157fb97..4630beae0 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: interpret.c 10996 2013-05-29 11:51:34Z msweet $" * * PPD command interpreter for CUPS. * @@ -1684,5 +1684,5 @@ DEBUG_stack(_cups_ps_stack_t *st) /* I - Stack */ /* - * End of "$Id$". + * End of "$Id: interpret.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/pstops.c b/filter/pstops.c index 2230a8b61..49a6fa542 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: pstops.c 10996 2013-05-29 11:51:34Z msweet $" * * PostScript filter for CUPS. * @@ -3430,5 +3430,5 @@ write_options( /* - * End of "$Id$". + * End of "$Id: pstops.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/raster.c b/filter/raster.c index 801129e60..8dd76abe7 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: raster.c 10996 2013-05-29 11:51:34Z msweet $" * * Raster file routines for CUPS. * @@ -1475,5 +1475,5 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ /* - * End of "$Id$". + * End of "$Id: raster.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/rasterbench.c b/filter/rasterbench.c index 69e139d37..eacbd0eec 100644 --- a/filter/rasterbench.c +++ b/filter/rasterbench.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: rasterbench.c 10996 2013-05-29 11:51:34Z msweet $" * * Raster benchmark program for CUPS. * @@ -351,5 +351,5 @@ write_test(int fd, /* I - File descriptor to write to */ /* - * End of "$Id$". + * End of "$Id: rasterbench.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index 8257fec5b..e53acabfc 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: rastertoepson.c 10996 2013-05-29 11:51:34Z msweet $" * * EPSON ESC/P and ESC/P2 filter for CUPS. * @@ -1153,5 +1153,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: rastertoepson.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/rastertohp.c b/filter/rastertohp.c index ee6358ba9..5efad593b 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: rastertohp.c 10996 2013-05-29 11:51:34Z msweet $" * * Hewlett-Packard Page Control Language filter for CUPS. * @@ -882,5 +882,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: rastertohp.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index f5d80256a..1c495e65d 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: rastertolabel.c 10996 2013-05-29 11:51:34Z msweet $" * * Label printer filter for CUPS. * @@ -1297,5 +1297,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id$". + * End of "$Id: rastertolabel.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c index 622aa605a..97dab1cbc 100644 --- a/filter/rastertopwg.c +++ b/filter/rastertopwg.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: rastertopwg.c 3427 2011-09-20 18:40:57Z msweet $" * * CUPS raster to PWG raster format filter for CUPS. * @@ -457,5 +457,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id$". + * End of "$Id: rastertopwg.c 3427 2011-09-20 18:40:57Z msweet $". */ diff --git a/filter/testraster.c b/filter/testraster.c index 8920e2e77..8b682a5ab 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testraster.c 10996 2013-05-29 11:51:34Z msweet $" * * Raster test program routines for CUPS. * @@ -1074,5 +1074,5 @@ print_changes( /* - * End of "$Id$". + * End of "$Id: testraster.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/install-sh b/install-sh index 41d944e3e..956458fc8 100755 --- a/install-sh +++ b/install-sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id$" +# "$Id: install-sh 11025 2013-06-07 01:00:33Z msweet $" # # Install a program, script, or datafile. # diff --git a/locale/Makefile b/locale/Makefile index 1a977101b..29fc38ac0 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Locale file makefile for CUPS. # @@ -218,5 +218,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/locale/checkpo.c b/locale/checkpo.c index 64563f679..14e74a2fa 100644 --- a/locale/checkpo.c +++ b/locale/checkpo.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: checkpo.c 10996 2013-05-29 11:51:34Z msweet $" * * Verify that translations in the .po file have the same number and type of * printf-style format strings. @@ -409,5 +409,5 @@ free_formats(cups_array_t *fmts) /* I - Array of format strings */ /* - * End of "$Id$". + * End of "$Id: checkpo.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/locale/po2strings.c b/locale/po2strings.c index 754a487b4..49fba46b3 100644 --- a/locale/po2strings.c +++ b/locale/po2strings.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: po2strings.c 10996 2013-05-29 11:51:34Z msweet $" * * Convert a GNU gettext .po file to an Apple .strings file. * @@ -292,5 +292,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id$". + * End of "$Id: po2strings.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/locale/strings2po.c b/locale/strings2po.c index 8df9059be..489893238 100644 --- a/locale/strings2po.c +++ b/locale/strings2po.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: strings2po.c 10996 2013-05-29 11:51:34Z msweet $" * * Convert Apple .strings file (UTF-16 BE text file) to GNU gettext .po files. * @@ -171,5 +171,5 @@ write_po(FILE *po, /* I - .po file */ /* - * End of "$Id$". + * End of "$Id: strings2po.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/locale/translate.c b/locale/translate.c index 13228d27a..9523da9d7 100644 --- a/locale/translate.c +++ b/locale/translate.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: translate.c 10996 2013-05-29 11:51:34Z msweet $" * * HTTP-based translation program for CUPS. * @@ -435,5 +435,5 @@ write_string(cups_file_t *fp, /* I - File to write to */ /* - * End of "$Id$". + * End of "$Id: translate.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/man/Makefile b/man/Makefile index 1987acbb0..6074d0c34 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 11024 2013-06-06 23:11:13Z msweet $" # # Man page makefile for CUPS. # @@ -222,5 +222,5 @@ mantohtml: mantohtml.o # -# End of "$Id$". +# End of "$Id: Makefile 11024 2013-06-06 23:11:13Z msweet $". # diff --git a/man/backend.man b/man/backend.man index ebdd9d66a..a5fca5c00 100644 --- a/man/backend.man +++ b/man/backend.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: backend.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" Backend man page for CUPS. .\" @@ -168,5 +168,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: backend.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cancel.man b/man/cancel.man index 15adcb22d..17380fa0c 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cancel.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cancel man page for CUPS. .\" @@ -75,5 +75,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cancel.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/classes.conf.man b/man/classes.conf.man index 8a40a7d51..2e93fc8fd 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: classes.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" classes.conf man page for CUPS. .\" @@ -106,5 +106,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: classes.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/client.conf.man.in b/man/client.conf.man.in index a078ac9df..fd5236987 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: client.conf.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" client.conf man page for CUPS. .\" @@ -61,5 +61,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: client.conf.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-config.man b/man/cups-config.man index 69bad3c2e..b75527db5 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-config.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cups-config man page for CUPS. .\" @@ -113,5 +113,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-config.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in index 4aa8f432a..1c75f68b0 100644 --- a/man/cups-deviced.man.in +++ b/man/cups-deviced.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-deviced.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cups-deviced man page for CUPS. .\" @@ -40,5 +40,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-deviced.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in index 3cb3fef00..a3dd8d0e5 100644 --- a/man/cups-driverd.man.in +++ b/man/cups-driverd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-driverd.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cups-driverd man page for CUPS. .\" @@ -118,5 +118,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-driverd.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index c17490cf1..bfc46e70f 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-files.conf.man.in 11201 2013-07-26 21:27:27Z msweet $" .\" .\" cupsd.conf man page for CUPS. .\" @@ -148,5 +148,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-files.conf.man.in 11201 2013-07-26 21:27:27Z msweet $". .\" diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index e49c2ba54..d1cb61786 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-lpd.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cups-lpd man page for CUPS. .\" @@ -120,5 +120,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-lpd.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index 3e8bc78a4..261704fde 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-snmp.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" snmp.conf man page for CUPS. .\" @@ -74,5 +74,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-snmp.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in index ae07f248d..03ab2e077 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cups-snmp.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" SNMP backend man page for CUPS. .\" @@ -58,5 +58,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cups-snmp.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsaccept.man b/man/cupsaccept.man index 5a852a214..35f2cbfde 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsaccept.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" accept/reject man page for CUPS. .\" @@ -75,5 +75,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsaccept.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index 74cb0adb0..6117edd01 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsaddsmb.man.in 11206 2013-07-31 18:16:09Z msweet $" .\" .\" cupsaddsmb man page for CUPS. .\" @@ -172,5 +172,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsaddsmb.man.in 11206 2013-07-31 18:16:09Z msweet $". .\" diff --git a/man/cupsctl.man b/man/cupsctl.man index 68953c064..692d15a8c 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsctl.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupsctl man page for CUPS. .\" @@ -93,5 +93,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsctl.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 60c61f7da..3435f3939 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsd.conf.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cupsd.conf man page for CUPS. .\" @@ -521,5 +521,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsd.conf.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 9fdcc2227..6193de6b8 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsd.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cupsd man page for CUPS. .\" @@ -68,5 +68,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsd.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsenable.man b/man/cupsenable.man index e65a3b8ee..00d23eb2c 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsenable.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupsenable/cupsdisable man page for CUPS. .\" @@ -89,5 +89,5 @@ http://localhost:631/help Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsenable.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupsfilter.man b/man/cupsfilter.man index bfc532e35..e88d62be4 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupsfilter.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupsfilter man page for CUPS. .\" @@ -105,5 +105,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupsfilter.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index aea170bd1..dfc255ac4 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupstestdsc.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupstestdsc man page for CUPS. .\" @@ -46,5 +46,5 @@ Specification, Version 3.0. .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupstestdsc.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupstestppd.man b/man/cupstestppd.man index 56ac582b9..6f0eecead 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: cupstestppd.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupstestppd man page for CUPS. .\" @@ -161,5 +161,5 @@ Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: cupstestppd.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/filter.man b/man/filter.man index ff3ddcdd3..29239eace 100644 --- a/man/filter.man +++ b/man/filter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: filter.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" filter man page for CUPS. .\" @@ -234,5 +234,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: filter.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ippfind.man b/man/ippfind.man index 24c5a2660..ec2b5ce55 100644 --- a/man/ippfind.man +++ b/man/ippfind.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ippfind.man 11027 2013-06-07 01:45:14Z msweet $" .\" .\" ippfind man page for CUPS. .\" @@ -243,5 +243,5 @@ Values of TXT record \fIKEY\fR (uppercase). .SH COPYRIGHT Copyright 2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ippfind.man 11027 2013-06-07 01:45:14Z msweet $". .\" diff --git a/man/ipptool.man b/man/ipptool.man index 75567c11b..240c04450 100644 --- a/man/ipptool.man +++ b/man/ipptool.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ipptool.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ipptool man page for CUPS. .\" @@ -156,5 +156,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ipptool.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man index d3fbfb672..ed71842d7 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ipptoolfile.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ipptoolfile man page for CUPS. .\" @@ -621,5 +621,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ipptoolfile.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lp.man b/man/lp.man index 623849516..e07b3f1e1 100644 --- a/man/lp.man +++ b/man/lp.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lp.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lp man page for CUPS. .\" @@ -248,5 +248,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lp.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpadmin.man b/man/lpadmin.man index eda0aec6d..7119934b0 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpadmin.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpadmin man page for CUPS. .\" @@ -223,5 +223,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpadmin.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpc.man b/man/lpc.man index 5530eec5f..bbee8074c 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpc.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpc man page for CUPS. .\" @@ -67,5 +67,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpc.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpinfo.man b/man/lpinfo.man index 9a5527eef..0521c3a0c 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpinfo.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpinfo man page for CUPS. .\" @@ -111,5 +111,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpinfo.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpmove.man b/man/lpmove.man index b18d359e8..e7819d1cb 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpmove.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpmove man page for CUPS. .\" @@ -62,5 +62,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpmove.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index e04365b45..88072f935 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpoptions.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" lpoptions man page for CUPS. .\" @@ -131,5 +131,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpoptions.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/lppasswd.man b/man/lppasswd.man index 6424ba032..f21726d4c 100644 --- a/man/lppasswd.man +++ b/man/lppasswd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lppasswd.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpadmin man page for CUPS. .\" @@ -64,5 +64,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lppasswd.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpq.man b/man/lpq.man index 9a41b64bd..d922b0ae4 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpq.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpq man page for CUPS. .\" @@ -68,5 +68,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpq.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpr.man b/man/lpr.man index 73a8667d4..2325f8eae 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpr.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpr man page for CUPS. .\" @@ -118,5 +118,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpr.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lprm.man b/man/lprm.man index 7f12f7cac..33851fb6b 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lprm.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lprm man page for CUPS. .\" @@ -61,5 +61,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lprm.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpstat.man b/man/lpstat.man index cad3e4119..021be700c 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: lpstat.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpstat man page for CUPS. .\" @@ -139,5 +139,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: lpstat.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/mailto.conf.man b/man/mailto.conf.man index a16bb5485..a8dba7680 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: mailto.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" mailto.conf man page for CUPS. .\" @@ -56,5 +56,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: mailto.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/mantohtml.c b/man/mantohtml.c index 13e733697..512dda134 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: mantohtml.c 10996 2013-05-29 11:51:34Z msweet $" * * Man page to HTML conversion program. * @@ -716,5 +716,5 @@ strmove(char *d, /* I - Destination */ /* - * End of "$Id$". + * End of "$Id: mantohtml.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/man/mime.convs.man b/man/mime.convs.man index 146eb1372..108f1df4b 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: mime.convs.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" mime.convs man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: mime.convs.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/mime.types.man b/man/mime.types.man index f97d30887..707da56f9 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: mime.types.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" mime.types man page for CUPS. .\" @@ -111,5 +111,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: mime.types.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/notifier.man b/man/notifier.man index 411287868..4ae3b07e8 100644 --- a/man/notifier.man +++ b/man/notifier.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: notifier.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" notifier man page for CUPS. .\" @@ -153,5 +153,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: notifier.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdc.man b/man/ppdc.man index 1d74a1561..f489cd268 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ppdc.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdc man page for CUPS. .\" @@ -77,5 +77,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ppdc.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdcfile.man b/man/ppdcfile.man index d31db0886..a3c9cd849 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ppdcfile.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdcfile man page for CUPS. .\" @@ -166,5 +166,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ppdcfile.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdhtml.man b/man/ppdhtml.man index d0e0d98ba..3e1e4dc57 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ppdhtml.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdhtml man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ppdhtml.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdi.man b/man/ppdi.man index 124185770..f26f263a7 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ppdi.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdi man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ppdi.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdmerge.man b/man/ppdmerge.man index 95142e8ce..0a0c51825 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ppdmerge.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdmerge man page for CUPS. .\" @@ -43,5 +43,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ppdmerge.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdpo.man b/man/ppdpo.man index 8226e6419..f2b0a2b1b 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: ppdpo.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdpo man page for CUPS. .\" @@ -48,5 +48,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: ppdpo.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/printers.conf.man b/man/printers.conf.man index 02487daaa..1ab7876c2 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: printers.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" printers.conf man page for CUPS. .\" @@ -120,5 +120,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: printers.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index 1c5277a50..edb52ac15 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id$" +.\" "$Id: subscriptions.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" subscriptions.conf man page for CUPS. .\" @@ -85,5 +85,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id$". +.\" End of "$Id: subscriptions.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/monitor/Makefile b/monitor/Makefile index 7ba7c4230..1c3bf6995 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Port monitor makefile for CUPS. # @@ -143,5 +143,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/monitor/bcp.c b/monitor/bcp.c index 2354d102d..423ab110e 100644 --- a/monitor/bcp.c +++ b/monitor/bcp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: bcp.c 10996 2013-05-29 11:51:34Z msweet $" * * TBCP port monitor for CUPS. * @@ -288,5 +288,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id$". + * End of "$Id: bcp.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/monitor/tbcp.c b/monitor/tbcp.c index 9ed1e00e7..5f415a5e3 100644 --- a/monitor/tbcp.c +++ b/monitor/tbcp.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: tbcp.c 10996 2013-05-29 11:51:34Z msweet $" * * TBCP port monitor for CUPS. * @@ -278,5 +278,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id$". + * End of "$Id: tbcp.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/notifier/Makefile b/notifier/Makefile index e3d741351..3206dd075 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Notifier makefile for CUPS. # @@ -161,5 +161,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/notifier/dbus.c b/notifier/dbus.c index 1629c4e7f..fc63aac4b 100644 --- a/notifier/dbus.c +++ b/notifier/dbus.c @@ -1,23 +1,18 @@ /* - * "$Id$" + * "$Id: dbus.c 11500 2014-01-06 22:21:15Z msweet $" * - * D-Bus notifier for CUPS. + * D-Bus notifier for CUPS. * - * Copyright 2008-2012 by Apple Inc. - * Copyright (C) 2011 Red Hat, Inc. - * Copyright (C) 2007 Tim Waugh - * Copyright 1997-2005 by Easy Software Products. + * Copyright 2008-2014 by Apple Inc. + * Copyright (C) 2011, 2013 Red Hat, Inc. + * Copyright (C) 2007 Tim Waugh + * Copyright 1997-2005 by Easy Software Products. * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Read events and send DBUS notifications. - * acquire_lock() - Acquire a lock so we only have a single notifier running. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -153,11 +148,19 @@ enum }; +/* + * Global variables... + */ + +static char lock_filename[1024]; /* Lock filename */ + + /* * Local functions... */ static int acquire_lock(int *fd, char *lockfile, size_t locksize); +static void release_lock(void); /* @@ -176,8 +179,6 @@ main(int argc, /* I - Number of command-line args */ DBusMessage *message; /* Message to send */ DBusMessageIter iter; /* Iterator for message data */ int lock_fd = -1; /* Lock file descriptor */ - char lock_filename[1024]; - /* Lock filename */ /* @@ -578,13 +579,34 @@ main(int argc, /* I - Number of command-line args */ if (lock_fd >= 0) { close(lock_fd); - unlink(lock_filename); + release_lock(); } return (0); } +/* + * 'release_lock()' - Release the singleton lock. + */ + +static void +release_lock(void) +{ + unlink(lock_filename); +} + + +/* + * 'handle_sigterm()' - Handle SIGTERM signal. + */ +static void +handle_sigterm(int signum) +{ + release_lock(); + _exit(0); +} + /* * 'acquire_lock()' - Acquire a lock so we only have a single notifier running. */ @@ -594,7 +616,8 @@ acquire_lock(int *fd, /* O - Lock file descriptor */ char *lockfile, /* I - Lock filename buffer */ size_t locksize) /* I - Size of filename buffer */ { - const char *tmpdir; /* Temporary directory */ + const char *tmpdir; /* Temporary directory */ + struct sigaction action; /* POSIX sigaction data */ /* @@ -612,8 +635,16 @@ acquire_lock(int *fd, /* O - Lock file descriptor */ if ((*fd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0) return (-1); - else - return (0); + + /* + * Set a SIGTERM handler to make sure we release the lock if the + * scheduler decides to stop us. + */ + memset(&action, 0, sizeof(action)); + action.sa_handler = handle_sigterm; + sigaction(SIGTERM, &action, NULL); + + return (0); } #else /* !HAVE_DBUS */ int @@ -625,5 +656,5 @@ main(void) /* - * End of "$Id$". + * End of "$Id: dbus.c 11500 2014-01-06 22:21:15Z msweet $". */ diff --git a/notifier/mailto.c b/notifier/mailto.c index 7b2f8a1a2..724e12be6 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: mailto.c 10996 2013-05-29 11:51:34Z msweet $" * * "mailto" notifier for CUPS. * @@ -642,5 +642,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id$". + * End of "$Id: mailto.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/notifier/rss.c b/notifier/rss.c index f16fbbd2e..65e577f0b 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: rss.c 10996 2013-05-29 11:51:34Z msweet $" * * RSS notifier for CUPS. * @@ -737,5 +737,5 @@ xml_escape(const char *s) /* I - String to escape */ /* - * End of "$Id$". + * End of "$Id: rss.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/notifier/testnotify.c b/notifier/testnotify.c index c42bd84fc..67441cee9 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: testnotify.c 10996 2013-05-29 11:51:34Z msweet $" * * Test notifier for CUPS. * @@ -123,5 +123,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id$". + * End of "$Id: testnotify.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/packaging/cups.list.in b/packaging/cups.list.in index c6afe8bea..e2535c734 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: cups.list.in 11025 2013-06-07 01:00:33Z msweet $" # # ESP Package Manager (EPM) file list for CUPS. # @@ -736,5 +736,5 @@ f 0444 root sys $XINETD/cups-lpd scheduler/cups-lpd.xinetd %subpackage # -# End of "$Id$". +# End of "$Id: cups.list.in 11025 2013-06-07 01:00:33Z msweet $". # diff --git a/packaging/cups.spec b/packaging/cups.spec new file mode 100644 index 000000000..b8f29f561 --- /dev/null +++ b/packaging/cups.spec @@ -0,0 +1,396 @@ +# +# "$Id: cups.spec.in 11516 2014-01-08 16:24:32Z msweet $" +# +# RPM "spec" file for CUPS. +# +# Original version by Jason McMullan . +# +# Copyright 2007-2014 by Apple Inc. +# Copyright 1999-2007 by Easy Software Products, all rights reserved. +# +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". +# + +# Conditional build options (--with name/--without name): +# +# dbus - Enable/disable DBUS support (default = enable) +# dnssd - Enable/disable DNS-SD support (default = enable) +# libusb1 - Enable/disable LIBUSB 1.0 support (default = enable) +# static - Enable/disable static libraries (default = enable) + +%{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}} +%{?_with_dbus: %define _dbus --enable-dbus} +%{!?_with_dbus: %define _dbus --disable-dbus} + +%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}} +%{?_with_dnssd: %define _dnssd --enable-dnssd} +%{!?_with_dnssd: %define _dnssd --disable-dnssd} + +%{!?_with_libusb1: %{!?_without_libusb1: %define _with_libusb1 --with-libusb1}} +%{?_with_libusb1: %define _libusb1 --enable-libusb} +%{!?_with_libusb1: %define _libusb1 --disable-libusb} + +%{!?_with_static: %{!?_without_static: %define _without_static --without-static}} +%{?_with_static: %define _static --enable-static} +%{!?_with_static: %define _static --disable-static} + +Summary: CUPS +Name: cups +Version: 1.7.1 +Release: 1 +Epoch: 1 +License: GPL +Group: System Environment/Daemons +Source: http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2 +Url: http://www.cups.org +Packager: Anonymous +Vendor: Apple Inc. + +# Package names are as defined for Red Hat (and clone) distributions +BuildRequires: gnutls-devel, pam-devel + +%if %{?_with_dbus:1}%{!?_with_dbus:0} +BuildRequires: dbus-devel +%endif + +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +BuildRequires: avahi-devel +%endif + +%if %{?_with_libusb1:1}%{!?_with_libusb1:0} +BuildRequires: libusbx-devel +%endif + +# Use buildroot so as not to disturb the version already installed +BuildRoot: /tmp/%{name}-root + +# Dependencies... +Requires: %{name}-libs = %{epoch}:%{version} +Obsoletes: lpd, lpr, LPRng +Provides: lpd, lpr, LPRng +Obsoletes: cups-da, cups-de, cups-es, cups-et, cups-fi, cups-fr, cups-he +Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl +Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh + +%package devel +Summary: CUPS - development environment +Group: Development/Libraries +Requires: %{name}-libs = %{epoch}:%{version} + +%package libs +Summary: CUPS - shared libraries +Group: System Environment/Libraries +Provides: libcups1 + +%package lpd +Summary: CUPS - LPD support +Group: System Environment/Daemons +Requires: %{name} = %{epoch}:%{version} xinetd + +%description +CUPS is the standards-based, open source printing system developed by +Apple Inc. for OS X and other UNIX®-like operating systems. + +%description devel +This package provides the CUPS headers and development environment. + +%description libs +This package provides the CUPS shared libraries. + +%description lpd +This package provides LPD client support. + +%prep +%setup + +%build +CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ + ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} +# If we got this far, all prerequisite libraries must be here. +make + +%install +# Make sure the RPM_BUILD_ROOT directory exists. +rm -rf $RPM_BUILD_ROOT + +make BUILDROOT=$RPM_BUILD_ROOT install + +%post +/sbin/chkconfig --add cups +/sbin/chkconfig cups on + +# Restart cupsd if we are upgrading... +if test $1 -gt 1; then + /sbin/service cups stop + /sbin/service cups start +fi + +%post libs +/sbin/ldconfig + +%preun +if test $1 = 0; then + /sbin/service cups stop + /sbin/chkconfig --del cups +fi + +%postun +if test $1 -ge 1; then + /sbin/service cups stop + /sbin/service cups start +fi + +%postun libs +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%docdir /usr/share/doc/cups +%defattr(-,root,root) +%dir /etc/cups +%config(noreplace) /etc/cups/*.conf +/etc/cups/cupsd.conf.default +%dir /etc/cups/interfaces +%dir /etc/cups/ppd +%attr(0700,root,root) %dir /etc/cups/ssl + +%if %{?_with_dbus:1}%{!?_with_dbus:0} +# DBUS +/etc/dbus-1/system.d/* +%endif + +# PAM +%dir /etc/pam.d +/etc/pam.d/* + +# RC dirs are a pain under Linux... Uncomment the appropriate ones if you +# don't use Red Hat or Mandrake... + +/etc/init.d/* +/etc/rc0.d/* +/etc/rc2.d/* +/etc/rc3.d/* +/etc/rc5.d/* + +# OLD RedHat/Mandrake +#/etc/rc.d/init.d/* +#/etc/rc.d/rc0.d/* +#/etc/rc.d/rc2.d/* +#/etc/rc.d/rc3.d/* +#/etc/rc.d/rc5.d/* + +#/sbin/rc.d/* +#/sbin/rc.d/rc0.d/* +#/sbin/rc.d/rc2.d/* +#/sbin/rc.d/rc3.d/* +#/sbin/rc.d/rc5.d/* + +/usr/bin/cancel +/usr/bin/cupstestdsc +/usr/bin/cupstestppd +/usr/bin/ippfind +/usr/bin/ipptool +/usr/bin/lp* +%dir /usr/lib/cups +%dir /usr/lib/cups/backend +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +# DNS-SD +/usr/lib/cups/backend/dnssd +%endif +/usr/lib/cups/backend/http +/usr/lib/cups/backend/https +%attr(0700,root,root) /usr/lib/cups/backend/ipp +/usr/lib/cups/backend/ipps +%attr(0700,root,root) /usr/lib/cups/backend/lpd +/usr/lib/cups/backend/snmp +/usr/lib/cups/backend/socket +/usr/lib/cups/backend/usb +%dir /usr/lib/cups/cgi-bin +/usr/lib/cups/cgi-bin/* +%dir /usr/lib/cups/daemon +/usr/lib/cups/daemon/cups-deviced +/usr/lib/cups/daemon/cups-driverd +/usr/lib/cups/daemon/cups-exec +%dir /usr/lib/cups/driver +%dir /usr/lib/cups/filter +/usr/lib/cups/filter/* +%dir /usr/lib/cups/monitor +/usr/lib/cups/monitor/* +%dir /usr/lib/cups/notifier +/usr/lib/cups/notifier/* + +/usr/sbin/* +%dir /usr/share/cups +%dir /usr/share/cups/banners +/usr/share/cups/banners/* +%dir /usr/share/cups/data +/usr/share/cups/data/* +%dir /usr/share/cups/drv +/usr/share/cups/drv/* +%dir /usr/share/cups/ipptool +/usr/share/cups/ipptool/* +%dir /usr/share/cups/mime +/usr/share/cups/mime/* +%dir /usr/share/cups/model +%dir /usr/share/cups/ppdc +/usr/share/cups/ppdc/* +%dir /usr/share/cups/templates +/usr/share/cups/templates/* +%if %{?_with_libusb1:1}%{!?_with_libusb1:0} +# LIBUSB quirks files +%dir /usr/share/cups/usb +/usr/share/cups/usb/* +%endif + +%dir /usr/share/doc/cups +/usr/share/doc/cups/*.* +%dir /usr/share/doc/cups/help +/usr/share/doc/cups/help/accounting.html +/usr/share/doc/cups/help/cgi.html +/usr/share/doc/cups/help/glossary.html +/usr/share/doc/cups/help/kerberos.html +/usr/share/doc/cups/help/license.html +/usr/share/doc/cups/help/man-*.html +/usr/share/doc/cups/help/network.html +/usr/share/doc/cups/help/options.html +/usr/share/doc/cups/help/overview.html +/usr/share/doc/cups/help/policies.html +/usr/share/doc/cups/help/ref-*.html +/usr/share/doc/cups/help/security.html +/usr/share/doc/cups/help/sharing.html +/usr/share/doc/cups/help/translation.html +/usr/share/doc/cups/help/whatsnew.html +%dir /usr/share/doc/cups/images +/usr/share/doc/cups/images/* + +%dir /usr/share/doc/cups/ca +/usr/share/doc/cups/ca/* +%dir /usr/share/doc/cups/cs +/usr/share/doc/cups/cs/* +%dir /usr/share/doc/cups/es +/usr/share/doc/cups/es/* +%dir /usr/share/doc/cups/fr +/usr/share/doc/cups/fr/* +%dir /usr/share/doc/cups/it +/usr/share/doc/cups/it/* +%dir /usr/share/doc/cups/ja +/usr/share/doc/cups/ja/* +%dir /usr/share/doc/cups/ru +/usr/share/doc/cups/ru/* + +%dir /usr/share/locale/ca +/usr/share/locale/ca/cups_ca.po +%dir /usr/share/locale/cs +/usr/share/locale/cs/cups_cs.po +%dir /usr/share/locale/es +/usr/share/locale/es/cups_es.po +%dir /usr/share/locale/fr +/usr/share/locale/fr/cups_fr.po +%dir /usr/share/locale/it +/usr/share/locale/it/cups_it.po +%dir /usr/share/locale/ja +/usr/share/locale/ja/cups_ja.po +%dir /usr/share/locale/ru +/usr/share/locale/ru/cups_ru.po + +%dir /usr/share/man/man1 +/usr/share/man/man1/cancel.1.gz +/usr/share/man/man1/cupstestdsc.1.gz +/usr/share/man/man1/cupstestppd.1.gz +/usr/share/man/man1/ippfind.1.gz +/usr/share/man/man1/ipptool.1.gz +/usr/share/man/man1/lp.1.gz +/usr/share/man/man1/lpoptions.1.gz +/usr/share/man/man1/lppasswd.1.gz +/usr/share/man/man1/lpq.1.gz +/usr/share/man/man1/lpr.1.gz +/usr/share/man/man1/lprm.1.gz +/usr/share/man/man1/lpstat.1.gz +%dir /usr/share/man/man5 +/usr/share/man/man5/*.conf.5.gz +/usr/share/man/man5/ipptoolfile.5.gz +/usr/share/man/man5/mime.*.5.gz +%dir /usr/share/man/man8 +/usr/share/man/man8/accept.8.gz +/usr/share/man/man8/cupsaddsmb.8.gz +/usr/share/man/man8/cupsaccept.8.gz +/usr/share/man/man8/cupsctl.8.gz +/usr/share/man/man8/cupsfilter.8.gz +/usr/share/man/man8/cupsd.8.gz +/usr/share/man/man8/cupsdisable.8.gz +/usr/share/man/man8/cupsenable.8.gz +/usr/share/man/man8/cupsreject.8.gz +/usr/share/man/man8/cups-deviced.8.gz +/usr/share/man/man8/cups-driverd.8.gz +/usr/share/man/man8/cups-snmp.8.gz +/usr/share/man/man8/lpadmin.8.gz +/usr/share/man/man8/lpc.8.gz +/usr/share/man/man8/lpinfo.8.gz +/usr/share/man/man8/lpmove.8.gz +/usr/share/man/man8/reject.8.gz + +%dir /var/cache/cups +%attr(0775,root,sys) %dir /var/cache/cups/rss +%dir /var/log/cups +%dir /var/run/cups +%attr(0711,lp,sys) %dir /var/run/cups/certs +%attr(0710,lp,sys) %dir /var/spool/cups +%attr(1770,lp,sys) %dir /var/spool/cups/tmp + +# Desktop files +/usr/share/applications/* +/usr/share/icons/* + +%files devel +%defattr(-,root,root) +%dir /usr/share/cups/examples +/usr/share/cups/examples/* +%dir /usr/share/man/man1 +/usr/share/man/man1/cups-config.1.gz +/usr/share/man/man1/ppd*.1.gz +%dir /usr/share/man/man5 +/usr/share/man/man5/ppdcfile.5.gz +/usr/share/man/man7/backend.7.gz +/usr/share/man/man7/filter.7.gz +/usr/share/man/man7/notifier.7.gz + +/usr/bin/cups-config +/usr/bin/ppd* +%dir /usr/include/cups +/usr/include/cups/* +/usr/lib*/*.so + +%if %{?_with_static:1}%{!?_with_static:0} +/usr/lib*/*.a +%endif + +%dir /usr/share/doc/cups/help +/usr/share/doc/cups/help/api*.html +/usr/share/doc/cups/help/postscript-driver.html +/usr/share/doc/cups/help/ppd-compiler.html +/usr/share/doc/cups/help/raster-driver.html +/usr/share/doc/cups/help/spec*.html + +%files libs +%defattr(-,root,root) +/usr/lib*/*.so.* + +%files lpd +%defattr(-,root,root) +/etc/xinetd.d/cups-lpd +%dir /usr/lib/cups +%dir /usr/lib/cups/daemon +/usr/lib/cups/daemon/cups-lpd +%dir /usr/share/man/man8 +/usr/share/man/man8/cups-lpd.8.gz + + +# +# End of "$Id: cups.spec.in 11516 2014-01-08 16:24:32Z msweet $". +# diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 8f5c5b3f4..74f354fb8 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -1,11 +1,11 @@ # -# "$Id$" +# "$Id: cups.spec.in 11516 2014-01-08 16:24:32Z msweet $" # # RPM "spec" file for CUPS. # # Original version by Jason McMullan . # -# Copyright 2007-2013 by Apple Inc. +# Copyright 2007-2014 by Apple Inc. # Copyright 1999-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -242,7 +242,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/cups/ppdc/* %dir /usr/share/cups/templates /usr/share/cups/templates/* -%if %{?_with_libusb:1}%{!?_with_libusb:0} +%if %{?_with_libusb1:1}%{!?_with_libusb1:0} # LIBUSB quirks files %dir /usr/share/cups/usb /usr/share/cups/usb/* @@ -392,5 +392,5 @@ rm -rf $RPM_BUILD_ROOT # -# End of "$Id$". +# End of "$Id: cups.spec.in 11516 2014-01-08 16:24:32Z msweet $". # diff --git a/ppdc/Makefile b/ppdc/Makefile index 721d4b79f..9526ce007 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 4216 2013-03-11 13:57:36Z msweet $" # # Makefile for the CUPS PPD Compiler. # @@ -402,5 +402,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 4216 2013-03-11 13:57:36Z msweet $". # diff --git a/ppdc/foo.drv b/ppdc/foo.drv index 24a7e04bb..365990583 100644 --- a/ppdc/foo.drv +++ b/ppdc/foo.drv @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: foo.drv 3247 2011-05-12 06:22:31Z msweet $" // // PPD file compiler test data file for CUPS. // @@ -543,5 +543,5 @@ Attribute cupsIPPReason "com.foo-serious-error/A Serious Error" "http://foo.com/ // -// End of "$Id$". +// End of "$Id: foo.drv 3247 2011-05-12 06:22:31Z msweet $". // diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx index d08416d32..dee4b5588 100644 --- a/ppdc/genstrings.cxx +++ b/ppdc/genstrings.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: genstrings.cxx 3275 2011-05-20 07:26:13Z msweet $" // // GNU gettext message generator for the CUPS PPD Compiler. // @@ -211,5 +211,5 @@ write_cstring(const char *s) /* I - String to write */ // -// End of "$Id$". +// End of "$Id: genstrings.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx index 33d8bf773..fcef51b27 100644 --- a/ppdc/ppdc-array.cxx +++ b/ppdc/ppdc-array.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-array.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Array class for the CUPS PPD Compiler. // @@ -164,5 +164,5 @@ ppdcArray::remove(ppdcShared *d) // I - Data element // -// End of "$Id$". +// End of "$Id: ppdc-array.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx index 1ea0337a9..4570f106f 100644 --- a/ppdc/ppdc-attr.cxx +++ b/ppdc/ppdc-attr.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Attribute class for the CUPS PPD Compiler. // @@ -62,5 +62,5 @@ ppdcAttr::~ppdcAttr() // -// End of "$Id$". +// End of "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index f709d75e1..ecf7678c1 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-catalog.cxx 3794 2012-04-23 22:44:16Z msweet $" // // Shared message catalog class for the CUPS PPD Compiler. // @@ -893,5 +893,5 @@ put_utf16(cups_file_t *fp, // I - File to write to // -// End of "$Id$". +// End of "$Id: ppdc-catalog.cxx 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx index 2c12de2b9..e9937feb9 100644 --- a/ppdc/ppdc-choice.cxx +++ b/ppdc/ppdc-choice.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Option choice class for the CUPS PPD Compiler. // @@ -57,5 +57,5 @@ ppdcChoice::~ppdcChoice() // -// End of "$Id$". +// End of "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx index 6e6f0241e..c06097986 100644 --- a/ppdc/ppdc-constraint.cxx +++ b/ppdc/ppdc-constraint.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Contraint class for the CUPS PPD Compiler. // @@ -60,5 +60,5 @@ ppdcConstraint::~ppdcConstraint() // -// End of "$Id$". +// End of "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx index 6459a33a6..f04168a22 100644 --- a/ppdc/ppdc-driver.cxx +++ b/ppdc/ppdc-driver.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-driver.cxx 3940 2012-10-15 21:02:10Z msweet $" // // PPD file compiler definitions for the CUPS PPD Compiler. // @@ -1344,5 +1344,5 @@ ppdcDriver::write_ppd_file( // -// End of "$Id$". +// End of "$Id: ppdc-driver.cxx 3940 2012-10-15 21:02:10Z msweet $". // diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx index 1f1d9a84e..0a24827f7 100644 --- a/ppdc/ppdc-file.cxx +++ b/ppdc/ppdc-file.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $" // // File class for the CUPS PPD Compiler. // @@ -106,5 +106,5 @@ ppdcFile::peek() // -// End of "$Id$". +// End of "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $". // diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx index 33994849b..cc1ae00ff 100644 --- a/ppdc/ppdc-filter.cxx +++ b/ppdc/ppdc-filter.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Filter class for the CUPS PPD Compiler. // @@ -56,5 +56,5 @@ ppdcFilter::~ppdcFilter() // -// End of "$Id$". +// End of "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx index b6d9bcb2a..c5dad4d83 100644 --- a/ppdc/ppdc-font.cxx +++ b/ppdc/ppdc-font.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Shared font class for the CUPS PPD Compiler. // @@ -62,5 +62,5 @@ ppdcFont::~ppdcFont() // -// End of "$Id$". +// End of "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx index cc0ab280a..00d0a7cb2 100644 --- a/ppdc/ppdc-group.cxx +++ b/ppdc/ppdc-group.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $" // // Group class for the CUPS PPD Compiler. // @@ -99,5 +99,5 @@ ppdcGroup::find_option(const char *n) // I - Name of option // -// End of "$Id$". +// End of "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx index 4794e7715..d41cbb982 100644 --- a/ppdc/ppdc-import.cxx +++ b/ppdc/ppdc-import.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $" // // PPD file import methods for the CUPS PPD Compiler. // @@ -339,5 +339,5 @@ ppdcSource::import_ppd(const char *f) // I - Filename // -// End of "$Id$". +// End of "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx index 844028a39..48afd381a 100644 --- a/ppdc/ppdc-mediasize.cxx +++ b/ppdc/ppdc-mediasize.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Shared media size class for the CUPS PPD Compiler. // @@ -81,5 +81,5 @@ ppdcMediaSize::~ppdcMediaSize() // -// End of "$Id$". +// End of "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx index 11e5e3eaa..fbbe40c38 100644 --- a/ppdc/ppdc-message.cxx +++ b/ppdc/ppdc-message.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Shared message class for the CUPS PPD Compiler. // @@ -54,5 +54,5 @@ ppdcMessage::~ppdcMessage() // -// End of "$Id$". +// End of "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx index e80df3c87..3fdc296ad 100644 --- a/ppdc/ppdc-option.cxx +++ b/ppdc/ppdc-option.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $" // // Option class for the CUPS PPD Compiler. // @@ -125,5 +125,5 @@ ppdcOption::set_defchoice(ppdcChoice *c) // I - Choice // -// End of "$Id$". +// End of "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h index 2bf5a24e7..2fea43886 100644 --- a/ppdc/ppdc-private.h +++ b/ppdc/ppdc-private.h @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-private.h 1992 2010-03-24 14:32:08Z msweet $" // // Private definitions for the CUPS PPD Compiler. // @@ -36,5 +36,5 @@ #endif // !_PPDC_PRIVATE_H_ // -// End of "$Id$". +// End of "$Id: ppdc-private.h 1992 2010-03-24 14:32:08Z msweet $". // diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx index 90625f423..244e34f42 100644 --- a/ppdc/ppdc-profile.cxx +++ b/ppdc/ppdc-profile.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Color profile class for the CUPS PPD Compiler. // @@ -61,5 +61,5 @@ ppdcProfile::~ppdcProfile() // -// End of "$Id$". +// End of "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx index 0c99c0859..e6b6167a1 100644 --- a/ppdc/ppdc-shared.cxx +++ b/ppdc/ppdc-shared.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $" // // Shared data class for the CUPS PPD Compiler. // @@ -84,5 +84,5 @@ ppdcShared::retain() // -// End of "$Id$". +// End of "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $". // diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index 222ccfd25..8838a298e 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-source.cxx 4167 2013-02-04 19:27:13Z msweet $" // // Source class for the CUPS PPD Compiler. // @@ -3847,5 +3847,5 @@ ppdcSource::write_file(const char *f) // I - File to write // -// End of "$Id$". +// End of "$Id: ppdc-source.cxx 4167 2013-02-04 19:27:13Z msweet $". // diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx index 706bd138c..b6e351213 100644 --- a/ppdc/ppdc-string.cxx +++ b/ppdc/ppdc-string.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-string.cxx 3933 2012-10-01 03:01:10Z msweet $" // // Shared string class for the CUPS PPD Compiler. // @@ -60,5 +60,5 @@ ppdcString::~ppdcString() // -// End of "$Id$". +// End of "$Id: ppdc-string.cxx 3933 2012-10-01 03:01:10Z msweet $". // diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx index 22a175ad4..d60ef72fa 100644 --- a/ppdc/ppdc-variable.cxx +++ b/ppdc/ppdc-variable.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Variable class for the CUPS PPD Compiler. // @@ -67,5 +67,5 @@ ppdcVariable::set_value(const char *v) // -// End of "$Id$". +// End of "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index b302c8aca..6cb6bed27 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc.cxx 3794 2012-04-23 22:44:16Z msweet $" // // PPD file compiler main entry for the CUPS PPD Compiler. // @@ -464,5 +464,5 @@ usage(void) // -// End of "$Id$". +// End of "$Id: ppdc.cxx 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h index c940e00a0..0aad12558 100644 --- a/ppdc/ppdc.h +++ b/ppdc/ppdc.h @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdc.h 3755 2012-03-30 05:59:14Z msweet $" // // Definitions for the CUPS PPD Compiler. // @@ -529,5 +529,5 @@ class ppdcSource //// Source File #endif // !_PPDC_H_ // -// End of "$Id$". +// End of "$Id: ppdc.h 3755 2012-03-30 05:59:14Z msweet $". // diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx index d5678898d..da2167b83 100644 --- a/ppdc/ppdhtml.cxx +++ b/ppdc/ppdhtml.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdhtml.cxx 3071 2011-03-23 00:05:29Z msweet $" // // PPD to HTML utility for the CUPS PPD Compiler. // @@ -182,5 +182,5 @@ usage(void) // -// End of "$Id$". +// End of "$Id: ppdhtml.cxx 3071 2011-03-23 00:05:29Z msweet $". // diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx index a411bfef5..cbc728b90 100644 --- a/ppdc/ppdi.cxx +++ b/ppdc/ppdi.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $" // // PPD file import utility for the CUPS PPD Compiler. // @@ -138,5 +138,5 @@ usage(void) // -// End of "$Id$". +// End of "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $". // diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index 68f291673..63966c0e7 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdmerge.cxx 3275 2011-05-20 07:26:13Z msweet $" // // PPD file merge utility for the CUPS PPD Compiler. // @@ -375,5 +375,5 @@ usage(void) // -// End of "$Id$". +// End of "$Id: ppdmerge.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx index 01513fd55..65032a432 100644 --- a/ppdc/ppdpo.cxx +++ b/ppdc/ppdpo.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: ppdpo.cxx 3794 2012-04-23 22:44:16Z msweet $" // // PPD file message catalog program for the CUPS PPD Compiler. // @@ -263,5 +263,5 @@ usage(void) // -// End of "$Id$". +// End of "$Id: ppdpo.cxx 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/sample.drv b/ppdc/sample.drv index a3e524ac2..f5505e648 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: sample.drv 3891 2012-08-29 00:26:48Z msweet $" // // Driver info file for CUPS-supplied PPDs. // @@ -1241,5 +1241,5 @@ Version "1.5" } // -// End of "$Id$". +// End of "$Id: sample.drv 3891 2012-08-29 00:26:48Z msweet $". // diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx index a9e2e8655..0943dcc48 100644 --- a/ppdc/testcatalog.cxx +++ b/ppdc/testcatalog.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Test program for message catalog class. // @@ -59,5 +59,5 @@ main(int argc, // I - Number of command-line arguments // -// End of "$Id$". +// End of "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/scheduler/Makefile b/scheduler/Makefile index 3c0fff3e1..92fc1750f 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -1,5 +1,5 @@ # -# "$Id$" +# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $" # # Scheduler Makefile for CUPS. # @@ -561,5 +561,5 @@ include Dependencies # -# End of "$Id$". +# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $". # diff --git a/scheduler/auth.c b/scheduler/auth.c index 5c7f05731..35b70f394 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: auth.c 11500 2014-01-06 22:21:15Z msweet $" * * Authorization routines for the CUPS scheduler. * @@ -1302,6 +1302,8 @@ cupsdCheckAuth(unsigned ip[4], /* I - Client address */ netip6[3] = htonl(ip[3]); #endif /* AF_INET6 */ + cupsdNetIFUpdate(); + if (!strcmp(mask->mask.name.name, "*")) { #ifdef __APPLE__ @@ -1317,8 +1319,6 @@ cupsdCheckAuth(unsigned ip[4], /* I - Client address */ * Check against all local interfaces... */ - cupsdNetIFUpdate(); - for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList); iface; iface = (cupsd_netif_t *)cupsArrayNext(NetIFList)) @@ -2607,5 +2607,5 @@ to64(char *s, /* O - Output string */ /* - * End of "$Id$". + * End of "$Id: auth.c 11500 2014-01-06 22:21:15Z msweet $". */ diff --git a/scheduler/auth.h b/scheduler/auth.h index feb2fcd52..16f1fd5af 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: auth.h 10996 2013-05-29 11:51:34Z msweet $" * * Authorization definitions for the CUPS scheduler. * @@ -147,5 +147,5 @@ extern cupsd_location_t *cupsdNewLocation(const char *location); /* - * End of "$Id$". + * End of "$Id: auth.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/banners.c b/scheduler/banners.c index 77ae797ae..631a891af 100644 --- a/scheduler/banners.c +++ b/scheduler/banners.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: banners.c 10996 2013-05-29 11:51:34Z msweet $" * * Banner routines for the CUPS scheduler. * @@ -220,5 +220,5 @@ free_banners(void) /* - * End of "$Id$". + * End of "$Id: banners.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/banners.h b/scheduler/banners.h index fb933aaae..19ab6f71f 100644 --- a/scheduler/banners.h +++ b/scheduler/banners.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: banners.h 10996 2013-05-29 11:51:34Z msweet $" * * Banner definitions for the CUPS scheduler. * @@ -41,5 +41,5 @@ extern void cupsdLoadBanners(const char *d); /* - * End of "$Id$". + * End of "$Id: banners.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/cert.c b/scheduler/cert.c index a2f8ff4f9..1ad4439f0 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cert.c 10996 2013-05-29 11:51:34Z msweet $" * * Authentication certificate routines for the CUPS scheduler. * @@ -436,5 +436,5 @@ cupsdInitCerts(void) /* - * End of "$Id$". + * End of "$Id: cert.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/cert.h b/scheduler/cert.h index f2dc637bf..063c5de7a 100644 --- a/scheduler/cert.h +++ b/scheduler/cert.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cert.h 10996 2013-05-29 11:51:34Z msweet $" * * Authentication certificate definitions for the CUPS scheduler. * @@ -49,5 +49,5 @@ extern void cupsdInitCerts(void); /* - * End of "$Id$". + * End of "$Id: cert.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/classes.c b/scheduler/classes.c index 5ced554f5..b920c4f24 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: classes.c 10996 2013-05-29 11:51:34Z msweet $" * * Printer class routines for the CUPS scheduler. * @@ -814,5 +814,5 @@ cupsdSaveAllClasses(void) /* - * End of "$Id$". + * End of "$Id: classes.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/classes.h b/scheduler/classes.h index b24b7de11..bc0196e21 100644 --- a/scheduler/classes.h +++ b/scheduler/classes.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: classes.h 10996 2013-05-29 11:51:34Z msweet $" * * Printer class definitions for the CUPS scheduler. * @@ -31,5 +31,5 @@ extern void cupsdSaveAllClasses(void); /* - * End of "$Id$". + * End of "$Id: classes.h 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/client.c b/scheduler/client.c index fc8946a15..c867bd675 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: client.c 11308 2013-09-27 14:09:25Z msweet $" * * Client routines for the CUPS scheduler. * @@ -4379,5 +4379,5 @@ write_pipe(cupsd_client_t *con) /* I - Client connection */ /* - * End of "$Id$". + * End of "$Id: client.c 11308 2013-09-27 14:09:25Z msweet $". */ diff --git a/scheduler/client.h b/scheduler/client.h index 87e4505be..fe6c473fe 100644 --- a/scheduler/client.h +++ b/scheduler/client.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: client.h 11213 2013-08-01 22:23:18Z msweet $" * * Client definitions for the CUPS scheduler. * @@ -142,5 +142,5 @@ extern int cupsdStartTLS(cupsd_client_t *con); /* - * End of "$Id$". + * End of "$Id: client.h 11213 2013-08-01 22:23:18Z msweet $". */ diff --git a/scheduler/colorman.c b/scheduler/colorman.c index d43fd398b..9e6c71033 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: colorman.c 11150 2013-07-17 13:03:56Z msweet $" * * Color management routines for the CUPS scheduler. * @@ -1538,5 +1538,5 @@ colord_unregister_printer( /* - * End of "$Id$". + * End of "$Id: colorman.c 11150 2013-07-17 13:03:56Z msweet $". */ diff --git a/scheduler/colorman.h b/scheduler/colorman.h index e912a92a3..3360fd4e3 100644 --- a/scheduler/colorman.h +++ b/scheduler/colorman.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $" * * Color management definitions for the CUPS scheduler. * @@ -24,5 +24,5 @@ extern void cupsdUnregisterColor(cupsd_printer_t *p); /* - * End of "$Id$". + * End of "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/scheduler/conf.c b/scheduler/conf.c index 0a23a2401..63f613cee 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: conf.c 11488 2013-12-22 05:04:41Z msweet $" * * Configuration routines for the CUPS scheduler. * @@ -1165,6 +1165,8 @@ cupsdReadConfiguration(void) cupsdSetStringf(&TempDir, "%s/tmp", RequestRoot); } + setenv("TMPDIR", TempDir, 1); + /* * Make sure the temporary directory has the right permissions... */ @@ -4061,5 +4063,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */ /* - * End of "$Id$". + * End of "$Id: conf.c 11488 2013-12-22 05:04:41Z msweet $". */ diff --git a/scheduler/conf.h b/scheduler/conf.h index b5cdde246..485383e4c 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: conf.h 11202 2013-07-26 21:31:54Z msweet $" * * Configuration file definitions for the CUPS scheduler. * @@ -297,5 +297,5 @@ extern int cupsdWriteErrorLog(int level, const char *message); /* - * End of "$Id$". + * End of "$Id: conf.h 11202 2013-07-26 21:31:54Z msweet $". */ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 0cd5b8ea8..80fc7da1b 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cups-deviced.c 10996 2013-05-29 11:51:34Z msweet $" * * Device scanning mini-daemon for CUPS. * @@ -806,5 +806,5 @@ start_backend(const char *name, /* I - Backend to run */ /* - * End of "$Id$". + * End of "$Id: cups-deviced.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index 31a8a25a0..1439af787 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cups-driverd.cxx 3933 2012-10-01 03:01:10Z msweet $" * * PPD/driver support for CUPS. * @@ -2947,5 +2947,5 @@ regex_string(const char *s) /* I - String to compare */ /* - * End of "$Id$". + * End of "$Id: cups-driverd.cxx 3933 2012-10-01 03:01:10Z msweet $". */ diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c index ee5981751..3474c6e39 100644 --- a/scheduler/cups-exec.c +++ b/scheduler/cups-exec.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cups-exec.c 11144 2013-07-17 02:45:55Z msweet $" * * Sandbox helper for CUPS. * @@ -90,5 +90,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id$". + * End of "$Id: cups-exec.c 11144 2013-07-17 02:45:55Z msweet $". */ diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c index f175f6669..fc80ada1f 100644 --- a/scheduler/cups-lpd.c +++ b/scheduler/cups-lpd.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: cups-lpd.c 10996 2013-05-29 11:51:34Z msweet $" * * Line Printer Daemon interface for CUPS. * @@ -1622,5 +1622,5 @@ smart_gets(char *s, /* I - Pointer to line buffer */ /* - * End of "$Id$". + * End of "$Id: cups-lpd.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in index 08aa883d1..77557645a 100644 --- a/scheduler/cups.sh.in +++ b/scheduler/cups.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id$" +# "$Id: cups.sh.in 3940 2012-10-15 21:02:10Z msweet $" # # Startup/shutdown script for CUPS. # @@ -221,5 +221,5 @@ exit 0 # -# End of "$Id$". +# End of "$Id: cups.sh.in 3940 2012-10-15 21:02:10Z msweet $". # diff --git a/scheduler/cups.xml.in b/scheduler/cups.xml.in index 211c086b7..ac6358509 100644 --- a/scheduler/cups.xml.in +++ b/scheduler/cups.xml.in @@ -1,7 +1,7 @@