diff -Nru cups-1.5.2/backend/Dependencies cups-1.5.3/backend/Dependencies --- cups-1.5.2/backend/Dependencies 2011-05-12 07:46:30.000000000 +0200 +++ cups-1.5.3/backend/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,77 +3,83 @@ ipp.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h ipp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h ipp.o: ../cups/language.h ../cups/string-private.h ../config.h -ipp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ipp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ipp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ipp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -ipp.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h -ipp.o: ../cups/sidechannel.h ../cups/array-private.h +ipp.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +ipp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +ipp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ipp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ipp.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h +ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/array-private.h +ipp.o: ../cups/array.h lpd.o: ../cups/http-private.h ../config.h ../cups/http.h lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h lpd.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpd.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpd.o: ../cups/language.h ../cups/string-private.h ../cups/debug-private.h -lpd.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -lpd.o: ../cups/pwg-private.h ../cups/http-private.h +lpd.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +lpd.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h lpd.o: ../cups/language-private.h ../cups/transcode.h lpd.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h lpd.o: ../cups/sidechannel.h dnssd.o: backend-private.h ../cups/cups-private.h ../cups/cups.h dnssd.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h dnssd.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -dnssd.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -dnssd.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -dnssd.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -dnssd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -dnssd.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h -dnssd.o: ../cups/backend.h ../cups/sidechannel.h ../cups/array.h +dnssd.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +dnssd.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +dnssd.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +dnssd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +dnssd.o: ../cups/language-private.h ../cups/transcode.h +dnssd.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h +dnssd.o: ../cups/sidechannel.h ../cups/array.h parallel.o: backend-private.h ../cups/cups-private.h ../cups/cups.h parallel.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h parallel.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -parallel.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -parallel.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -parallel.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -parallel.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -parallel.o: ../cups/transcode.h ../cups/thread-private.h -parallel.o: ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h +parallel.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +parallel.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +parallel.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +parallel.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +parallel.o: ../cups/language-private.h ../cups/transcode.h +parallel.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h +parallel.o: ../cups/sidechannel.h serial.o: backend-private.h ../cups/cups-private.h ../cups/cups.h serial.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h serial.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -serial.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -serial.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -serial.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -serial.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -serial.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h -serial.o: ../cups/backend.h ../cups/sidechannel.h +serial.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +serial.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +serial.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +serial.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +serial.o: ../cups/language-private.h ../cups/transcode.h +serial.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h +serial.o: ../cups/sidechannel.h snmp.o: backend-private.h ../cups/cups-private.h ../cups/cups.h snmp.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h snmp.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -snmp.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -snmp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -snmp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -snmp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -snmp.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h -snmp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/array.h -snmp.o: ../cups/file.h ../cups/http-private.h +snmp.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +snmp.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +snmp.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +snmp.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +snmp.o: ../cups/language-private.h ../cups/transcode.h +snmp.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h +snmp.o: ../cups/sidechannel.h ../cups/array.h ../cups/file.h +snmp.o: ../cups/http-private.h socket.o: ../cups/http-private.h ../config.h ../cups/http.h socket.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h socket.o: backend-private.h ../cups/cups-private.h ../cups/cups.h socket.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h socket.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -socket.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -socket.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -socket.o: ../cups/language-private.h ../cups/transcode.h -socket.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h -socket.o: ../cups/sidechannel.h +socket.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +socket.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +socket.o: ../cups/http-private.h ../cups/language-private.h +socket.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h +socket.o: ../cups/backend.h ../cups/sidechannel.h test1284.o: ../cups/string-private.h ../config.h ieee1284.c backend-private.h test1284.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h test1284.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h test1284.o: ../cups/language.h ../cups/string-private.h -test1284.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -test1284.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -test1284.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -test1284.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +test1284.o: ../cups/debug-private.h ../cups/versioning.h +test1284.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +test1284.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +test1284.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +test1284.o: ../cups/language-private.h ../cups/transcode.h test1284.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h test1284.o: ../cups/sidechannel.h testbackend.o: ../cups/string-private.h ../config.h ../cups/cups.h @@ -84,18 +90,18 @@ testsupplies.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h testsupplies.o: ../cups/http.h ../cups/array.h ../cups/language.h testsupplies.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -testsupplies.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -testsupplies.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -testsupplies.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -testsupplies.o: ../cups/language-private.h ../cups/transcode.h +testsupplies.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +testsupplies.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +testsupplies.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +testsupplies.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h testsupplies.o: ../cups/thread-private.h ../cups/snmp-private.h testsupplies.o: ../cups/backend.h ../cups/sidechannel.h usb.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h usb.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h usb.o: ../cups/language.h ../cups/string-private.h ../config.h -usb.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -usb.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -usb.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -usb.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -usb.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h -usb.o: ../cups/sidechannel.h +usb.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +usb.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +usb.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +usb.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +usb.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h +usb.o: ../cups/backend.h ../cups/sidechannel.h diff -Nru cups-1.5.2/backend/dnssd.c cups-1.5.3/backend/dnssd.c --- cups-1.5.2/backend/dnssd.c 2011-09-26 20:46:46.000000000 +0200 +++ cups-1.5.3/backend/dnssd.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: dnssd.c 10017 2011-09-26 18:46:46Z mike $" + * "$Id: dnssd.c 10379 2012-03-23 22:16:22Z mike $" * * DNS-SD discovery backend for CUPS. * - * Copyright 2008-2011 by Apple Inc. + * Copyright 2008-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -43,8 +43,8 @@ typedef enum { CUPS_DEVICE_PRINTER = 0, /* lpd://... */ - CUPS_DEVICE_IPP, /* ipp://... */ CUPS_DEVICE_IPPS, /* ipps://... */ + CUPS_DEVICE_IPP, /* ipp://... */ CUPS_DEVICE_FAX_IPP, /* ipp://... */ CUPS_DEVICE_PDL_DATASTREAM, /* socket://... */ CUPS_DEVICE_RIOUSBPRINT /* riousbprint://... */ @@ -84,7 +84,8 @@ DNSServiceErrorType errorCode, const char *serviceName, const char *regtype, - const char *replyDomain, void *context); + const char *replyDomain, void *context) + __attribute__((nonnull(1,5,6,7,8))); static void browse_local_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -92,13 +93,15 @@ const char *serviceName, const char *regtype, const char *replyDomain, - void *context); + void *context) + __attribute__((nonnull(1,5,6,7,8))); static int compare_devices(cups_device_t *a, cups_device_t *b); static void exec_backend(char **argv); static cups_device_t *get_device(cups_array_t *devices, const char *serviceName, const char *regtype, - const char *replyDomain); + const char *replyDomain) + __attribute__((nonnull(1,2,3,4))); static void query_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -106,9 +109,11 @@ const char *fullName, uint16_t rrtype, uint16_t rrclass, uint16_t rdlen, const void *rdata, uint32_t ttl, - void *context); + void *context) + __attribute__((nonnull(1,5,9,11))); static void sigterm_handler(int sig); -static void unquote(char *dst, const char *src, size_t dstsize); +static void unquote(char *dst, const char *src, size_t dstsize) + __attribute__((nonnull(1,2))); /* @@ -961,5 +966,5 @@ /* - * End of "$Id: dnssd.c 10017 2011-09-26 18:46:46Z mike $". + * End of "$Id: dnssd.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/backend/ipp.c cups-1.5.3/backend/ipp.c --- cups-1.5.2/backend/ipp.c 2011-11-07 07:08:44.000000000 +0100 +++ cups-1.5.3/backend/ipp.c 2012-05-05 01:00:01.000000000 +0200 @@ -1,9 +1,9 @@ /* - * "$Id: ipp.c 10112 2011-11-07 06:08:44Z mike $" + * "$Id: ipp.c 10452 2012-05-04 23:00:01Z mike $" * * IPP backend for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -63,6 +63,7 @@ int port, /* Port number */ version, /* IPP version */ job_id; /* Job ID for submitted job */ + const char *job_name; /* Job name for submitted job */ http_encryption_t encryption; /* Use encryption? */ ipp_jstate_t job_state; /* Current job state */ ipp_pstate_t printer_state; /* Current printer state */ @@ -82,12 +83,16 @@ { "job-impressions-completed", "job-media-sheets-completed", + "job-name", + "job-originating-user-name", "job-state", "job-state-reasons" }; static int job_canceled = 0; /* Job cancelled? */ -static char *password = NULL; +static char username[256] = "", + /* Username for device URI */ + *password = NULL; /* Password for device URI */ static int password_tries = 0; /* Password tries */ @@ -186,7 +191,6 @@ const char *device_uri; /* Device URI */ char scheme[255], /* Scheme in URI */ hostname[1024], /* Hostname */ - username[255], /* Username info */ resource[1024], /* Resource info (printer name) */ addrname[256], /* Address name */ *optptr, /* Pointer to URI options */ @@ -205,6 +209,7 @@ int port; /* Port number (not used) */ char portname[255]; /* Port name */ char uri[HTTP_MAX_URI]; /* Updated URI without user/pass */ + char print_job_name[1024]; /* Update job-name for Print-Job */ http_status_t http_status; /* Status of HTTP request */ ipp_status_t ipp_status; /* Status of IPP request */ http_t *http; /* HTTP connection */ @@ -231,7 +236,9 @@ 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 */ - int validate_job; /* Does printer support Validate-Job? */ + int create_job = 0, /* Does printer support Create-Job? */ + send_document = 0, /* Does printer support Send-Document? */ + validate_job = 0; /* Does printer support Validate-Job? */ int copies, /* Number of copies for job */ copies_remaining; /* Number of copies remaining */ const char *content_type, /* CONTENT_TYPE environment variable */ @@ -604,7 +611,10 @@ const char *ptr = getenv("AUTH_USERNAME"); if (ptr) + { + strlcpy(username, ptr, sizeof(username)); cupsSetUser(ptr); + } password = getenv("AUTH_PASSWORD"); } @@ -789,7 +799,6 @@ supported = NULL; operations_sup = NULL; doc_handling_sup = NULL; - validate_job = 0; do { @@ -834,7 +843,9 @@ fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n", ippErrorString(ipp_status), cupsLastErrorString()); - if (ipp_status > IPP_OK_CONFLICT) + if (ipp_status <= IPP_OK_CONFLICT) + password_tries = 0; + else { fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n", ippErrorString(ipp_status)); @@ -891,16 +902,21 @@ return (CUPS_BACKEND_STOP); } - else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN) + else if (ipp_status == IPP_FORBIDDEN || + ipp_status == IPP_AUTHENTICATION_CANCELED) { - if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE), - "Negotiate", 9)) + const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); + /* WWW-Authenticate field value */ + + if (!strncmp(www_auth, "Negotiate", 9)) auth_info_required = "negotiate"; + else if (www_auth[0]) + auth_info_required = "username,password"; fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required); return (CUPS_BACKEND_AUTH_REQUIRED); } - else + else if (ipp_status != IPP_NOT_AUTHORIZED) { _cupsLangPrintFilter(stderr, "ERROR", _("Unable to get printer status.")); @@ -1042,11 +1058,21 @@ "cups-ipp-missing-get-printer-attributes"); for (i = 0; i < operations_sup->num_values; i ++) + { if (operations_sup->values[i].integer == IPP_VALIDATE_JOB) - { validate_job = 1; - break; - } + else if (operations_sup->values[i].integer == IPP_CREATE_JOB) + create_job = 1; + else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT) + send_document = 1; + } + + if (!send_document) + { + fputs("DEBUG: Printer supports Create-Job but not Send-Document.\n", + stderr); + create_job = 0; + } if (!validate_job) update_reasons(NULL, "+cups-ipp-conformance-failure-report," @@ -1116,7 +1142,7 @@ { copies_remaining = 1; - if (argc < 7 && !send_options) + if (argc < 7 && !_cups_strncasecmp(final_content_type, "image/", 6)) copies = 1; } else @@ -1153,7 +1179,8 @@ if (format_sup != NULL) { for (i = 0; i < format_sup->num_values; i ++) - if (!_cups_strcasecmp(final_content_type, format_sup->values[i].string.text)) + if (!_cups_strcasecmp(final_content_type, + format_sup->values[i].string.text)) { document_format = final_content_type; break; @@ -1163,7 +1190,7 @@ { for (i = 0; i < format_sup->num_values; i ++) if (!_cups_strcasecmp("application/octet-stream", - format_sup->values[i].string.text)) + format_sup->values[i].string.text)) { document_format = "application/octet-stream"; break; @@ -1171,6 +1198,9 @@ } } + fprintf(stderr, "DEBUG: final_content_type=\"%s\", document_format=\"%s\"\n", + final_content_type, document_format ? document_format : "(null)"); + /* * If the printer does not support HTTP/1.1 (which IPP requires), copy stdin * to a temporary file so that we can do a HTTP/1.0 submission... @@ -1188,8 +1218,17 @@ _cupsLangPrintFilter(stderr, "INFO", _("Copying print data.")); - compatsize = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, - backendNetworkSideCB); + if ((compatsize = write(fd, buffer, bytes)) < 0) + { + perror("DEBUG: Unable to write temporary file"); + return (CUPS_BACKEND_FAILED); + } + + if ((bytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, + backendNetworkSideCB)) < 0) + return (CUPS_BACKEND_FAILED); + + compatsize += bytes; close(fd); @@ -1220,6 +1259,17 @@ monitor.job_state = IPP_JOB_PENDING; monitor.printer_state = IPP_PRINTER_IDLE; + if (create_job) + { + monitor.job_name = argv[3]; + } + else + { + snprintf(print_job_name, sizeof(print_job_name), "%s - %s", argv[1], + argv[3]); + monitor.job_name = print_job_name; + } + _cupsThreadCreate((_cups_thread_func_t)monitor_printer, &monitor); /* @@ -1228,8 +1278,8 @@ while (!job_canceled && validate_job) { - request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], argv[3], - num_options, options, compression, + request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], + monitor.job_name, num_options, options, compression, copies_sup ? copies : 1, document_format, pc, media_col_sup, doc_handling_sup); @@ -1248,26 +1298,16 @@ _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy.")); sleep(10); } - else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN || + else if (ipp_status == IPP_FORBIDDEN || ipp_status == IPP_AUTHENTICATION_CANCELED) { - /* - * Update auth-info-required as needed... - */ - - fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n", - httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE)); - - /* - * Normal authentication goes through the password callback, which sets - * auth_info_required to "username,password". Kerberos goes directly - * through GSSAPI, so look for Negotiate in the WWW-Authenticate header - * here and set auth_info_required as needed... - */ + const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); + /* WWW-Authenticate field value */ - if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE), - "Negotiate", 9)) + if (!strncmp(www_auth, "Negotiate", 9)) auth_info_required = "negotiate"; + else if (www_auth[0]) + auth_info_required = "username,password"; goto cleanup; } @@ -1281,7 +1321,8 @@ "cups-ipp-missing-validate-job"); break; } - else if (ipp_status < IPP_REDIRECTION_OTHER_SITE) + else if (ipp_status < IPP_REDIRECTION_OTHER_SITE || + ipp_status == IPP_BAD_REQUEST) break; } @@ -1306,16 +1347,17 @@ if (job_canceled) break; - request = new_request(num_files > 1 ? IPP_CREATE_JOB : IPP_PRINT_JOB, - version, uri, argv[2], argv[3], num_options, options, - compression, copies_sup ? copies : 1, document_format, - pc, media_col_sup, doc_handling_sup); + request = new_request((num_files > 1 || create_job) ? IPP_CREATE_JOB : + IPP_PRINT_JOB, + version, uri, argv[2], monitor.job_name, num_options, + options, compression, copies_sup ? copies : 1, + document_format, pc, media_col_sup, doc_handling_sup); /* * Do the request... */ - if (num_files > 1) + if (num_files > 1 || create_job) response = cupsDoRequest(http, request, resource); else { @@ -1333,7 +1375,13 @@ if (http_status == HTTP_CONTINUE && request->state == IPP_DATA) { if (num_files == 1) - fd = open(files[0], O_RDONLY); + { + if ((fd = open(files[0], O_RDONLY)) < 0) + { + _cupsLangPrintError("ERROR", _("Unable to open print file")); + return (CUPS_BACKEND_FAILED); + } + } else { fd = 0; @@ -1382,7 +1430,7 @@ ipp_status = cupsLastError(); fprintf(stderr, "DEBUG: %s: %s (%s)\n", - num_files > 1 ? "Create-Job" : "Print-Job", + (num_files > 1 || create_job) ? "Create-Job" : "Print-Job", ippErrorString(ipp_status), cupsLastErrorString()); if (ipp_status > IPP_OK_CONFLICT) @@ -1411,6 +1459,8 @@ } else if (ipp_status == IPP_ERROR_JOB_CANCELED) goto cleanup; + else if (ipp_status == IPP_NOT_AUTHORIZED) + continue; else { /* @@ -1420,21 +1470,24 @@ _cupsLangPrintFilter(stderr, "ERROR", _("Print file was not accepted.")); - if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN) + if (ipp_status == IPP_FORBIDDEN || + ipp_status == IPP_AUTHENTICATION_CANCELED) { - fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n", - httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE)); + const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); + /* WWW-Authenticate field value */ - /* - * Normal authentication goes through the password callback, which sets - * auth_info_required to "username,password". Kerberos goes directly - * through GSSAPI, so look for Negotiate in the WWW-Authenticate header - * here and set auth_info_required as needed... + if (!strncmp(www_auth, "Negotiate", 9)) + auth_info_required = "negotiate"; + else if (www_auth[0]) + auth_info_required = "username,password"; + } + else if (ipp_status == IPP_REQUEST_VALUE) + { + /* + * Print file is too large, abort this job... */ - if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE), - "Negotiate", 9)) - auth_info_required = "negotiate"; + goto cleanup; } else sleep(10); @@ -1461,19 +1514,21 @@ } else { + password_tries = 0; monitor.job_id = job_id = job_id_attr->values[0].integer; _cupsLangPrintFilter(stderr, "INFO", _("Print file accepted - job ID %d."), job_id); } + fprintf(stderr, "DEBUG: job-id=%d\n", job_id); ippDelete(response); if (job_canceled) break; - if (job_id && num_files > 1) + if (job_id && (num_files > 1 || create_job)) { - for (i = 0; i < num_files; i ++) + for (i = 0; num_files == 0 || i < num_files; i ++) { /* * Check for side-channel requests... @@ -1499,21 +1554,41 @@ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, argv[2]); - if ((i + 1) == num_files) + if ((i + 1) >= num_files) ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1); - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, - "document-format", NULL, content_type); + if (document_format) + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, + "document-format", NULL, document_format); fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1); http_status = cupsSendRequest(http, request, resource, 0); - if (http_status == HTTP_CONTINUE && request->state == IPP_DATA && - (fd = open(files[i], O_RDONLY)) >= 0) + if (http_status == HTTP_CONTINUE && request->state == IPP_DATA) { - while (!job_canceled && + if (num_files == 0) + { + fd = 0; + http_status = cupsWriteRequestData(http, buffer, bytes); + } + else + { + if ((fd = open(files[i], O_RDONLY)) < 0) + { + _cupsLangPrintError("ERROR", _("Unable to open print file")); + return (CUPS_BACKEND_FAILED); + } + } + } + else + fd = -1; + + if (fd >= 0) + { + while (!job_canceled && http_status == HTTP_CONTINUE && (bytes = read(fd, buffer, sizeof(buffer))) > 0) { - if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE) + if ((http_status = cupsWriteRequestData(http, buffer, bytes)) + != HTTP_CONTINUE) break; else { @@ -1525,7 +1600,8 @@ } } - close(fd); + if (fd > 0) + close(fd); } ippDelete(cupsGetResponse(http, resource)); @@ -1542,6 +1618,13 @@ _("Unable to add document to print job.")); break; } + else + { + password_tries = 0; + + if (num_files == 0 || fd < 0) + break; + } } } @@ -1554,6 +1637,14 @@ ipp_status == IPP_NOT_POSSIBLE || ipp_status == IPP_PRINTER_BUSY) continue; + else if (ipp_status == IPP_REQUEST_VALUE) + { + /* + * Print file is too large, abort this job... + */ + + goto cleanup; + } else copies_remaining --; @@ -1621,16 +1712,16 @@ fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n", ippErrorString(ipp_status), cupsLastErrorString()); - if (ipp_status > IPP_OK_CONFLICT) + if (ipp_status <= IPP_OK_CONFLICT) + password_tries = 0; + else { if (ipp_status != IPP_SERVICE_UNAVAILABLE && ipp_status != IPP_NOT_POSSIBLE && ipp_status != IPP_PRINTER_BUSY) { ippDelete(response); - - _cupsLangPrintFilter(stderr, "ERROR", - _("Unable to get print job status.")); + ipp_status = IPP_OK; break; } } @@ -1777,6 +1868,11 @@ else if (ipp_status == IPP_DOCUMENT_FORMAT || ipp_status == IPP_CONFLICT) return (CUPS_BACKEND_FAILED); + else if (ipp_status == IPP_REQUEST_VALUE) + { + _cupsLangPrintFilter(stderr, "ERROR", _("Print job too large.")); + return (CUPS_BACKEND_CANCEL); + } else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED) return (CUPS_BACKEND_RETRY_CURRENT); else @@ -1879,6 +1975,9 @@ fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n", ippErrorString(cupsLastError()), cupsLastErrorString()); + if (cupsLastError() <= IPP_OK_CONFLICT) + password_tries = 0; + /* * Return the printer-state value... */ @@ -1972,6 +2071,11 @@ ipp_attribute_t *attr; /* Attribute in response */ int delay, /* Current delay */ prev_delay; /* Previous delay */ + ipp_op_t job_op; /* Operation to use */ + int job_id; /* Job ID */ + const char *job_name; /* Job name */ + ipp_jstate_t job_state; /* Job state */ + const char *job_user; /* Job originating user name */ /* @@ -1981,6 +2085,8 @@ http = _httpCreate(monitor->hostname, monitor->port, NULL, monitor->encryption, AF_UNSPEC); httpSetTimeout(http, 30.0, timeout_cb, NULL); + if (username[0]) + cupsSetUser(username); cupsSetPasswordCB(password_cb); /* @@ -2006,47 +2112,99 @@ monitor->user, monitor->version); - if (monitor->job_id > 0) - { - /* - * Check the status of the job itself... - */ + /* + * Check the status of the job itself... + */ - request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES); - request->request.op.version[0] = monitor->version / 10; - request->request.op.version[1] = monitor->version % 10; + job_op = monitor->job_id > 0 ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS; + request = ippNewRequest(job_op); + request->request.op.version[0] = monitor->version / 10; + request->request.op.version[1] = monitor->version % 10; - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", - NULL, monitor->uri); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", + NULL, monitor->uri); + if (job_op == IPP_GET_JOB_ATTRIBUTES) ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", - monitor->job_id); + monitor->job_id); - if (monitor->user && monitor->user[0]) - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, - "requesting-user-name", NULL, monitor->user); + if (monitor->user && monitor->user[0]) + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + "requesting-user-name", NULL, monitor->user); - ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", - (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, + "requested-attributes", + (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); - /* - * Do the request... - */ + /* + * Do the request... + */ - response = cupsDoRequest(http, request, monitor->resource); + response = cupsDoRequest(http, request, monitor->resource); - fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n", - ippErrorString(cupsLastError()), cupsLastErrorString()); + fprintf(stderr, "DEBUG: %s: %s (%s)\n", ippOpString(job_op), + ippErrorString(cupsLastError()), cupsLastErrorString()); + if (cupsLastError() <= IPP_OK_CONFLICT) + password_tries = 0; + + if (job_op == IPP_GET_JOB_ATTRIBUTES) + { if ((attr = ippFindAttribute(response, "job-state", IPP_TAG_ENUM)) != NULL) monitor->job_state = (ipp_jstate_t)attr->values[0].integer; else monitor->job_state = IPP_JOB_COMPLETED; + } + else if (response) + { + for (attr = response->attrs; attr; attr = attr->next) + { + job_id = 0; + job_name = NULL; + job_state = IPP_JOB_PENDING; + job_user = NULL; + + while (attr && attr->group_tag != IPP_TAG_JOB) + attr = attr->next; + + if (!attr) + break; + + while (attr && attr->group_tag == IPP_TAG_JOB) + { + if (!strcmp(attr->name, "job-id") && + attr->value_tag == IPP_TAG_INTEGER) + job_id = attr->values[0].integer; + else if (!strcmp(attr->name, "job-name") && + (attr->value_tag == IPP_TAG_NAME || + attr->value_tag == IPP_TAG_NAMELANG)) + job_name = attr->values[0].string.text; + else if (!strcmp(attr->name, "job-state") && + attr->value_tag == IPP_TAG_ENUM) + job_state = attr->values[0].integer; + else if (!strcmp(attr->name, "job-originating-user-name") && + (attr->value_tag == IPP_TAG_NAME || + attr->value_tag == IPP_TAG_NAMELANG)) + job_user = attr->values[0].string.text; - ippDelete(response); + attr = attr->next; + } + + if (job_id > 0 && job_name && !strcmp(job_name, monitor->job_name) && + job_user && monitor->user && !strcmp(job_user, monitor->user)) + { + monitor->job_id = job_id; + monitor->job_state = job_state; + break; + } + + if (!attr) + break; + } } + ippDelete(response); + /* * Disconnect from the printer - we'll reconnect on the next poll... */ @@ -2064,6 +2222,15 @@ } /* + * Cancel the job if necessary... + */ + + if (job_canceled && monitor->job_id > 0) + if (!httpReconnect(http)) + cancel_job(http, monitor->uri, monitor->job_id, monitor->resource, + monitor->user, monitor->version); + + /* * Cleanup and return... */ @@ -2088,7 +2255,7 @@ cups_option_t *options, /* I - Options to send */ const char *compression, /* I - compression value or NULL */ int copies, /* I - copies value or 0 */ - const char *format, /* I - documet-format value or NULL */ + const char *format, /* I - document-format value or NULL */ _ppd_cache_t *pc, /* I - PPD cache and mapping data */ ipp_attribute_t *media_col_sup, /* I - media-col-supported values */ ipp_attribute_t *doc_handling_sup) /* I - multiple-document-handling-supported values */ @@ -2163,6 +2330,9 @@ { if (pc) { + int num_finishings = 0, /* Number of finishing values */ + finishings[10]; /* Finishing enum values */ + /* * Send standard IPP attributes... */ @@ -2284,6 +2454,7 @@ } if (doc_handling_sup && + (!format || _cups_strncasecmp(format, "image/", 6)) && (keyword = cupsGetOption("collate", num_options, options)) != NULL) { if (!_cups_strcasecmp(keyword, "true")) @@ -2299,6 +2470,43 @@ break; } } + + /* + * Map finishing options... + */ + + num_finishings = _ppdCacheGetFinishingValues(pc, num_options, options, + (int)(sizeof(finishings) / + sizeof(finishings[0])), + finishings); + if (num_finishings > 0) + ippAddIntegers(request, IPP_TAG_JOB, IPP_TAG_ENUM, "finishings", + num_finishings, finishings); + + /* + * Map FaxOut options... + */ + + if ((keyword = cupsGetOption("phone", num_options, options)) != NULL) + { + ipp_t *destination; /* destination collection */ + char tel_uri[1024]; /* tel: URI */ + + destination = ippNew(); + + httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", + NULL, NULL, 0, keyword); + ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", + NULL, tel_uri); + + if ((keyword = cupsGetOption("faxPrefix", num_options, + options)) != NULL && *keyword) + ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, + "pre-dial-string", NULL, keyword); + + ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination); + ippDelete(destination); + } } else { @@ -2324,6 +2532,9 @@ static const char * /* O - Password */ password_cb(const char *prompt) /* I - Prompt (not used) */ { + fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\"), password=%p, " + "password_tries=%d\n", prompt, password, password_tries); + (void)prompt; /* @@ -2386,17 +2597,23 @@ case IPP_TAG_TEXT : case IPP_TAG_NAME : case IPP_TAG_KEYWORD : + *valptr++ = '\''; *valptr++ = '\"'; for (attrptr = attr->values[i].string.text; *attrptr && valptr < (value + sizeof(value) - 10); attrptr ++) { - if (*attrptr == '\\' || *attrptr == '\"') + if (*attrptr == '\\' || *attrptr == '\"' || *attrptr == '\'') + { + *valptr++ = '\\'; *valptr++ = '\\'; + *valptr++ = '\\'; + } *valptr++ = *attrptr; } *valptr++ = '\"'; + *valptr++ = '\''; break; default : @@ -2988,5 +3205,5 @@ } /* - * End of "$Id: ipp.c 10112 2011-11-07 06:08:44Z mike $". + * End of "$Id: ipp.c 10452 2012-05-04 23:00:01Z mike $". */ diff -Nru cups-1.5.2/backend/lpd.c cups-1.5.3/backend/lpd.c --- cups-1.5.2/backend/lpd.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/backend/lpd.c 2012-02-12 08:20:10.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: lpd.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: lpd.c 10265 2012-02-12 07:20:10Z mike $" * * Line Printer Daemon backend for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -19,7 +19,6 @@ * main() - Send a file to the printer or server. * lpd_command() - Send an LPR command sequence and wait for a reply. * lpd_queue() - Queue a file using the Line Printer Daemon protocol. - * lpd_timeout() - Handle timeout alarms... * lpd_write() - Write a buffer of data to an LPD server. * rresvport_af() - A simple implementation of rresvport_af(). * sigterm_handler() - Handle 'terminate' signals that stop the backend. @@ -87,14 +86,13 @@ * Local functions... */ -static int lpd_command(int lpd_fd, int timeout, char *format, ...); +static int lpd_command(int lpd_fd, char *format, ...); static int lpd_queue(const char *hostname, http_addrlist_t *addrlist, const char *printer, int print_fd, int snmp_fd, int mode, const char *user, const char *title, int copies, int banner, int format, int order, int reserve, int manual_copies, int timeout, int contimeout); -static void lpd_timeout(int sig); static int lpd_write(int lpd_fd, char *buffer, int length); #ifndef HAVE_RRESVPORT_AF static int rresvport_af(int *port, int family); @@ -564,7 +562,6 @@ static int /* O - Status of command */ lpd_command(int fd, /* I - Socket connection to LPD host */ - int timeout, /* I - Seconds to wait for a response */ char *format, /* I - printf()-style format string */ ...) /* I - Additional args as necessary */ { @@ -609,18 +606,12 @@ fputs("DEBUG: Reading command status...\n", stderr); - alarm(timeout); - if (recv(fd, &status, 1, 0) < 1) { - _cupsLangPrintFilter(stderr, "WARNING", - _("Printer did not respond after %d seconds."), - timeout); + _cupsLangPrintFilter(stderr, "WARNING", _("Printer did not respond.")); status = errno; } - alarm(0); - fprintf(stderr, "DEBUG: lpd_command returning %d\n", status); return (status); @@ -666,26 +657,12 @@ size_t nbytes; /* Number of bytes written */ off_t tbytes; /* Total bytes written */ char buffer[32768]; /* Output buffer */ -#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ -#endif /* HAVE_SIGACTION && !HAVE_SIGSET */ - - - /* - * Setup an alarm handler for timeouts... - */ - -#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ - sigset(SIGALRM, lpd_timeout); -#elif defined(HAVE_SIGACTION) - memset(&action, 0, sizeof(action)); - - sigemptyset(&action.sa_mask); - action.sa_handler = lpd_timeout; - sigaction(SIGALRM, &action, NULL); +#ifdef WIN32 + DWORD tv; /* Timeout in milliseconds */ #else - signal(SIGALRM, lpd_timeout); -#endif /* HAVE_SIGSET */ + struct timeval tv; /* Timeout in secs and usecs */ +#endif /* WIN32 */ + /* * Remember when we started trying to connect to the printer... @@ -864,6 +841,23 @@ } } + /* + * Set the timeout... + */ + +#ifdef WIN32 + tv = (DWORD)(timeout * 1000); + + setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv)); + setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv)); +#else + tv.tv_sec = timeout; + tv.tv_usec = 0; + + setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); + setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); +#endif /* WIN32 */ + fputs("STATE: -connecting-to-device\n", stderr); _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer.")); @@ -926,7 +920,7 @@ * literal output... */ - if (lpd_command(fd, timeout, "\002%s\n", + if (lpd_command(fd, "\002%s\n", printer)) /* Receive print job(s) */ { close(fd); @@ -978,7 +972,7 @@ * Send the control file... */ - if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control), + if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control), (int)getpid() % 1000, localhost)) { close(fd); @@ -997,17 +991,12 @@ } else { - alarm(timeout); - if (read(fd, &status, 1) < 1) { _cupsLangPrintFilter(stderr, "WARNING", - _("Printer did not respond after %d seconds."), - timeout); + _("Printer did not respond.")); status = errno; } - - alarm(0); } if (status != 0) @@ -1033,7 +1022,7 @@ * Send the print file... */ - if (lpd_command(fd, timeout, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n", + if (lpd_command(fd, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n", CUPS_LLCAST filestats.st_size, (int)getpid() % 1000, localhost)) { @@ -1084,17 +1073,12 @@ * want to requeue it over and over... */ - alarm(timeout); - if (recv(fd, &status, 1, 0) < 1) { _cupsLangPrintFilter(stderr, "WARNING", - _("Printer did not respond after %d seconds."), - timeout); + _("Printer did not respond.")); status = 0; } - - alarm(0); } } else @@ -1121,7 +1105,7 @@ * Send control file... */ - if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control), + if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control), (int)getpid() % 1000, localhost)) { close(fd); @@ -1139,17 +1123,12 @@ } else { - alarm(timeout); - if (read(fd, &status, 1) < 1) { _cupsLangPrintFilter(stderr, "WARNING", - _("Printer did not respond after %d seconds."), - timeout); + _("Printer did not respond.")); status = errno; } - - alarm(0); } if (status != 0) @@ -1193,21 +1172,6 @@ /* - * 'lpd_timeout()' - Handle timeout alarms... - */ - -static void -lpd_timeout(int sig) /* I - Signal number */ -{ - (void)sig; - -#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION) - signal(SIGALRM, lpd_timeout); -#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */ -} - - -/* * 'lpd_write()' - Write a buffer of data to an LPD server. */ @@ -1338,5 +1302,5 @@ /* - * End of "$Id: lpd.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: lpd.c 10265 2012-02-12 07:20:10Z mike $". */ diff -Nru cups-1.5.2/backend/Makefile cups-1.5.3/backend/Makefile --- cups-1.5.2/backend/Makefile 2011-05-04 06:28:00.000000000 +0200 +++ cups-1.5.3/backend/Makefile 2012-04-23 19:42:12.000000000 +0200 @@ -1,9 +1,9 @@ # -# "$Id: Makefile 9737 2011-05-04 04:28:00Z mike $" +# "$Id: Makefile 10425 2012-04-23 17:42:12Z mike $" # # Backend makefile for CUPS. # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -98,7 +98,7 @@ $(RM) $(SERVERBIN)/backend/$$file; \ $(LN) ipp $(SERVERBIN)/backend/$$file; \ done - if test "x$(DNSSD_BACKEND)" != x; then \ + if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \ $(RM) $(SERVERBIN)/backend/mdns; \ $(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \ fi @@ -268,7 +268,7 @@ usb: usb.o ../cups/$(LIBCUPS) libbackend.a echo Linking $@... - $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ $(BACKLIBS) $(LIBS) usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c @@ -281,5 +281,5 @@ # -# End of "$Id: Makefile 9737 2011-05-04 04:28:00Z mike $". +# End of "$Id: Makefile 10425 2012-04-23 17:42:12Z mike $". # diff -Nru cups-1.5.2/backend/runloop.c cups-1.5.3/backend/runloop.c --- cups-1.5.2/backend/runloop.c 2011-06-11 00:06:26.000000000 +0200 +++ cups-1.5.3/backend/runloop.c 2012-03-21 05:31:19.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: runloop.c 9820 2011-06-10 22:06:26Z mike $" + * "$Id: runloop.c 10369 2012-03-21 04:31:19Z mike $" * * Common run loop APIs for CUPS backends. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 2006-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -434,9 +434,11 @@ int use_bc, /* I - Use back-channel? */ _cups_sccb_t side_cb) /* I - Side-channel callback */ { - fd_set input; /* Input set for reading */ - time_t curtime, /* Current time */ - snmp_update = 0; /* Last SNMP status update */ + int nfds; /* Number of file descriptors */ + fd_set input; /* Input set for reading */ + time_t curtime, /* Current time */ + snmp_update = 0;/* Last SNMP status update */ + struct timeval timeout; /* Timeout for select() */ fprintf(stderr, "DEBUG: backendWaitLoop(snmp_fd=%d, addr=%p, side_cb=%p)\n", @@ -446,6 +448,9 @@ * Now loop until we receive data from stdin... */ + if (snmp_fd >= 0) + snmp_update = time(NULL) + 5; + for (;;) { /* @@ -457,7 +462,18 @@ if (side_cb) FD_SET(CUPS_SC_FD, &input); - if (select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL) < 0) + if (snmp_fd >= 0) + { + curtime = time(NULL); + timeout.tv_sec = curtime >= snmp_update ? 0 : snmp_update - curtime; + timeout.tv_usec = 0; + + nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, &timeout); + } + else + nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL); + + if (nfds < 0) { /* * Pause printing to clear any pending errors... @@ -501,10 +517,10 @@ * Do SNMP updates periodically... */ - if (snmp_fd >= 0 && time(&curtime) >= snmp_update) + if (snmp_fd >= 0 && curtime >= snmp_update) { if (backendSNMPSupplies(snmp_fd, addr, NULL, NULL)) - snmp_update = INT_MAX; + snmp_fd = -1; else snmp_update = curtime + 5; } @@ -519,5 +535,5 @@ /* - * End of "$Id: runloop.c 9820 2011-06-10 22:06:26Z mike $". + * End of "$Id: runloop.c 10369 2012-03-21 04:31:19Z mike $". */ diff -Nru cups-1.5.2/backend/snmp-supplies.c cups-1.5.3/backend/snmp-supplies.c --- cups-1.5.2/backend/snmp-supplies.c 2011-10-07 23:41:07.000000000 +0200 +++ cups-1.5.3/backend/snmp-supplies.c 2012-02-12 06:48:09.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: snmp-supplies.c 10064 2011-10-07 21:41:07Z mike $" + * "$Id: snmp-supplies.c 10262 2012-02-12 05:48:09Z mike $" * * SNMP supplies functions for CUPS. * - * Copyright 2008-2011 by Apple Inc. + * Copyright 2008-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -408,7 +408,7 @@ cachefilename[1024], /* Cache filename */ description[CUPS_SNMP_MAX_STRING], /* Device description string */ - value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 2 + 3)], + value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 4 + 3)], /* Value string */ *ptr, /* Pointer into value string */ *name_ptr; /* Pointer into name string */ @@ -659,7 +659,8 @@ fprintf(stderr, "ATTR: marker-colors=%s\n", value); /* - * Output the marker-names attribute... + * Output the marker-names attribute (the double quoting is necessary to deal + * with embedded quotes and commas in the marker names...) */ for (i = 0, ptr = value; i < num_supplies; i ++) @@ -667,15 +668,21 @@ if (i) *ptr++ = ','; + *ptr++ = '\''; *ptr++ = '\"'; for (name_ptr = supplies[i].name; *name_ptr;) { - if (*name_ptr == '\\' || *name_ptr == '\"') + if (*name_ptr == '\\' || *name_ptr == '\"' || *name_ptr == '\'') + { + *ptr++ = '\\'; + *ptr++ = '\\'; *ptr++ = '\\'; + } *ptr++ = *name_ptr++; } *ptr++ = '\"'; + *ptr++ = '\''; } *ptr = '\0'; @@ -712,16 +719,33 @@ void *data) /* I - User data (unused) */ { int i, j, k; /* Looping vars */ - static const char * const colors[8][2] = + static const char * const colors[][2] = { /* Standard color names */ - { "black", "#000000" }, - { "blue", "#0000FF" }, - { "cyan", "#00FFFF" }, - { "green", "#00FF00" }, - { "magenta", "#FF00FF" }, - { "red", "#FF0000" }, - { "white", "#FFFFFF" }, - { "yellow", "#FFFF00" } + { "black", "#000000" }, + { "blue", "#0000FF" }, + { "brown", "#A52A2A" }, + { "cyan", "#00FFFF" }, + { "dark-gray", "#404040" }, + { "dark gray", "#404040" }, + { "dark-yellow", "#FFCC00" }, + { "dark yellow", "#FFCC00" }, + { "gold", "#FFD700" }, + { "gray", "#808080" }, + { "green", "#00FF00" }, + { "light-black", "#606060" }, + { "light black", "#606060" }, + { "light-cyan", "#E0FFFF" }, + { "light cyan", "#E0FFFF" }, + { "light-gray", "#D3D3D3" }, + { "light gray", "#D3D3D3" }, + { "light-magenta", "#FF77FF" }, + { "light magenta", "#FF77FF" }, + { "magenta", "#FF00FF" }, + { "orange", "#FFA500" }, + { "red", "#FF0000" }, + { "silver", "#C0C0C0" }, + { "white", "#FFFFFF" }, + { "yellow", "#FFFF00" } }; @@ -743,7 +767,8 @@ if (supplies[j].colorant == i) { for (k = 0; k < (int)(sizeof(colors) / sizeof(colors[0])); k ++) - if (!strcmp(colors[k][0], (char *)packet->object_value.string.bytes)) + if (!_cups_strcasecmp(colors[k][0], + (char *)packet->object_value.string.bytes)) { strcpy(supplies[j].color, colors[k][1]); break; @@ -834,7 +859,6 @@ { char *src, *dst; /* Pointers into strings */ - /* * Loop safe because both the object_value and supplies char arrays * are CUPS_SNMP_MAX_STRING elements long. @@ -982,5 +1006,5 @@ /* - * End of "$Id: snmp-supplies.c 10064 2011-10-07 21:41:07Z mike $". + * End of "$Id: snmp-supplies.c 10262 2012-02-12 05:48:09Z mike $". */ diff -Nru cups-1.5.2/backend/usb.c cups-1.5.3/backend/usb.c --- cups-1.5.2/backend/usb.c 2011-05-12 07:21:56.000000000 +0200 +++ cups-1.5.3/backend/usb.c 2012-02-12 08:20:10.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: usb.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: usb.c 10265 2012-02-12 07:20:10Z mike $" * * USB port backend for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -55,7 +55,7 @@ * Include the vendor-specific USB implementation... */ -#ifdef HAVE_USB_H +#ifdef HAVE_LIBUSB # include "usb-libusb.c" #elif defined(__APPLE__) # include "usb-darwin.c" @@ -118,7 +118,7 @@ return (CUPS_BACKEND_FAILED); } -#endif /* __APPLE__ */ +#endif /* HAVE_LIBUSB */ /* @@ -260,5 +260,5 @@ /* - * End of "$Id: usb.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: usb.c 10265 2012-02-12 07:20:10Z mike $". */ diff -Nru cups-1.5.2/backend/usb-libusb.c cups-1.5.3/backend/usb-libusb.c --- cups-1.5.2/backend/usb-libusb.c 2012-01-27 17:48:43.000000000 +0100 +++ cups-1.5.3/backend/usb-libusb.c 2012-02-12 09:35:28.000000000 +0100 @@ -1,7 +1,7 @@ /* - * "$Id: usb-libusb.c 10198 2012-01-27 16:48:43Z mike $" + * "$Id: usb-libusb.c 10267 2012-02-12 08:35:28Z mike $" * - * Libusb interface code for CUPS. + * LIBUSB interface code for CUPS. * * Copyright 2007-2012 by Apple Inc. * @@ -13,25 +13,43 @@ * * Contents: * - * list_devices() - List the available printers. - * print_device() - Print a file to a USB device. - * close_device() - Close the connection to the USB printer. - * find_device() - Find or enumerate USB printers. - * get_device_id() - Get the IEEE-1284 device ID for the printer. - * list_cb() - List USB printers for discovery. - * make_device_uri() - Create a device URI for a USB printer. - * open_device() - Open a connection to the USB printer. - * print_cb() - Find a USB printer for printing. - * side_cb() - Handle side-channel requests. + * list_devices() - List the available printers. + * print_device() - Print a file to a USB device. + * close_device() - Close the connection to the USB printer. + * find_device() - Find or enumerate USB printers. + * get_device_id() - Get the IEEE-1284 device ID for the printer. + * list_cb() - List USB printers for discovery. + * make_device_uri() - Create a device URI for a USB printer. + * open_device() - Open a connection to the USB printer. + * print_cb() - Find a USB printer for printing. + * read_thread() - Thread to read the backchannel data on. + * sidechannel_thread() - Handle side-channel requests. + * soft_reset() - Send a soft reset to the device. */ /* * Include necessary headers... */ -#include -#include +#include #include +#include +#include +#include +#include +#include +#include + + +/* + * WAIT_EOF_DELAY is number of seconds we'll wait for responses from + * the printer after we've finished sending all the data + */ + +#define WAIT_EOF 0 +#define WAIT_EOF_DELAY 7 +#define WAIT_SIDE_DELAY 3 +#define DEFAULT_TIMEOUT 5000L /* @@ -40,18 +58,55 @@ typedef struct usb_printer_s /**** USB Printer Data ****/ { - struct usb_device *device; /* Device info */ + struct libusb_device *device; /* Device info */ int conf, /* Configuration */ iface, /* Interface */ altset, /* Alternate setting */ write_endp, /* Write endpoint */ - read_endp; /* Read endpoint */ - struct usb_dev_handle *handle; /* Open handle to device */ + read_endp, /* Read endpoint */ + protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */ + usblp_attached; /* Is the "usblp" kernel module + attached? */ + struct libusb_device_handle *handle; /* Open handle to device */ } usb_printer_t; typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *, const void *); +typedef struct usb_globals_s +{ + usb_printer_t *printer; /* Printer */ + + pthread_mutex_t read_thread_mutex; + pthread_cond_t read_thread_cond; + int read_thread_stop; + int read_thread_done; + + pthread_mutex_t readwrite_lock_mutex; + pthread_cond_t readwrite_lock_cond; + int readwrite_lock; + + int print_fd; /* File descriptor to print */ + ssize_t print_bytes; /* Print bytes read */ + + int wait_eof; + int drain_output; /* Drain all pending output */ + int bidi_flag; /* 0=unidirectional, 1=bidirectional */ + + pthread_mutex_t sidechannel_thread_mutex; + pthread_cond_t sidechannel_thread_cond; + int sidechannel_thread_stop; + int sidechannel_thread_done; +} usb_globals_t; + + +/* + * Globals... + */ + +usb_globals_t g = { 0 }; /* Globals */ +libusb_device **list; /* List of connected USB devices */ + /* * Local functions... @@ -69,7 +124,9 @@ static int open_device(usb_printer_t *printer, int verbose); static int print_cb(usb_printer_t *printer, const char *device_uri, const char *device_id, const void *data); -static ssize_t side_cb(usb_printer_t *printer, int print_fd); +static void *read_thread(void *reference); +static void *sidechannel_thread(void *reference); +static void soft_reset(void); /* @@ -98,27 +155,46 @@ int argc, /* I - Number of command-line arguments (6 or 7) */ char *argv[]) /* I - Command-line arguments */ { - usb_printer_t *printer; /* Printer */ - ssize_t bytes, /* Bytes read/written */ - tbytes; /* Total bytes written */ - char buffer[512]; /* Print data buffer */ + int bytes; /* Bytes written */ + ssize_t total_bytes; /* Total bytes written */ struct sigaction action; /* Actions for POSIX signals */ - struct pollfd pfds[2]; /* Poll descriptors */ + int status = CUPS_BACKEND_OK, + /* Function results */ + iostatus; /* Current IO status */ + pthread_t read_thread_id, /* Read thread */ + sidechannel_thread_id; /* Side-channel thread */ + int have_sidechannel = 0; /* Was the side-channel thread started? */ + struct stat sidechannel_info; /* Side-channel file descriptor info */ + unsigned char print_buffer[8192], /* Print data buffer */ + *print_ptr; /* Pointer into print data buffer */ + fd_set input_set; /* Input set for select() */ + int nfds; /* Number of file descriptors */ + struct timeval *timeout, /* Timeout pointer */ + tv; /* Time value */ + struct timespec cond_timeout; /* pthread condition timeout */ + + + /* + * See if the side-channel descriptor is valid... + */ + have_sidechannel = !fstat(CUPS_SC_FD, &sidechannel_info) && + S_ISSOCK(sidechannel_info.st_mode); - fputs("DEBUG: print_device\n", stderr); + g.wait_eof = WAIT_EOF; /* * Connect to the printer... */ - while ((printer = find_device(print_cb, uri)) == NULL) + while ((g.printer = find_device(print_cb, uri)) == NULL) { _cupsLangPrintFilter(stderr, "INFO", _("Waiting for printer to become available.")); sleep(5); } + g.print_fd = print_fd; /* * If we are printing data from a print driver on stdin, ignore SIGTERM @@ -136,74 +212,371 @@ sigaction(SIGTERM, &action, NULL); } - tbytes = 0; + /* + * Start the side channel thread if the descriptor is valid... + */ - pfds[0].fd = print_fd; - pfds[0].events = POLLIN; - pfds[1].fd = CUPS_SC_FD; - pfds[1].events = POLLIN; + pthread_mutex_init(&g.readwrite_lock_mutex, NULL); + pthread_cond_init(&g.readwrite_lock_cond, NULL); + g.readwrite_lock = 1; - while (copies > 0 && tbytes >= 0) + if (have_sidechannel) { - copies --; + g.sidechannel_thread_stop = 0; + g.sidechannel_thread_done = 0; + + pthread_cond_init(&g.sidechannel_thread_cond, NULL); + pthread_mutex_init(&g.sidechannel_thread_mutex, NULL); - if (print_fd != 0) + if (pthread_create(&sidechannel_thread_id, NULL, sidechannel_thread, NULL)) + { + fprintf(stderr, "DEBUG: Fatal USB error.\n"); + _cupsLangPrintFilter(stderr, "ERROR", + _("There was an unrecoverable USB error.")); + fputs("DEBUG: Couldn't create side-channel thread.\n", stderr); + close_device(g.printer); + return (CUPS_BACKEND_STOP); + } + } + + /* + * Get the read thread going... + */ + + g.read_thread_stop = 0; + g.read_thread_done = 0; + + pthread_cond_init(&g.read_thread_cond, NULL); + pthread_mutex_init(&g.read_thread_mutex, NULL); + + if (pthread_create(&read_thread_id, NULL, read_thread, NULL)) + { + fprintf(stderr, "DEBUG: Fatal USB error.\n"); + _cupsLangPrintFilter(stderr, "ERROR", + _("There was an unrecoverable USB error.")); + fputs("DEBUG: Couldn't create read thread.\n", stderr); + close_device(g.printer); + return (CUPS_BACKEND_STOP); + } + + /* + * The main thread sends the print file... + */ + + g.drain_output = 0; + g.print_bytes = 0; + total_bytes = 0; + print_ptr = print_buffer; + + while (status == CUPS_BACKEND_OK && copies-- > 0) + { + _cupsLangPrintFilter(stderr, "INFO", _("Sending data to printer.")); + + if (print_fd != STDIN_FILENO) { fputs("PAGE: 1 1\n", stderr); lseek(print_fd, 0, SEEK_SET); } - /* - * TODO: Add back-channel support, along with better write error handling. - */ - - while (poll(pfds, 2, -1) > 0) + while (status == CUPS_BACKEND_OK) { + FD_ZERO(&input_set); + + if (!g.print_bytes) + FD_SET(print_fd, &input_set); + + /* + * Calculate select timeout... + * If we have data waiting to send timeout is 100ms. + * else if we're draining print_fd timeout is 0. + * else we're waiting forever... + */ + + if (g.print_bytes) + { + tv.tv_sec = 0; + tv.tv_usec = 100000; /* 100ms */ + timeout = &tv; + } + else if (g.drain_output) + { + tv.tv_sec = 0; + tv.tv_usec = 0; + timeout = &tv; + } + else + timeout = NULL; + + /* + * I/O is unlocked around select... + */ + + pthread_mutex_lock(&g.readwrite_lock_mutex); + g.readwrite_lock = 0; + pthread_cond_signal(&g.readwrite_lock_cond); + pthread_mutex_unlock(&g.readwrite_lock_mutex); + + nfds = select(print_fd + 1, &input_set, NULL, NULL, timeout); + /* - * CUPS STR #3318: USB process hangs on end-of-file, making further - * printing impossible - * - * From a strict interpretation of POSIX poll(), POLLHUP should never be - * set without POLLIN, since POLLIN is the event you request. That said, - * it appears that some versions of Linux break this. + * Reacquire the lock... */ - if (pfds[0].revents & (POLLIN | POLLHUP)) + pthread_mutex_lock(&g.readwrite_lock_mutex); + while (g.readwrite_lock) + pthread_cond_wait(&g.readwrite_lock_cond, &g.readwrite_lock_mutex); + g.readwrite_lock = 1; + pthread_mutex_unlock(&g.readwrite_lock_mutex); + + if (nfds < 0) { - if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) + if (errno == EINTR && total_bytes == 0) + { + fputs("DEBUG: Received an interrupt before any bytes were " + "written, aborting.\n", stderr); + close_device(g.printer); + return (CUPS_BACKEND_OK); + } + else if (errno != EAGAIN && errno != EINTR) { - if (usb_bulk_write(printer->handle, printer->write_endp, buffer, - bytes, 3600000) < 0) + _cupsLangPrintFilter(stderr, "ERROR", + _("Unable to read print data.")); + perror("DEBUG: select"); + close_device(g.printer); + return (CUPS_BACKEND_FAILED); + } + } + + /* + * If drain output has finished send a response... + */ + + if (g.drain_output && !nfds && !g.print_bytes) + { + /* Send a response... */ + cupsSideChannelWrite(CUPS_SC_CMD_DRAIN_OUTPUT, CUPS_SC_STATUS_OK, NULL, 0, 1.0); + g.drain_output = 0; + } + + /* + * Check if we have print data ready... + */ + + if (FD_ISSET(print_fd, &input_set)) + { + g.print_bytes = read(print_fd, print_buffer, sizeof(print_buffer)); + + if (g.print_bytes < 0) + { + /* + * Read error - bail if we don't see EAGAIN or EINTR... + */ + + if (errno != EAGAIN && errno != EINTR) { _cupsLangPrintFilter(stderr, "ERROR", - _("Unable to send data to printer.")); - tbytes = -1; - break; + _("Unable to read print data.")); + perror("DEBUG: read"); + close_device(g.printer); + return (CUPS_BACKEND_FAILED); } - tbytes += bytes; + g.print_bytes = 0; + } + else if (g.print_bytes == 0) + { + /* + * End of file, break out of the loop... + */ + + break; + } + + print_ptr = print_buffer; + + fprintf(stderr, "DEBUG: Read %d bytes of print data...\n", + (int)g.print_bytes); + } + + if (g.print_bytes) + { + iostatus = libusb_bulk_transfer(g.printer->handle, + g.printer->write_endp, + print_buffer, g.print_bytes, + &bytes, 60000); + /* + * Ignore timeout errors, but retain the number of bytes written to + * avoid sending duplicate data... + */ + + if (iostatus == LIBUSB_ERROR_TIMEOUT) + { + fputs("DEBUG: Got USB transaction timeout during write.\n", stderr); + iostatus = 0; + } + + /* + * If we've stalled, retry the write... + */ + + else if (iostatus == LIBUSB_ERROR_PIPE) + { + fputs("DEBUG: Got USB pipe stalled during write.\n", stderr); + + iostatus = libusb_bulk_transfer(g.printer->handle, + g.printer->write_endp, + print_buffer, g.print_bytes, + &bytes, 60000); + } + + /* + * Retry a write after an aborted write since we probably just got + * SIGTERM... + */ + + else if (iostatus == LIBUSB_ERROR_INTERRUPTED) + { + fputs("DEBUG: Got USB return aborted during write.\n", stderr); + + iostatus = libusb_bulk_transfer(g.printer->handle, + g.printer->write_endp, + print_buffer, g.print_bytes, + &bytes, 60000); + } + + if (iostatus) + { + /* + * Write error - bail if we don't see an error we can retry... + */ + + _cupsLangPrintFilter(stderr, "ERROR", + _("Unable to send data to printer.")); + fprintf(stderr, "DEBUG: libusb write operation returned %x.\n", + iostatus); + + status = CUPS_BACKEND_FAILED; + break; + } + else if (bytes > 0) + { + fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", + (int)bytes); + + g.print_bytes -= bytes; + print_ptr += bytes; + total_bytes += bytes; } - else if (bytes == 0 || (bytes < 0 && errno != EAGAIN && errno != EINTR)) + } + + if (print_fd != 0 && status == CUPS_BACKEND_OK) + fprintf(stderr, "DEBUG: Sending print file, " CUPS_LLFMT " bytes...\n", + CUPS_LLCAST total_bytes); + } + } + + fprintf(stderr, "DEBUG: Sent " CUPS_LLFMT " bytes...\n", + CUPS_LLCAST total_bytes); + + /* + * Signal the side channel thread to exit... + */ + + if (have_sidechannel) + { + close(CUPS_SC_FD); + pthread_mutex_lock(&g.readwrite_lock_mutex); + g.readwrite_lock = 0; + pthread_cond_signal(&g.readwrite_lock_cond); + pthread_mutex_unlock(&g.readwrite_lock_mutex); + + g.sidechannel_thread_stop = 1; + pthread_mutex_lock(&g.sidechannel_thread_mutex); + + if (!g.sidechannel_thread_done) + { + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + WAIT_SIDE_DELAY; + cond_timeout.tv_nsec = tv.tv_usec * 1000; + + while (!g.sidechannel_thread_done) + { + if (pthread_cond_timedwait(&g.sidechannel_thread_cond, + &g.sidechannel_thread_mutex, + &cond_timeout) != 0) break; } + } - if (pfds[1].revents & (POLLIN | POLLHUP)) + pthread_mutex_unlock(&g.sidechannel_thread_mutex); + } + + /* + * Signal the read thread to exit then wait 7 seconds for it to complete... + */ + + g.read_thread_stop = 1; + + pthread_mutex_lock(&g.read_thread_mutex); + + if (!g.read_thread_done) + { + fputs("DEBUG: Waiting for read thread to exit...\n", stderr); + + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + WAIT_EOF_DELAY; + cond_timeout.tv_nsec = tv.tv_usec * 1000; + + while (!g.read_thread_done) + { + if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, + &cond_timeout) != 0) + break; + } + + /* + * If it didn't exit abort the pending read and wait an additional second... + */ + + if (!g.read_thread_done) + { + fputs("DEBUG: Read thread still active, aborting the pending read...\n", + stderr); + + g.wait_eof = 0; + + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + 1; + cond_timeout.tv_nsec = tv.tv_usec * 1000; + + while (!g.read_thread_done) { - if ((bytes = side_cb(printer, print_fd)) < 0) - pfds[1].events = 0; /* Filter has gone away... */ - else - tbytes += bytes; + if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, + &cond_timeout) != 0) + break; } } } + pthread_mutex_unlock(&g.read_thread_mutex); + + if (print_fd) + close(print_fd); + /* - * Close our connection and return... + * Close the connection and input file and general clean up... */ - close_device(printer); + close_device(g.printer); - return (CUPS_BACKEND_OK); + /* + * Clean up .... + */ + + libusb_free_device_list(list, 1); + libusb_exit(NULL); + + return (status); } @@ -214,6 +587,12 @@ static int /* I - 0 on success, -1 on failure */ close_device(usb_printer_t *printer) /* I - Printer */ { + struct libusb_device_descriptor devdesc; + /* Current device descriptor */ + struct libusb_config_descriptor *confptr; + /* Pointer to current configuration */ + + if (printer->handle) { /* @@ -221,19 +600,36 @@ * to the device... */ - int number = printer->device->config[printer->conf]. - interface[printer->iface]. - altsetting[printer->altset].bInterfaceNumber; - usb_release_interface(printer->handle, number); + int number; /* Interface number */ + libusb_get_device_descriptor (printer->device, &devdesc); + libusb_get_config_descriptor (printer->device, printer->conf, &confptr); + number = confptr->interface[printer->iface]. + altsetting[printer->altset].bInterfaceNumber; + libusb_release_interface(printer->handle, number); if (number != 0) - usb_release_interface(printer->handle, 0); + libusb_release_interface(printer->handle, 0); + + /* + * Re-attach "usblp" kernel module if it was attached before using this + * device + */ + + if (printer->usblp_attached == 1) + { + if (libusb_attach_kernel_driver(printer->handle, printer->iface) < 0) + fprintf(stderr, + "DEBUG: Failed to re-attach \"usblp\" kernel module to " + "%04x:%04x\n", devdesc.idVendor, devdesc.idProduct); + } + + libusb_free_config_descriptor(confptr); /* * Close the interface and return... */ - usb_close(printer->handle); + libusb_close(printer->handle); printer->handle = NULL; } @@ -249,15 +645,21 @@ find_device(usb_cb_t cb, /* I - Callback function */ const void *data) /* I - User data for callback */ { - struct usb_bus *bus; /* Current bus */ - struct usb_device *device; /* Current device */ - struct usb_config_descriptor *confptr;/* Pointer to current configuration */ - struct usb_interface *ifaceptr; /* Pointer to current interface */ - struct usb_interface_descriptor *altptr; + libusb_device **list; /* List of connected USB devices */ + libusb_device *device = NULL; /* Current device */ + struct libusb_device_descriptor devdesc; + /* Current device descriptor */ + struct libusb_config_descriptor *confptr = NULL; + /* Pointer to current configuration */ + const struct libusb_interface *ifaceptr = NULL; + /* Pointer to current interface */ + const struct libusb_interface_descriptor *altptr = NULL; /* Pointer to current alternate setting */ - struct usb_endpoint_descriptor *endpptr; + const struct libusb_endpoint_descriptor *endpptr = NULL; /* Pointer to current endpoint */ - int conf, /* Current configuration */ + ssize_t numdevs, /* number of connected devices */ + i = 0; + uint8_t conf, /* Current configuration */ iface, /* Current interface */ altset, /* Current alternate setting */ protocol, /* Current protocol */ @@ -274,29 +676,34 @@ * Initialize libusb... */ - usb_init(); - fprintf(stderr, "DEBUG: usb_find_busses=%d\n", usb_find_busses()); - fprintf(stderr, "DEBUG: usb_find_devices=%d\n", usb_find_devices()); + libusb_init(NULL); + numdevs = libusb_get_device_list(NULL, &list); + fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs); /* * Then loop through the devices it found... */ - for (bus = usb_get_busses(); bus; bus = bus->next) - for (device = bus->devices; device; device = device->next) + if (numdevs > 0) + for (i = 0; i < numdevs; i++) { + device = list[i]; + /* * Ignore devices with no configuration data and anything that is not * a printer... */ - if (!device->config || !device->descriptor.idVendor || - !device->descriptor.idProduct) + libusb_get_device_descriptor (device, &devdesc); + + if (!devdesc.bNumConfigurations || !devdesc.idVendor || + !devdesc.idProduct) continue; - for (conf = 0, confptr = device->config; - conf < device->descriptor.bNumConfigurations; - conf ++, confptr ++) + for (conf = 0; conf < devdesc.bNumConfigurations; conf ++) + { + if (libusb_get_config_descriptor (device, conf, &confptr) < 0) + continue; for (iface = 0, ifaceptr = confptr->interface; iface < confptr->bNumInterfaces; iface ++, ifaceptr ++) @@ -317,7 +724,7 @@ * 1284.4 (packet mode) protocol as well. */ - if (altptr->bInterfaceClass != USB_CLASS_PRINTER || + if (altptr->bInterfaceClass != LIBUSB_CLASS_PRINTER || altptr->bInterfaceSubClass != 1 || (altptr->bInterfaceProtocol != 1 && /* Unidirectional */ altptr->bInterfaceProtocol != 2) || /* Bidirectional */ @@ -330,10 +737,10 @@ for (endp = 0, endpptr = altptr->endpoint; endp < altptr->bNumEndpoints; endp ++, endpptr ++) - if ((endpptr->bmAttributes & USB_ENDPOINT_TYPE_MASK) == - USB_ENDPOINT_TYPE_BULK) + if ((endpptr->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) == + LIBUSB_TRANSFER_TYPE_BULK) { - if (endpptr->bEndpointAddress & USB_ENDPOINT_DIR_MASK) + if (endpptr->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK) read_endp = endp; else write_endp = endp; @@ -354,38 +761,37 @@ if (protocol > 0) { - printer.device = device; - printer.conf = conf; - printer.iface = iface; - printer.handle = NULL; + printer.device = device; + printer.conf = conf; + printer.iface = iface; + printer.protocol = protocol; + printer.handle = NULL; if (!open_device(&printer, data != NULL)) { - if (!get_device_id(&printer, device_id, sizeof(device_id))) - { - make_device_uri(&printer, device_id, device_uri, - sizeof(device_uri)); + get_device_id(&printer, device_id, sizeof(device_id)); + make_device_uri(&printer, device_id, device_uri, + sizeof(device_uri)); - if ((*cb)(&printer, device_uri, device_id, data)) - { - printer.read_endp = printer.device->config[printer.conf]. - interface[printer.iface]. + if ((*cb)(&printer, device_uri, device_id, data)) + { + printer.read_endp = confptr->interface[printer.iface]. altsetting[printer.altset]. endpoint[printer.read_endp]. bEndpointAddress; - printer.write_endp = printer.device->config[printer.conf]. - interface[printer.iface]. + printer.write_endp = confptr->interface[printer.iface]. altsetting[printer.altset]. endpoint[printer.write_endp]. bEndpointAddress; - return (&printer); - } + return (&printer); } close_device(&printer); } } } + libusb_free_config_descriptor(confptr); + } } /* @@ -393,6 +799,13 @@ * to print to... */ + /* + * Clean up .... + */ + + libusb_free_device_list(list, 1); + libusb_exit(NULL); + return (NULL); } @@ -409,10 +822,12 @@ int length; /* Length of device ID */ - if (usb_control_msg(printer->handle, - USB_TYPE_CLASS | USB_ENDPOINT_IN | USB_RECIP_INTERFACE, - 0, printer->conf, (printer->iface << 8) | printer->altset, - buffer, bufsize, 5000) < 0) + if (libusb_control_transfer(printer->handle, + LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_ENDPOINT_IN | + LIBUSB_RECIPIENT_INTERFACE, + 0, printer->conf, + (printer->iface << 8) | printer->altset, + (unsigned char *)buffer, bufsize, 5000) < 0) { *buffer = '\0'; return (-1); @@ -482,7 +897,8 @@ * Get the device URI and make/model strings... */ - backendGetMakeModel(device_id, make_model, sizeof(make_model)); + if (backendGetMakeModel(device_id, make_model, sizeof(make_model))) + strlcpy(make_model, "Unknown", sizeof(make_model)); /* * Report the printer... @@ -510,12 +926,14 @@ char *uri, /* I - Device URI buffer */ size_t uri_size) /* I - Size of device URI buffer */ { + struct libusb_device_descriptor devdesc; + /* Current device descriptor */ char options[1024]; /* Device URI options */ int num_values; /* Number of 1284 parameters */ cups_option_t *values; /* 1284 parameters */ const char *mfg, /* Manufacturer */ *mdl, /* Model */ - *des, /* Description */ + *des = NULL, /* Description */ *sern; /* Serial number */ size_t mfglen; /* Length of manufacturer string */ char tempmfg[256], /* Temporary manufacturer string */ @@ -532,16 +950,18 @@ if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL) if ((sern = cupsGetOption("SERN", num_values, values)) == NULL) if ((sern = cupsGetOption("SN", num_values, values)) == NULL && - printer->device->descriptor.iSerialNumber) + ((libusb_get_device_descriptor (printer->device, &devdesc) >= 0) && + devdesc.iSerialNumber)) { /* * Try getting the serial number from the device itself... */ - int length = usb_get_string_simple(printer->handle, - printer->device->descriptor. - iSerialNumber, - tempsern, sizeof(tempsern) - 1); + int length = + libusb_get_string_descriptor_ascii(printer->handle, + devdesc.iSerialNumber, + (unsigned char *)tempsern, + sizeof(tempsern) - 1); if (length > 0) { tempsern[length] = '\0'; @@ -555,15 +975,6 @@ if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL) mdl = cupsGetOption("MDL", num_values, values); -#ifdef __APPLE__ - /* - * To maintain compatibility with the original IOKit-based backend on Mac OS X, - * don't map manufacturer names... - */ - - if (!mfg) - -#else /* * To maintain compatibility with the original character device backend on * Linux and *BSD, map manufacturer names... @@ -577,7 +988,6 @@ mfg = "Lexmark"; } else -#endif /* __APPLE__ */ { /* * No manufacturer? Use the model string or description... @@ -597,6 +1007,19 @@ mfg = tempmfg; } + if (!mdl) + { + /* + * No model? Use description... + */ + if (des) + mdl = des; /* We remove the manufacturer name below */ + else if (!strncasecmp(mfg, "Unknown", 7)) + mdl = "Printer"; + else + mdl = "Unknown Model"; + } + mfglen = strlen(mfg); if (!strncasecmp(mdl, mfg, mfglen) && _cups_isspace(mdl[mfglen])) @@ -642,7 +1065,13 @@ open_device(usb_printer_t *printer, /* I - Printer */ int verbose) /* I - Update connecting-to-device state? */ { - int number; /* Configuration/interface/altset numbers */ + struct libusb_device_descriptor devdesc; + /* Current device descriptor */ + struct libusb_config_descriptor *confptr = NULL; + /* Pointer to current configuration */ + int number1 = -1, /* Configuration/interface/altset */ + number2 = -1, /* numbers */ + errcode = 0; char current; /* Current configuration */ @@ -657,7 +1086,7 @@ * Try opening the printer... */ - if ((printer->handle = usb_open(printer->device)) == NULL) + if (libusb_open(printer->device, &printer->handle) < 0) return (-1); if (verbose) @@ -665,20 +1094,25 @@ /* * Set the desired configuration, but only if it needs changing. Some - * printers (e.g., Samsung) don't like usb_set_configuration. It will succeed, - * but the following print job is sometimes silently lost by the printer. + * printers (e.g., Samsung) don't like libusb_set_configuration. It will + * succeed, but the following print job is sometimes silently lost by the + * printer. */ - if (usb_control_msg(printer->handle, - USB_TYPE_STANDARD | USB_ENDPOINT_IN | USB_RECIP_DEVICE, - 8, /* GET_CONFIGURATION */ - 0, 0, ¤t, 1, 5000) != 1) + if (libusb_control_transfer(printer->handle, + LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_ENDPOINT_IN | + LIBUSB_RECIPIENT_DEVICE, + 8, /* GET_CONFIGURATION */ + 0, 0, (unsigned char *)¤t, 1, 5000) < 0) current = 0; /* Assume not configured */ - number = printer->device->config[printer->conf].bConfigurationValue; - if (number != current) + libusb_get_device_descriptor (printer->device, &devdesc); + libusb_get_config_descriptor (printer->device, printer->conf, &confptr); + number1 = confptr->bConfigurationValue; + + if (number1 != current) { - if (usb_set_configuration(printer->handle, number) < 0) + if ((errcode = libusb_set_configuration(printer->handle, number1)) < 0) { /* * If the set fails, chances are that the printer only supports a @@ -686,26 +1120,52 @@ * the USB printer specification, but otherwise they'll work... */ - if (errno != EBUSY) + if (errcode != LIBUSB_ERROR_BUSY) fprintf(stderr, "DEBUG: Failed to set configuration %d for %04x:%04x\n", - number, printer->device->descriptor.idVendor, - printer->device->descriptor.idProduct); + number1, devdesc.idVendor, devdesc.idProduct); + } + } + + /* + * Get the "usblp" kernel module out of the way. This backend only + * works without the module attached. + */ + + errcode = libusb_kernel_driver_active(printer->handle, printer->iface); + if (errcode == 0) + printer->usblp_attached = 0; + else if (errcode == 1) + { + printer->usblp_attached = 1; + if ((errcode = + libusb_detach_kernel_driver(printer->handle, printer->iface)) < 0) + { + fprintf(stderr, "DEBUG: Failed to detach \"usblp\" module from %04x:%04x\n", + devdesc.idVendor, devdesc.idProduct); + goto error; } } + else + { + printer->usblp_attached = 0; + fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n", + devdesc.idVendor, devdesc.idProduct); + goto error; + } /* * Claim interfaces as needed... */ - number = printer->device->config[printer->conf].interface[printer->iface]. - altsetting[printer->altset].bInterfaceNumber; - while (usb_claim_interface(printer->handle, number) < 0) + number1 = confptr->interface[printer->iface]. + altsetting[printer->altset].bInterfaceNumber; + + while ((errcode = libusb_claim_interface(printer->handle, number1)) < 0) { - if (errno != EBUSY) + if (errcode != LIBUSB_ERROR_BUSY) fprintf(stderr, "DEBUG: Failed to claim interface %d for %04x:%04x: %s\n", - number, printer->device->descriptor.idVendor, - printer->device->descriptor.idProduct, strerror(errno)); + number1, devdesc.idVendor, devdesc.idProduct, strerror(errno)); goto error; } @@ -715,24 +1175,29 @@ * printers (e.g., Samsung) don't like usb_set_altinterface. */ - if (printer->device->config[printer->conf].interface[printer->iface]. - num_altsetting > 1) + if (confptr->interface[printer->iface].num_altsetting > 1) { - number = printer->device->config[printer->conf].interface[printer->iface]. + number1 = confptr->interface[printer->iface]. + altsetting[printer->altset].bInterfaceNumber; + number2 = confptr->interface[printer->iface]. altsetting[printer->altset].bAlternateSetting; - while (usb_set_altinterface(printer->handle, number) < 0) + while ((errcode = + libusb_set_interface_alt_setting(printer->handle, number1, number2)) + < 0) { - if (errno != EBUSY) + if (errcode != LIBUSB_ERROR_BUSY) fprintf(stderr, "DEBUG: Failed to set alternate interface %d for %04x:%04x: " - "%s\n", number, printer->device->descriptor.idVendor, - printer->device->descriptor.idProduct, strerror(errno)); + "%s\n", + number2, devdesc.idVendor, devdesc.idProduct, strerror(errno)); goto error; } } + libusb_free_config_descriptor(confptr); + if (verbose) fputs("STATE: -connecting-to-device\n", stderr); @@ -747,7 +1212,7 @@ if (verbose) fputs("STATE: -connecting-to-device\n", stderr); - usb_close(printer->handle); + libusb_close(printer->handle); printer->handle = NULL; return (-1); @@ -849,94 +1314,293 @@ /* - * 'side_cb()' - Handle side-channel requests. + * 'read_thread()' - Thread to read the backchannel data on. + */ + +static void *read_thread(void *reference) +{ + unsigned char readbuffer[512]; + int rbytes; + int readstatus; + struct timeval now, + delay, + end, + timeleft; + + + (void)reference; + + /* + * Read frequency: once every 250 milliseconds. + */ + + delay.tv_sec = 0; + delay.tv_usec = 250000; + + do + { + /* + * Remember when we started so we can throttle the loop after the read + * call... + */ + + gettimeofday(&now, NULL); + + /* + * Calculate what 250 milliSeconds are in absolute time... + */ + + timeradd(&now, &delay, &end); + + rbytes = sizeof(readbuffer); + readstatus = libusb_bulk_transfer(g.printer->handle, + g.printer->read_endp, + readbuffer, rbytes, + &rbytes, 60000); + if (readstatus == LIBUSB_SUCCESS && rbytes > 0) + { + fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", + (int)rbytes); + cupsBackChannelWrite((const char *)readbuffer, rbytes, 1.0); + } + else if (readstatus == LIBUSB_ERROR_TIMEOUT) + fputs("DEBUG: Got USB transaction timeout during read.\n", stderr); + else if (readstatus == LIBUSB_ERROR_PIPE) + fputs("DEBUG: Got USB pipe stalled during read.\n", stderr); + else if (readstatus == LIBUSB_ERROR_INTERRUPTED) + fputs("DEBUG: Got USB return aborted during read.\n", stderr); + + /* + * Make sure this loop executes no more than once every 250 miliseconds... + */ + + if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) && + (g.wait_eof || !g.read_thread_stop)) + { + gettimeofday(&now, NULL); + if (timercmp(&now, &end, <)) + { + timersub(&end, &now, &timeleft); + usleep(1000000 * timeleft.tv_sec + timeleft.tv_usec); + } + } + } while (g.wait_eof || !g.read_thread_stop); + + /* + * Let the main thread know that we have completed the read thread... + */ + + pthread_mutex_lock(&g.read_thread_mutex); + g.read_thread_done = 1; + pthread_cond_signal(&g.read_thread_cond); + pthread_mutex_unlock(&g.read_thread_mutex); + + return (NULL); +} + + +/* + * 'sidechannel_thread()' - Handle side-channel requests. */ -static ssize_t /* O - Number of bytes written */ -side_cb(usb_printer_t *printer, /* I - Printer */ - int print_fd) /* I - File to print */ +static void* +sidechannel_thread(void *reference) { - ssize_t bytes, /* Bytes read/written */ - tbytes; /* Total bytes written */ - char buffer[512]; /* Print data buffer */ - struct pollfd pfd; /* Poll descriptor */ cups_sc_command_t command; /* Request command */ cups_sc_status_t status; /* Request/response status */ char data[2048]; /* Request/response data */ int datalen; /* Request/response data size */ - tbytes = 0; - datalen = sizeof(data); + (void)reference; - if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) - return (-1); - - switch (command) + do { - case CUPS_SC_CMD_DRAIN_OUTPUT : - pfd.fd = print_fd; - pfd.events = POLLIN; + datalen = sizeof(data); - while (poll(&pfd, 1, 1000) > 0) - { - if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) - { - while (usb_bulk_write(printer->handle, printer->write_endp, buffer, - bytes, 5000) < 0) - { - _cupsLangPrintFilter(stderr, "ERROR", - _("Unable to send data to printer.")); - tbytes = -1; - break; - } + if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) + { + if (status == CUPS_SC_STATUS_TIMEOUT) + continue; + else + break; + } - tbytes += bytes; + switch (command) + { + case CUPS_SC_CMD_SOFT_RESET: /* Do a soft reset */ + fputs("DEBUG: CUPS_SC_CMD_SOFT_RESET received from driver...\n", + stderr); + + soft_reset(); + cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, NULL, 0, 1.0); + fputs("DEBUG: Returning status CUPS_STATUS_OK with no bytes...\n", + stderr); + break; + + case CUPS_SC_CMD_DRAIN_OUTPUT: /* Drain all pending output */ + fputs("DEBUG: CUPS_SC_CMD_DRAIN_OUTPUT received from driver...\n", + stderr); + + g.drain_output = 1; + break; + + case CUPS_SC_CMD_GET_BIDI: /* Is the connection bidirectional? */ + fputs("DEBUG: CUPS_SC_CMD_GET_BIDI received from driver...\n", + stderr); + + data[0] = (g.printer->protocol >= 2 ? 1 : 0); + cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0); + + fprintf(stderr, + "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n", + data[0]); + break; + + case CUPS_SC_CMD_GET_DEVICE_ID: /* Return IEEE-1284 device ID */ + fputs("DEBUG: CUPS_SC_CMD_GET_DEVICE_ID received from driver...\n", + stderr); + + datalen = sizeof(data); + if (get_device_id(g.printer, data, sizeof(data))) + { + status = CUPS_SC_STATUS_IO_ERROR; + datalen = 0; } - else if (bytes < 0 && errno != EAGAIN && errno != EINTR) - break; - } + else + { + status = CUPS_SC_STATUS_OK; + datalen = strlen(data); + } + cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, datalen, 1.0); - if (tbytes < 0) - status = CUPS_SC_STATUS_IO_ERROR; - else - status = CUPS_SC_STATUS_OK; - - datalen = 0; - break; - - case CUPS_SC_CMD_GET_BIDI : - status = CUPS_SC_STATUS_OK; - data[0] = 0; /* TODO: Change to 1 when read supported */ - datalen = 1; - break; + if (datalen < sizeof(data)) + data[datalen] = '\0'; + else + data[sizeof(data) - 1] = '\0'; + + fprintf(stderr, + "DEBUG: Returning CUPS_SC_STATUS_OK with %d bytes (%s)...\n", + datalen, data); + break; - case CUPS_SC_CMD_GET_DEVICE_ID : - if (get_device_id(printer, data, sizeof(data))) - { - status = CUPS_SC_STATUS_IO_ERROR; - datalen = 0; - } - else - { - status = CUPS_SC_STATUS_OK; - datalen = strlen(data); - } - break; + case CUPS_SC_CMD_GET_STATE: /* Return device state */ + fputs("DEBUG: CUPS_SC_CMD_GET_STATE received from driver...\n", + stderr); + + data[0] = CUPS_SC_STATE_ONLINE; + cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0); + + fprintf(stderr, + "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n", + data[0]); + break; - default : - status = CUPS_SC_STATUS_NOT_IMPLEMENTED; - datalen = 0; + case CUPS_SC_CMD_GET_CONNECTED: /* Return whether device is + connected */ + fputs("DEBUG: CUPS_SC_CMD_GET_CONNECTED received from driver...\n", + stderr); + + data[0] = (g.printer->handle ? 1 : 0); + cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0); + + fprintf(stderr, + "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n", + data[0]); + break; + + default: + fprintf(stderr, "DEBUG: Unknown side-channel command (%d) received " + "from driver...\n", command); + + cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED, + NULL, 0, 1.0); + + fputs("DEBUG: Returned CUPS_SC_STATUS_NOT_IMPLEMENTED with no bytes...\n", + stderr); + break; + } + } + while (!g.sidechannel_thread_stop); + + pthread_mutex_lock(&g.sidechannel_thread_mutex); + g.sidechannel_thread_done = 1; + pthread_cond_signal(&g.sidechannel_thread_cond); + pthread_mutex_unlock(&g.sidechannel_thread_mutex); + + return (NULL); +} + + +/* + * 'soft_reset()' - Send a soft reset to the device. + */ + +static void soft_reset(void) +{ + fd_set input_set; /* Input set for select() */ + struct timeval tv; /* Time value */ + char buffer[2048]; /* Buffer */ + struct timespec cond_timeout; /* pthread condition timeout */ + + /* + * Send an abort once a second until the I/O lock is released by the main + * thread... + */ + + pthread_mutex_lock(&g.readwrite_lock_mutex); + while (g.readwrite_lock) + { + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + 1; + cond_timeout.tv_nsec = tv.tv_usec * 1000; + + while (g.readwrite_lock) + { + if (pthread_cond_timedwait(&g.readwrite_lock_cond, + &g.readwrite_lock_mutex, + &cond_timeout) != 0) break; + } } - cupsSideChannelWrite(command, status, data, datalen, 1.0); + g.readwrite_lock = 1; + pthread_mutex_unlock(&g.readwrite_lock_mutex); + + /* + * Flush bytes waiting on print_fd... + */ + + g.print_bytes = 0; + + FD_ZERO(&input_set); + FD_SET(g.print_fd, &input_set); + + tv.tv_sec = 0; + tv.tv_usec = 0; + + while (select(g.print_fd+1, &input_set, NULL, NULL, &tv) > 0) + if (read(g.print_fd, buffer, sizeof(buffer)) <= 0) + break; + + /* + * Send the reset... + */ + + libusb_reset_device (g.printer->handle); + + /* + * Release the I/O lock... + */ - return (tbytes); + pthread_mutex_lock(&g.readwrite_lock_mutex); + g.readwrite_lock = 0; + pthread_cond_signal(&g.readwrite_lock_cond); + pthread_mutex_unlock(&g.readwrite_lock_mutex); } /* - * End of "$Id: usb-libusb.c 10198 2012-01-27 16:48:43Z mike $". + * End of "$Id: usb-libusb.c 10267 2012-02-12 08:35:28Z mike $". */ diff -Nru cups-1.5.2/berkeley/Dependencies cups-1.5.3/berkeley/Dependencies --- cups-1.5.2/berkeley/Dependencies 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/berkeley/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,32 +3,32 @@ lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpc.o: ../cups/language.h ../cups/string-private.h ../config.h -lpc.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpc.o: ../cups/thread-private.h +lpc.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpc.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpc.o: ../cups/transcode.h ../cups/thread-private.h lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpq.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpq.o: ../cups/language.h ../cups/string-private.h ../config.h -lpq.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpq.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpq.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpq.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpq.o: ../cups/thread-private.h +lpq.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpq.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpq.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpq.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpq.o: ../cups/transcode.h ../cups/thread-private.h lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpr.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpr.o: ../cups/language.h ../cups/string-private.h ../config.h -lpr.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpr.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpr.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpr.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpr.o: ../cups/thread-private.h +lpr.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpr.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpr.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpr.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpr.o: ../cups/transcode.h ../cups/thread-private.h lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lprm.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lprm.o: ../cups/language.h ../cups/string-private.h ../config.h -lprm.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lprm.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lprm.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lprm.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lprm.o: ../cups/thread-private.h +lprm.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lprm.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lprm.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lprm.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lprm.o: ../cups/transcode.h ../cups/thread-private.h diff -Nru cups-1.5.2/berkeley/lpc.c cups-1.5.3/berkeley/lpc.c --- cups-1.5.2/berkeley/lpc.c 2010-11-22 08:06:39.000000000 +0100 +++ cups-1.5.3/berkeley/lpc.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: lpc.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: lpc.c 10379 2012-03-23 22:16:22Z mike $" * * "lpc" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -364,7 +364,8 @@ for (ptr = printer; *ptr != '\0' && *dptr != '\0' && *ptr == *dptr; - ptr ++, dptr ++); + ptr ++, dptr ++) + /* do nothing */; if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' || isspace(*dptr & 255))) @@ -445,5 +446,5 @@ /* - * End of "$Id: lpc.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: lpc.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/cgi-bin/Dependencies cups-1.5.3/cgi-bin/Dependencies --- cups-1.5.2/cgi-bin/Dependencies 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/cgi-bin/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,64 +3,73 @@ help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h help-index.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h help-index.o: ../cups/array.h ../cups/language.h ../cups/array.h help-index.h -help-index.o: ../cups/debug-private.h ../cups/language-private.h -help-index.o: ../cups/transcode.h ../cups/string-private.h ../config.h -help-index.o: ../cups/dir.h +help-index.o: ../cups/debug-private.h ../cups/versioning.h +help-index.o: ../cups/language-private.h ../cups/transcode.h +help-index.o: ../cups/string-private.h ../config.h ../cups/dir.h html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h html.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h html.o: ../cups/language.h ../cups/array.h help-index.h -html.o: ../cups/debug-private.h ../cups/language-private.h -html.o: ../cups/transcode.h ../cups/string-private.h ../config.h +html.o: ../cups/debug-private.h ../cups/versioning.h +html.o: ../cups/language-private.h ../cups/transcode.h +html.o: ../cups/string-private.h ../config.h ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h ipp-var.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h ipp-var.o: ../cups/language.h ../cups/array.h help-index.h -ipp-var.o: ../cups/debug-private.h ../cups/language-private.h -ipp-var.o: ../cups/transcode.h ../cups/string-private.h ../config.h +ipp-var.o: ../cups/debug-private.h ../cups/versioning.h +ipp-var.o: ../cups/language-private.h ../cups/transcode.h +ipp-var.o: ../cups/string-private.h ../config.h search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h search.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h search.o: ../cups/language.h ../cups/array.h help-index.h -search.o: ../cups/debug-private.h ../cups/language-private.h -search.o: ../cups/transcode.h ../cups/string-private.h ../config.h +search.o: ../cups/debug-private.h ../cups/versioning.h +search.o: ../cups/language-private.h ../cups/transcode.h +search.o: ../cups/string-private.h ../config.h template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h template.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h template.o: ../cups/language.h ../cups/array.h help-index.h -template.o: ../cups/debug-private.h ../cups/language-private.h -template.o: ../cups/transcode.h ../cups/string-private.h ../config.h +template.o: ../cups/debug-private.h ../cups/versioning.h +template.o: ../cups/language-private.h ../cups/transcode.h +template.o: ../cups/string-private.h ../config.h var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h var.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h var.o: ../cups/array.h help-index.h ../cups/debug-private.h -var.o: ../cups/language-private.h ../cups/transcode.h +var.o: ../cups/versioning.h ../cups/language-private.h ../cups/transcode.h var.o: ../cups/string-private.h ../config.h ../cups/http.h var.o: ../cups/md5-private.h admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h admin.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h admin.o: ../cups/language.h ../cups/array.h help-index.h -admin.o: ../cups/debug-private.h ../cups/language-private.h -admin.o: ../cups/transcode.h ../cups/string-private.h ../config.h -admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/ppd.h +admin.o: ../cups/debug-private.h ../cups/versioning.h +admin.o: ../cups/language-private.h ../cups/transcode.h +admin.o: ../cups/string-private.h ../config.h ../cups/adminutil.h +admin.o: ../cups/cups.h ../cups/ppd.h classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h classes.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h classes.o: ../cups/language.h ../cups/array.h help-index.h -classes.o: ../cups/debug-private.h ../cups/language-private.h -classes.o: ../cups/transcode.h ../cups/string-private.h ../config.h +classes.o: ../cups/debug-private.h ../cups/versioning.h +classes.o: ../cups/language-private.h ../cups/transcode.h +classes.o: ../cups/string-private.h ../config.h help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h help.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h help.o: ../cups/language.h ../cups/array.h help-index.h -help.o: ../cups/debug-private.h ../cups/language-private.h -help.o: ../cups/transcode.h ../cups/string-private.h ../config.h +help.o: ../cups/debug-private.h ../cups/versioning.h +help.o: ../cups/language-private.h ../cups/transcode.h +help.o: ../cups/string-private.h ../config.h jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h jobs.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h jobs.o: ../cups/language.h ../cups/array.h help-index.h -jobs.o: ../cups/debug-private.h ../cups/language-private.h -jobs.o: ../cups/transcode.h ../cups/string-private.h ../config.h +jobs.o: ../cups/debug-private.h ../cups/versioning.h +jobs.o: ../cups/language-private.h ../cups/transcode.h +jobs.o: ../cups/string-private.h ../config.h makedocset.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h makedocset.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h makedocset.o: ../cups/array.h help-index.h printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h printers.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h printers.o: ../cups/language.h ../cups/array.h help-index.h -printers.o: ../cups/debug-private.h ../cups/language-private.h -printers.o: ../cups/transcode.h ../cups/string-private.h ../config.h +printers.o: ../cups/debug-private.h ../cups/versioning.h +printers.o: ../cups/language-private.h ../cups/transcode.h +printers.o: ../cups/string-private.h ../config.h testcgi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h testcgi.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h testcgi.o: ../cups/array.h help-index.h diff -Nru cups-1.5.2/cgi-bin/help.c cups-1.5.3/cgi-bin/help.c --- cups-1.5.2/cgi-bin/help.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/cgi-bin/help.c 2012-03-21 05:09:04.000000000 +0100 @@ -39,7 +39,8 @@ const char *query; /* Search query */ const char *cache_dir; /* CUPS_CACHEDIR environment variable */ const char *docroot; /* CUPS_DOCROOT environment variable */ - const char *helpfile; /* Current help file */ + const char *helpfile, /* Current help file */ + *helptitle = NULL; /* Current help title */ const char *topic; /* Current topic */ char topic_data[1024]; /* Topic form data */ const char *section; /* Current section */ @@ -88,7 +89,7 @@ perror(filename); cgiStartHTML(cgiText(_("Online Help"))); - cgiSetVariable("ERROR", "Unable to load help index!"); + cgiSetVariable("ERROR", cgiText(_("Unable to load help index."))); cgiCopyTemplateLang("error.tmpl"); cgiEndHTML(); @@ -129,7 +130,7 @@ perror(filename); cgiStartHTML(cgiText(_("Online Help"))); - cgiSetVariable("ERROR", "Unable to access help file!"); + cgiSetVariable("ERROR", cgiText(_("Unable to access help file."))); cgiCopyTemplateLang("error.tmpl"); cgiEndHTML(); @@ -139,7 +140,7 @@ if ((n = helpFindNode(hi, helpfile, NULL)) == NULL) { cgiStartHTML(cgiText(_("Online Help"))); - cgiSetVariable("ERROR", "Help file not in index!"); + cgiSetVariable("ERROR", cgiText(_("Help file not in index."))); cgiCopyTemplateLang("error.tmpl"); cgiEndHTML(); @@ -147,12 +148,11 @@ } /* - * Set the page title and save the help file... + * Save the page title and help file... */ - cgiSetVariable("HELPFILE", helpfile); - cgiSetVariable("HELPTITLE", n->text); - cgiSetVariable("TOPIC", n->section); + helptitle = n->text; + topic = n->section; /* * Send a standard page header... @@ -170,6 +170,8 @@ */ cgiStartHTML(cgiText(_("Online Help"))); + + topic = cgiGetVariable("TOPIC"); } /* @@ -180,7 +182,6 @@ cgiSetVariable("QUERY", ""); query = cgiGetVariable("QUERY"); - topic = cgiGetVariable("TOPIC"); si = helpSearchIndex(hi, query, topic, helpfile); cgiClearVariables(); @@ -188,6 +189,10 @@ cgiSetVariable("QUERY", query); if (topic) cgiSetVariable("TOPIC", topic); + if (helpfile) + cgiSetVariable("HELPFILE", helpfile); + if (helptitle) + cgiSetVariable("HELPTITLE", helptitle); fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n", query ? query : "(null)", topic ? topic : "(null)"); @@ -356,7 +361,7 @@ else { perror(filename); - cgiSetVariable("ERROR", "Unable to open help file."); + cgiSetVariable("ERROR", cgiText(_("Unable to open help file."))); cgiCopyTemplateLang("error.tmpl"); } } diff -Nru cups-1.5.2/cgi-bin/var.c cups-1.5.3/cgi-bin/var.c --- cups-1.5.2/cgi-bin/var.c 2011-08-31 06:58:33.000000000 +0200 +++ cups-1.5.3/cgi-bin/var.c 2012-03-21 05:09:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: var.c 9949 2011-08-31 04:58:33Z mike $" + * "$Id: var.c 10367 2012-03-21 04:09:04Z mike $" * * CGI form variable and array functions for CUPS. * @@ -167,6 +167,8 @@ _cgi_var_t *v; /* Current variable */ + fputs("DEBUG: cgiClearVariables called.\n", stderr); + for (v = form_vars, i = form_count; i > 0; v ++, i --) { _cupsStrFree(v->name); @@ -401,6 +403,8 @@ if (name == NULL || value == NULL || element < 0 || element > 100000) return; + fprintf(stderr, "DEBUG: cgiSetArray: %s[%d]=\"%s\"\n", name, element, value); + if ((var = cgi_find_variable(name)) == NULL) { cgi_add_variable(name, element, value); @@ -532,6 +536,8 @@ if (name == NULL || value == NULL) return; + fprintf(stderr, "cgiSetVariable: %s=\"%s\"\n", name, value); + if ((var = cgi_find_variable(name)) == NULL) { cgi_add_variable(name, 0, value); @@ -1301,5 +1307,5 @@ /* - * End of "$Id: var.c 9949 2011-08-31 04:58:33Z mike $". + * End of "$Id: var.c 10367 2012-03-21 04:09:04Z mike $". */ diff -Nru cups-1.5.2/CHANGES.txt cups-1.5.3/CHANGES.txt --- cups-1.5.2/CHANGES.txt 2012-02-05 19:38:39.000000000 +0100 +++ cups-1.5.3/CHANGES.txt 2012-05-15 16:01:45.000000000 +0200 @@ -1,6 +1,55 @@ -CHANGES.txt - 2012-02-05 +CHANGES.txt - 2012-05-15 ------------------------ +CHANGES IN CUPS V1.5.3 + + - httpReconnect() did not reset the read/write buffers (STR #4065) + - Compiling without threading support failed (STR #4060) + - Fixed compile problem with old versions of OpenSSL (STR #4036) + - The network backends did not check SNMP supply levels regularly + (STR #4040) + - The online help always included the "help on help" text (STR #4042) + - Fixed a SSL handshake issue on OS X (STR #4045) + - The scheduler could crash if a PPD file contained an invalid paper + size (STR #4049) + - The CUPS polling daemon did not reinitialize its connection to the + remote server on errors in all cases (STR #4031) + - PostScript auto-configuration was slow and unreliable with some + printers (STR #4028) + - Missing localizations caused empty output (STR #4033) + - The cups-driverd program could temporarily "forget" a PPD file if it + was updated in place. + - The dnssd backend now prefers IPPS over IPP. + - The USB backend now uses and requires LIBUSB 1.0 or later (STR #3477) + - The LIBUSB-based USB backend now supports the back-channel (STR #2890) + - Changed how timeouts are implemented in the LPD backend (STR #4013) + - Added more supported color names for SNMP supplies (STR #3981) + - The default InputSlot setting was never used (STR #3957) + - POSIX ACLs are now set properly on certificate files (STR #3970) + - Supplies with commas in their names were not reported correctly + (STR #4020) + - The cupsGetPPD3() function created a temporary file when one was not + needed (STR #4018) + - The scheduler now ensures that job notifications contain a value for + the notify-printer-uri attribute (STR #4014) + - The lp and lpr commands did not cancel jobs queued from stdin on an + error (STR #4015) + - Fixed the IPP backend's handling of HTTP/1.0 compatibility (STR #3988) + - The IPP backend did not always setup username/password authentication + for printers (STR #3985) + - The IPP backend no longer re-queues print jobs that are too large for + the printer/server (STR #3977) + - The RPM spec file did not work (STR #4021, STR #4057) + - Encryption did not work when the server name ended with "." + (STR #4011) + - The multi-purpose tray is now mapped to the IPP "by-pass-tray" + (STR #4009) + - The correct media size was not always passed to IPP printers + (STR #4001) + - Finishing options were not passed to IPP printers (STR #3995) + - Fixed iCloud-based Back to My Mac printing (STR #3996) + + CHANGES IN CUPS V1.5.2 - Reposted what should have been CUPS 1.5.1. diff -Nru cups-1.5.2/config.h.in cups-1.5.3/config.h.in --- cups-1.5.2/config.h.in 2011-06-16 22:12:16.000000000 +0200 +++ cups-1.5.3/config.h.in 2012-03-21 05:45:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: config.h.in 9837 2011-06-16 20:12:16Z mike $" + * "$Id: config.h.in 10371 2012-03-21 04:45:48Z mike $" * * Configuration file for CUPS. * @@ -300,6 +300,13 @@ /* + * Do we have the SSL_set_tlsext_host_name function? + */ + +#undef HAVE_SSL_SET_TLSEXT_HOST_NAME + + +/* * What Security framework headers do we have? */ @@ -691,7 +698,7 @@ * Do we have libusb? */ -#undef HAVE_USB_H +#undef HAVE_LIBUSB /* @@ -744,5 +751,5 @@ #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h.in 9837 2011-06-16 20:12:16Z mike $". + * End of "$Id: config.h.in 10371 2012-03-21 04:45:48Z mike $". */ diff -Nru cups-1.5.2/config-scripts/cups-common.m4 cups-1.5.3/config-scripts/cups-common.m4 --- cups-1.5.2/config-scripts/cups-common.m4 2012-02-05 19:56:14.000000000 +0100 +++ cups-1.5.3/config-scripts/cups-common.m4 2012-05-15 16:08:06.000000000 +0200 @@ -1,9 +1,9 @@ dnl -dnl "$Id: cups-common.m4 10067 2011-10-13 05:44:32Z mike $" +dnl "$Id: cups-common.m4 10317 2012-03-01 00:05:55Z mike $" dnl dnl Common configuration stuff for CUPS. dnl -dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 2007-2012 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -20,7 +20,7 @@ AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION=1.5.2 +CUPS_VERSION=1.5.3 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'`" @@ -50,6 +50,7 @@ AC_PROG_RANLIB AC_PATH_PROG(AR,ar) AC_PATH_PROG(CHMOD,chmod) +AC_PATH_PROG(GZIP,gzip) AC_PATH_PROG(HTMLDOC,htmldoc) AC_PATH_PROG(LD,ld) AC_PATH_PROG(LN,ln) @@ -214,19 +215,20 @@ LIBUSB="" AC_SUBST(LIBUSB) -if test x$enable_libusb = xyes; then - check_libusb=yes -elif test x$enable_libusb != xno -a $uname != Darwin; then - check_libusb=yes -else - check_libusb=no -fi - -if test $check_libusb = yes; then - AC_CHECK_LIB(usb, usb_get_string_simple,[ - AC_CHECK_HEADER(usb.h, - AC_DEFINE(HAVE_USB_H) - LIBUSB="-lusb")]) +if test "x$PKGCONFIG" != x; then + if test x$enable_libusb = xyes -o $uname != Darwin; then + AC_MSG_CHECKING(for libusb-1.0) + if $PKGCONFIG --exists libusb-1.0; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LIBUSB) + CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" + LIBUSB="`$PKGCONFIG --libs libusb-1.0`" + else + AC_MSG_RESULT(no) + fi + fi +elif test x$enable_libusb = xyes; then + AC_MSG_ERROR(Need pkg-config to enable libusb support.) fi dnl See if we have libwrap for TCP wrappers support... @@ -432,5 +434,5 @@ AC_SUBST(BUILDDIRS) dnl -dnl End of "$Id: cups-common.m4 10067 2011-10-13 05:44:32Z mike $". +dnl End of "$Id: cups-common.m4 10317 2012-03-01 00:05:55Z mike $". dnl diff -Nru cups-1.5.2/config-scripts/cups-image.m4 cups-1.5.3/config-scripts/cups-image.m4 --- cups-1.5.2/config-scripts/cups-image.m4 2011-05-07 00:53:53.000000000 +0200 +++ cups-1.5.3/config-scripts/cups-image.m4 2012-03-01 01:05:55.000000000 +0100 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-image.m4 9750 2011-05-06 22:53:53Z mike $" +dnl "$Id: cups-image.m4 10317 2012-03-01 00:05:55Z mike $" dnl dnl Image library/filter stuff for CUPS. dnl @@ -66,11 +66,16 @@ fi dnl ZLIB library... +INSTALL_GZIP="" AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzgets, AC_DEFINE(HAVE_LIBZ) LIBZ="-lz" - LIBS="$LIBS -lz")) + LIBS="$LIBS -lz" + if test "x$GZIP" != x; then + INSTALL_GZIP="-z" + fi)) +AC_SUBST(INSTALL_GZIP) dnl PNG library... if test x$enable_png != xno; then @@ -108,5 +113,5 @@ AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H)) dnl -dnl End of "$Id: cups-image.m4 9750 2011-05-06 22:53:53Z mike $". +dnl End of "$Id: cups-image.m4 10317 2012-03-01 00:05:55Z mike $". dnl diff -Nru cups-1.5.2/config-scripts/cups-ssl.m4 cups-1.5.3/config-scripts/cups-ssl.m4 --- cups-1.5.2/config-scripts/cups-ssl.m4 2011-06-16 22:12:16.000000000 +0200 +++ cups-1.5.3/config-scripts/cups-ssl.m4 2012-03-21 05:45:48.000000000 +0100 @@ -1,9 +1,9 @@ dnl -dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $" +dnl "$Id: cups-ssl.m4 10371 2012-03-21 04:45:48Z mike $" dnl dnl OpenSSL/GNUTLS stuff for CUPS. dnl -dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 2007-2012 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -136,9 +136,9 @@ dnl case the RSAREF libraries are needed. for libcrypto in \ - "-lcrypto" \ - "-lcrypto -lrsaref" \ - "-lcrypto -lRSAglue -lrsaref" + "-lcrypto" \ + "-lcrypto -lrsaref" \ + "-lcrypto -lRSAglue -lrsaref" do AC_CHECK_LIB(ssl,SSL_new, [have_ssl=1 @@ -149,6 +149,9 @@ $libcrypto) if test "x${SSLLIBS}" != "x"; then + LIBS="$SAVELIBS $SSLLIBS" + AC_CHECK_FUNC(SSL_set_tlsext_host_name, + AC_DEFINE(HAVE_SSL_SET_TLSEXT_HOST_NAME)) break fi done @@ -173,7 +176,6 @@ EXPORT_SSLLIBS="$SSLLIBS" AC_SUBST(EXPORT_SSLLIBS) - dnl -dnl End of "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $". +dnl End of "$Id: cups-ssl.m4 10371 2012-03-21 04:45:48Z mike $". dnl diff -Nru cups-1.5.2/configure cups-1.5.3/configure --- cups-1.5.2/configure 2012-02-05 19:56:16.000000000 +0100 +++ cups-1.5.3/configure 2012-05-15 16:08:07.000000000 +0200 @@ -1,60 +1,83 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.68. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 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. ## -## --------------------- ## +## -------------------- ## +## 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 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # 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 ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# 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 - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +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 - PATH_SEPARATOR=: + 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 - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# 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 @@ -63,20 +86,19 @@ # 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.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +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 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -87,354 +109,328 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# 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. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -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 - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + 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 - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + 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 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +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 - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + 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=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # 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 - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs 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 - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs 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_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + 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 $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } + 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" -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} -exitcode=0 -if as_func_success; then - : +} # 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 - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi + 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 as_func_ret_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_ret_success failed. + as_expr=false fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} +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_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + 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/= @@ -451,8 +447,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $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 @@ -462,49 +457,40 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - 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 + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -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 || +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' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -512,7 +498,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -529,12 +515,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -548,11 +534,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# 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` @@ -567,7 +553,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -575,6 +560,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="cups/cups.h" # Factoring default headers for most tests. @@ -614,248 +600,355 @@ #endif" ac_default_prefix=/ -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -CUPS_VERSION -CUPS_REVISION -CUPS_BUILD -AWK -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -CPP -CXX -CXXFLAGS -ac_ct_CXX -RANLIB -AR -CHMOD -HTMLDOC -LD -LN -MV -RM -RMDIR -SED -XDGOPEN -CUPS_HTMLVIEW -INSTALL -INSTALLSTATIC -PKGCONFIG -LIBMALLOC -LIBPAPER -GREP -EGREP -LIBUSB -LIBWRAP -ARFLAGS -BACKLIBS -SERVERLIBS -DBUSDIR -DBUS_NOTIFIER -DBUS_NOTIFIERLIBS -CUPS_DEFAULT_PRINTOPERATOR_AUTH -CUPS_SYSTEM_AUTHKEY -INSTALLXPC -LEGACY_BACKENDS -BUILDDIRS -privateinclude -PRIVATEINCLUDE -INITDIR -INITDDIR -RCLEVELS -RCSTART -RCSTOP -SMFMANIFESTDIR -XINETD -CUPS_CACHEDIR -CUPS_DATADIR -ICONDIR -MENUDIR -CUPS_DOCROOT -CUPS_FONTPATH -CUPS_LOCALEDIR -CUPS_LOGDIR -CUPS_REQUESTS -CUPS_SERVERBIN -INSTALL_SYSV -CUPS_SERVERROOT -CUPS_STATEDIR -AMANDIR -PMANDIR -MAN1EXT -MAN5EXT -MAN7EXT -MAN8EXT -MAN8DIR -INSTALL32 -LIB32CUPS -LIB32CUPSIMAGE -LIB32DIR -UNINSTALL32 -INSTALL64 -LIB64CUPS -LIB64CUPSIMAGE -LIB64DIR -UNINSTALL64 -DSO -DSOXX -DSOFLAGS -DSO32FLAGS -DSO64FLAGS -LIBCUPS -LIBCUPSBASE -LIBCUPSCGI -LIBCUPSDRIVER -LIBCUPSIMAGE -LIBCUPSMIME -LIBCUPSPPDC -LIBCUPSSTATIC -EXTLINKCUPS -EXTLINKCUPSDRIVER -EXTLINKCUPSIMAGE -LINKCUPS -LINKCUPSIMAGE -DSOLIBS -IMGLIBS -EXPORT_LDFLAGS -LIBTOOL -INSTALL_STRIP -OPTIM -UNITTESTS -ARCHFLAGS -LDARCHFLAGS -ARCH32FLAGS -ARCH64FLAGS -CXXLIBS -PIEFLAGS -RELROFLAGS -PHPOPTIONS -DEFAULT_IMAGEFILTERS -IMGFILTERS -LIBJPEG -LIBPNG -LIBTIFF -LIBZ -EXPORT_LIBJPEG -EXPORT_LIBPNG -EXPORT_LIBTIFF -EXPORT_LIBZ -CUPS_DEFAULT_DOMAINSOCKET -CUPS_LISTEN_DOMAINSOCKET -LIBSLP -LIBGSSAPI -KRB5CONFIG -LIBLDAP -PTHREAD_FLAGS -LIBGNUTLSCONFIG -LIBGCRYPTCONFIG -IPPALIASES -SSLFLAGS -SSLLIBS -EXPORT_SSLLIBS -PAMDIR -PAMFILE -PAMLIBS -PAMMOD -PAMMODAUTH -LARGEFILE -DNSSDLIBS -DNSSD_BACKEND -DEFAULT_LAUNCHD_CONF -LAUNCHDLIBS -LANGUAGES -CUPS_BUNDLEDIR -CUPS_CONFIG_FILE_PERM -CUPS_LOG_FILE_PERM -CUPS_FATAL_ERRORS -CUPS_LOG_LEVEL -CUPS_ACCESS_LOG_LEVEL -CUPS_BROWSING -CUPS_BROWSE_LOCAL_PROTOCOLS -CUPS_BROWSE_REMOTE_PROTOCOLS -CUPS_BROWSE_SHORT_NAMES -CUPS_DEFAULT_SHARED -CUPS_IMPLICIT_CLASSES -CUPS_USE_NETWORK_DEFAULT -CUPS_USER -CUPS_GROUP -CUPS_SYSTEM_GROUPS -CUPS_PRIMARY_SYSTEM_GROUP -CUPS_DEFAULT_PRINTCAP -CUPS_MAX_COPIES -DEFAULT_RAW_PRINTING -CUPS_SNMP_ADDRESS -CUPS_SNMP_COMMUNITY -DEFAULT_IPP_PORT -BANNERTOPS -DEFAULT_BANNERTOPS -DEFAULT_TEXTTOPS -TEXTTOPS -FONTS -CUPS_WEBIF -CUPS_PDFTOPS -CUPS_GHOSTSCRIPT -DEFAULT_PDFTOPS -PDFTOPS -JAVA -PERL -PHPCGI -PHP -PHPCONFIG -PHPDIR -PYTHON -INSTALL_LANGUAGES -UNINSTALL_LANGUAGES +ac_subst_vars='LTLIBOBJS LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS +UNINSTALL_LANGUAGES +INSTALL_LANGUAGES +PYTHON +PHPDIR +PHPCONFIG +PHP +PHPCGI +PERL +JAVA +PDFTOPS +DEFAULT_PDFTOPS +CUPS_GHOSTSCRIPT +CUPS_PDFTOPS +CUPS_WEBIF +FONTS +TEXTTOPS +DEFAULT_TEXTTOPS +DEFAULT_BANNERTOPS +BANNERTOPS +DEFAULT_IPP_PORT +CUPS_SNMP_COMMUNITY +CUPS_SNMP_ADDRESS +DEFAULT_RAW_PRINTING +CUPS_MAX_COPIES +CUPS_DEFAULT_PRINTCAP +CUPS_PRIMARY_SYSTEM_GROUP +CUPS_SYSTEM_GROUPS +CUPS_GROUP +CUPS_USER +CUPS_USE_NETWORK_DEFAULT +CUPS_IMPLICIT_CLASSES +CUPS_DEFAULT_SHARED +CUPS_BROWSE_SHORT_NAMES +CUPS_BROWSE_REMOTE_PROTOCOLS +CUPS_BROWSE_LOCAL_PROTOCOLS +CUPS_BROWSING +CUPS_ACCESS_LOG_LEVEL +CUPS_LOG_LEVEL +CUPS_FATAL_ERRORS +CUPS_LOG_FILE_PERM +CUPS_CONFIG_FILE_PERM +CUPS_BUNDLEDIR +LANGUAGES +LAUNCHDLIBS +DEFAULT_LAUNCHD_CONF +DNSSD_BACKEND +DNSSDLIBS +LARGEFILE +PAMMODAUTH +PAMMOD +PAMLIBS +PAMFILE +PAMDIR +EXPORT_SSLLIBS +SSLLIBS +SSLFLAGS +IPPALIASES +LIBGCRYPTCONFIG +LIBGNUTLSCONFIG +PTHREAD_FLAGS +LIBLDAP +KRB5CONFIG +LIBGSSAPI +LIBSLP +CUPS_LISTEN_DOMAINSOCKET +CUPS_DEFAULT_DOMAINSOCKET +EXPORT_LIBZ +EXPORT_LIBTIFF +EXPORT_LIBPNG +EXPORT_LIBJPEG +INSTALL_GZIP +LIBZ +LIBTIFF +LIBPNG +LIBJPEG +IMGFILTERS +DEFAULT_IMAGEFILTERS +PHPOPTIONS +RELROFLAGS +PIEFLAGS +CXXLIBS +ARCH64FLAGS +ARCH32FLAGS +LDARCHFLAGS +ARCHFLAGS +UNITTESTS +OPTIM +INSTALL_STRIP +LIBTOOL +EXPORT_LDFLAGS +IMGLIBS +DSOLIBS +LINKCUPSIMAGE +LINKCUPS +EXTLINKCUPSIMAGE +EXTLINKCUPSDRIVER +EXTLINKCUPS +LIBCUPSSTATIC +LIBCUPSPPDC +LIBCUPSMIME +LIBCUPSIMAGE +LIBCUPSDRIVER +LIBCUPSCGI +LIBCUPSBASE +LIBCUPS +DSO64FLAGS +DSO32FLAGS +DSOFLAGS +DSOXX +DSO +UNINSTALL64 +LIB64DIR +LIB64CUPSIMAGE +LIB64CUPS +INSTALL64 +UNINSTALL32 +LIB32DIR +LIB32CUPSIMAGE +LIB32CUPS +INSTALL32 +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 +LEGACY_BACKENDS +INSTALLXPC +CUPS_SYSTEM_AUTHKEY +CUPS_DEFAULT_PRINTOPERATOR_AUTH +DBUS_NOTIFIERLIBS +DBUS_NOTIFIER +DBUSDIR +SERVERLIBS +BACKLIBS +ARFLAGS +LIBWRAP +LIBUSB +EGREP +GREP +LIBPAPER +LIBMALLOC +PKGCONFIG +INSTALLSTATIC +INSTALL +CUPS_HTMLVIEW +XDGOPEN +SED +RMDIR +RM +MV +LN +LD +HTMLDOC +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 +enable_32bit +enable_64bit +enable_shared +enable_libtool_unsupported +with_optim +enable_debug +enable_debug_guards +enable_debug_printfs +enable_unit_tests +with_archflags +with_ldarchflags +with_arch32flags +with_arch64flags +enable_relro +enable_image +enable_jpeg +enable_png +enable_tiff +with_domainsocket +enable_slp +with_openslp_libs +with_openslp_includes +enable_gssapi +with_gssservicename +enable_ldap +with_ldap_libs +with_ldap_includes +enable_threads +enable_ssl +enable_cdsassl +enable_gnutls +enable_openssl +with_openssl_libs +with_openssl_includes +enable_pam +with_pam_module +enable_largefile +enable_dnssd +with_dnssd_libs +with_dnssd_includes +enable_launchd +with_languages +with_bundledir +with_config_file_perm +with_log_file_perm +with_fatal_errors +with_log_level +with_access_log_level +enable_browsing +with_local_protocols +with_remote_protocols +enable_browse_short +enable_default_shared +enable_implicit +enable_use_network_default +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_bannertops +enable_texttops +enable_webif +with_pdftops +with_java +with_perl +with_php +with_python +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS CPPFLAGS CPP CXX @@ -866,6 +959,8 @@ # 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 @@ -921,8 +1016,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -964,13 +1060,20 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + 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 ;; @@ -983,13 +1086,20 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + 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- \ @@ -1180,22 +1290,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + 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_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + 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. @@ -1215,26 +1339,26 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) 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. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + 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. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1242,23 +1366,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + 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 -# Be sure to have absolute directory names. +# 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 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + 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' @@ -1272,8 +1409,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - 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 + $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 @@ -1288,23 +1425,21 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + 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 -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + 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 @@ -1331,13 +1466,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + 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" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1377,7 +1510,7 @@ --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 + -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 @@ -1385,9 +1518,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1397,25 +1530,25 @@ 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] + --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 @@ -1427,6 +1560,7 @@ 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 @@ -1548,7 +1682,7 @@ 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 C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command @@ -1557,6 +1691,7 @@ 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 @@ -1564,15 +1699,17 @@ 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" || 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=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + 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/ ;; @@ -1608,7 +1745,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1618,21 +1755,467 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.68 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +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 -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.61. Invocation command line was +## ------------------------ ## +## 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 $@ @@ -1668,8 +2251,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1703,12 +2286,12 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + 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 @@ -1724,13 +2307,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ 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 @@ -1742,11 +2325,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1755,12 +2336,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_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) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1779,128 +2361,136 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $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'; { (exit 1); exit 1; }' $ac_signal + 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 explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + # 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 - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + 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" + . "$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. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # 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 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1914,60 +2504,56 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $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) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $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 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) 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. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - + { $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' @@ -2001,7 +2587,7 @@ ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION=1.5.2 +CUPS_VERSION=1.5.3 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'`" @@ -2010,7 +2596,7 @@ # Check whether --with-cups_build was given. -if test "${with_cups_build+set}" = set; then +if test "${with_cups_build+set}" = set; then : withval=$with_cups_build; CUPS_BUILD="$withval" fi @@ -2036,10 +2622,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2049,25 +2635,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2082,10 +2668,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2095,25 +2681,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2122,10 +2708,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2135,25 +2721,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2161,12 +2747,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 @@ -2179,10 +2761,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2192,25 +2774,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2219,10 +2801,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2233,18 +2815,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2263,11 +2845,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2278,10 +2860,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2291,25 +2873,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2322,10 +2904,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -2335,25 +2917,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2365,12 +2947,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 @@ -2380,51 +2958,37 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +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. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2436,42 +3000,38 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +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. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $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 | *.o | *.obj ) ;; + *.$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" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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, @@ -2481,14 +3041,14 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$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; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2507,78 +3067,41 @@ else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -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 -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 @@ -2586,37 +3109,90 @@ 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 | *.o | *.obj ) ;; + *.$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 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } + { { $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 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +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 -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_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 @@ -2628,51 +3204,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $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 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $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 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2686,54 +3257,34 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $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 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2744,34 +3295,11 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2782,35 +3310,12 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2821,42 +3326,18 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $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 @@ -2872,18 +3353,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -2940,31 +3417,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -2975,17 +3430,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $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' @@ -2998,15 +3455,15 @@ 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 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $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 test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + 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" @@ -3020,11 +3477,7 @@ # 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3033,76 +3486,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -3114,8 +3525,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $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 @@ -3125,11 +3536,7 @@ # 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3138,83 +3545,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $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 @@ -3237,10 +3601,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -3250,25 +3614,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3281,10 +3645,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -3294,25 +3658,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3324,12 +3688,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 @@ -3339,49 +3699,36 @@ fi fi # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $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 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3395,54 +3742,34 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` +{ $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 -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3453,34 +3780,11 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3491,35 +3795,12 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3530,42 +3811,18 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +{ $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 @@ -3590,10 +3847,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -3603,25 +3860,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3630,10 +3887,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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. @@ -3643,25 +3900,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -3669,12 +3926,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $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 @@ -3685,10 +3938,10 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3700,14 +3953,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3715,20 +3968,20 @@ fi AR=$ac_cv_path_AR if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CHMOD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3740,14 +3993,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3755,20 +4008,60 @@ fi CHMOD=$ac_cv_path_CHMOD if test -n "$CHMOD"; then - { echo "$as_me:$LINENO: result: $CHMOD" >&5 -echo "${ECHO_T}$CHMOD" >&6; } + { $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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "htmldoc", so it can be a program name with args. set dummy htmldoc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_HTMLDOC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_HTMLDOC+:} false; then : + $as_echo_n "(cached) " >&6 else case $HTMLDOC in [\\/]* | ?:[\\/]*) @@ -3780,14 +4073,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_HTMLDOC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3795,20 +4088,20 @@ fi HTMLDOC=$ac_cv_path_HTMLDOC if test -n "$HTMLDOC"; then - { echo "$as_me:$LINENO: result: $HTMLDOC" >&5 -echo "${ECHO_T}$HTMLDOC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HTMLDOC" >&5 +$as_echo "$HTMLDOC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3820,14 +4113,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3835,20 +4128,20 @@ fi LD=$ac_cv_path_LD if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3860,14 +4153,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3875,20 +4168,20 @@ fi LN=$ac_cv_path_LN if test -n "$LN"; then - { echo "$as_me:$LINENO: result: $LN" >&5 -echo "${ECHO_T}$LN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5 +$as_echo "$LN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MV+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3900,14 +4193,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3915,20 +4208,20 @@ fi MV=$ac_cv_path_MV if test -n "$MV"; then - { echo "$as_me:$LINENO: result: $MV" >&5 -echo "${ECHO_T}$MV" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5 +$as_echo "$MV" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3940,14 +4233,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3955,20 +4248,20 @@ fi RM=$ac_cv_path_RM if test -n "$RM"; then - { echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 +$as_echo "$RM" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_RMDIR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -3980,14 +4273,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3995,20 +4288,20 @@ fi RMDIR=$ac_cv_path_RMDIR if test -n "$RMDIR"; then - { echo "$as_me:$LINENO: result: $RMDIR" >&5 -echo "${ECHO_T}$RMDIR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 +$as_echo "$RMDIR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -4020,14 +4313,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4035,20 +4328,20 @@ fi SED=$ac_cv_path_SED if test -n "$SED"; then - { echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XDGOPEN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -4060,14 +4353,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4075,11 +4368,11 @@ fi XDGOPEN=$ac_cv_path_XDGOPEN if test -n "$XDGOPEN"; then - { echo "$as_me:$LINENO: result: $XDGOPEN" >&5 -echo "${ECHO_T}$XDGOPEN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XDGOPEN" >&5 +$as_echo "$XDGOPEN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4090,27 +4383,23 @@ fi -{ echo "$as_me:$LINENO: checking for install-sh script" >&5 -echo $ECHO_N "checking for install-sh script... $ECHO_C" >&6; } +{ $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" -{ echo "$as_me:$LINENO: result: using $INSTALL" >&5 -echo "${ECHO_T}using $INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 +$as_echo "using $INSTALL" >&6; } if test "x$AR" = x; then - { { echo "$as_me:$LINENO: error: Unable to find required library archive command." >&5 -echo "$as_me: error: Unable to find required library archive command." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 fi if test "x$CC" = x; then - { { echo "$as_me:$LINENO: error: Unable to find required C compiler command." >&5 -echo "$as_me: error: Unable to find required C compiler command." >&2;} - { (exit 1); exit 1; }; } + 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 +if test "${enable_static+set}" = set; then : enableval=$enable_static; fi @@ -4124,10 +4413,10 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKGCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -4139,14 +4428,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4154,27 +4443,23 @@ fi PKGCONFIG=$ac_cv_path_PKGCONFIG if test -n "$PKGCONFIG"; then - { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 -echo "${ECHO_T}$PKGCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +$as_echo "$PKGCONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: checking for library containing fmod" >&5 -echo $ECHO_N "checking for library containing fmod... $ECHO_C" >&6; } -if test "${ac_cv_search_fmod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4199,65 +4484,38 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_fmod=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_fmod+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fmod+:} false; then : break fi done -if test "${ac_cv_search_fmod+set}" = set; then - : +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 -{ echo "$as_me:$LINENO: result: $ac_cv_search_fmod" >&5 -echo "${ECHO_T}$ac_cv_search_fmod" >&6; } +{ $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 +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ echo "$as_me:$LINENO: checking for library containing crypt" >&5 -echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; } -if test "${ac_cv_search_crypt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4282,65 +4540,38 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_crypt=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_crypt+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_crypt+:} false; then : break fi done -if test "${ac_cv_search_crypt+set}" = set; then - : +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 -{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5 -echo "${ECHO_T}$ac_cv_search_crypt" >&6; } +{ $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 +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ echo "$as_me:$LINENO: checking for library containing getspent" >&5 -echo $ECHO_N "checking for library containing getspent... $ECHO_C" >&6; } -if test "${ac_cv_search_getspent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4365,50 +4596,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_getspent=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_getspent+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_getspent+:} false; then : break fi done -if test "${ac_cv_search_getspent+set}" = set; then - : +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 -{ echo "$as_me:$LINENO: result: $ac_cv_search_getspent" >&5 -echo "${ECHO_T}$ac_cv_search_getspent" >&6; } +{ $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 +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -4416,7 +4624,7 @@ LIBMALLOC="" # Check whether --enable-mallinfo was given. -if test "${enable_mallinfo+set}" = set; then +if test "${enable_mallinfo+set}" = set; then : enableval=$enable_mallinfo; fi @@ -4424,17 +4632,13 @@ if test x$enable_mallinfo = xyes; then SAVELIBS="$LIBS" LIBS="" - { echo "$as_me:$LINENO: checking for library containing mallinfo" >&5 -echo $ECHO_N "checking for library containing mallinfo... $ECHO_C" >&6; } -if test "${ac_cv_search_mallinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4459,54 +4663,29 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_mallinfo=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_mallinfo+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_mallinfo+:} false; then : break fi done -if test "${ac_cv_search_mallinfo+set}" = set; then - : +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 -{ echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5 -echo "${ECHO_T}$ac_cv_search_mallinfo" >&6; } +{ $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 +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLINFO 1 -_ACEOF + $as_echo "#define HAVE_MALLINFO 1" >>confdefs.h fi @@ -4517,24 +4696,20 @@ # Check whether --enable-libpaper was given. -if test "${enable_libpaper+set}" = set; then +if test "${enable_libpaper+set}" = set; then : enableval=$enable_libpaper; fi if test x$enable_libpaper = xyes; then - { echo "$as_me:$LINENO: checking for systempapername in -lpaper" >&5 -echo $ECHO_N "checking for systempapername in -lpaper... $ECHO_C" >&6; } -if test "${ac_cv_lib_paper_systempapername+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4552,42 +4727,19 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_paper_systempapername=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_paper_systempapername=no + ac_cv_lib_paper_systempapername=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_paper_systempapername" >&5 -echo "${ECHO_T}$ac_cv_lib_paper_systempapername" >&6; } -if test $ac_cv_lib_paper_systempapername = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPAPER 1 -_ACEOF +{ $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 @@ -4600,45 +4752,40 @@ -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 + # 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. + 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 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $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" - echo 'GREP' >> "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 - ac_count=`expr $ac_count + 1` + 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" @@ -4650,77 +4797,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $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" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -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 + # 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. + 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 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $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" - echo 'EGREP' >> "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 - ac_count=`expr $ac_count + 1` + 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" @@ -4732,46 +4863,31 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $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" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4786,85 +4902,53 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi -rm -f -r conftest* +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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi -rm -f -r conftest* +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 + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4891,11481 +4975,2650 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $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 -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$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" "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 -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=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + +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 -done +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 -if test "${ac_cv_header_crypt_h+set}" = set; then - { echo "$as_me:$LINENO: checking for crypt.h" >&5 -echo $ECHO_N "checking for crypt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_crypt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_crypt_h" >&5 -echo "${ECHO_T}$ac_cv_header_crypt_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking crypt.h usability" >&5 -echo $ECHO_N "checking crypt.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + +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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking crypt.h presence" >&5 -echo $ECHO_N "checking crypt.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: crypt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: crypt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: crypt.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: crypt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: crypt.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: crypt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: crypt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: crypt.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: crypt.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: crypt.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: crypt.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: crypt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: crypt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: crypt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: crypt.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: crypt.h: in the future, the compiler will take precedence" >&2;} +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 - ;; -esac -{ echo "$as_me:$LINENO: checking for crypt.h" >&5 -echo $ECHO_N "checking for crypt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_crypt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_crypt_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_crypt_h" >&5 -echo "${ECHO_T}$ac_cv_header_crypt_h" >&6; } -fi -if test $ac_cv_header_crypt_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_CRYPT_H 1 -_ACEOF + +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 -if test "${ac_cv_header_langinfo_h+set}" = set; then - { echo "$as_me:$LINENO: checking for langinfo.h" >&5 -echo $ECHO_N "checking for langinfo.h... $ECHO_C" >&6; } -if test "${ac_cv_header_langinfo_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 -{ echo "$as_me:$LINENO: result: $ac_cv_header_langinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_langinfo_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking langinfo.h usability" >&5 -echo $ECHO_N "checking langinfo.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + +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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking langinfo.h presence" >&5 -echo $ECHO_N "checking langinfo.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: langinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: langinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: langinfo.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: langinfo.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: langinfo.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: langinfo.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: langinfo.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: langinfo.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: langinfo.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: langinfo.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: langinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: langinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: langinfo.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: langinfo.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: langinfo.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: langinfo.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for langinfo.h" >&5 -echo $ECHO_N "checking for langinfo.h... $ECHO_C" >&6; } -if test "${ac_cv_header_langinfo_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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_cv_header_langinfo_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_langinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_langinfo_h" >&6; } + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if test $ac_cv_header_langinfo_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LANGINFO_H 1 +/* 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 -if test "${ac_cv_header_malloc_h+set}" = set; then - { echo "$as_me:$LINENO: checking for malloc.h" >&5 -echo $ECHO_N "checking for malloc.h... $ECHO_C" >&6; } -if test "${ac_cv_header_malloc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + LIBS="$SAVELIBS" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_malloc_h" >&5 -echo "${ECHO_T}$ac_cv_header_malloc_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking malloc.h usability" >&5 -echo $ECHO_N "checking malloc.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + + +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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking malloc.h presence" >&5 -echo $ECHO_N "checking malloc.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: malloc.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: malloc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: malloc.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: malloc.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: malloc.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: malloc.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: malloc.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: malloc.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: malloc.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: malloc.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: malloc.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: malloc.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: malloc.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: malloc.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: malloc.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: malloc.h: in the future, the compiler will take precedence" >&2;} +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 - ;; -esac -{ echo "$as_me:$LINENO: checking for malloc.h" >&5 -echo $ECHO_N "checking for malloc.h... $ECHO_C" >&6; } -if test "${ac_cv_header_malloc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_malloc_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_malloc_h" >&5 -echo "${ECHO_T}$ac_cv_header_malloc_h" >&6; } + + +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 -if test $ac_cv_header_malloc_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC_H 1 + + +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 -if test "${ac_cv_header_shadow_h+set}" = set; then - { echo "$as_me:$LINENO: checking for shadow.h" >&5 -echo $ECHO_N "checking for shadow.h... $ECHO_C" >&6; } -if test "${ac_cv_header_shadow_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5 -echo "${ECHO_T}$ac_cv_header_shadow_h" >&6; } +done + +if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then + echo Forcing snprintf emulation for HP-UX. else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking shadow.h usability" >&5 -echo $ECHO_N "checking shadow.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include + 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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking shadow.h presence" >&5 -echo $ECHO_N "checking shadow.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +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 -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: shadow.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: shadow.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: shadow.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: shadow.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: shadow.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: shadow.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: shadow.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: shadow.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: shadow.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: shadow.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: shadow.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: shadow.h: in the future, the compiler will take precedence" >&2;} +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 - ;; -esac -{ echo "$as_me:$LINENO: checking for shadow.h" >&5 -echo $ECHO_N "checking for shadow.h... $ECHO_C" >&6; } -if test "${ac_cv_header_shadow_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_shadow_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5 -echo "${ECHO_T}$ac_cv_header_shadow_h" >&6; } +done -fi -if test $ac_cv_header_shadow_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SHADOW_H 1 + +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 -if test "${ac_cv_header_string_h+set}" = set; then - { echo "$as_me:$LINENO: checking for string.h" >&5 -echo $ECHO_N "checking for string.h... $ECHO_C" >&6; } -if test "${ac_cv_header_string_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5 -echo "${ECHO_T}$ac_cv_header_string_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking string.h usability" >&5 -echo $ECHO_N "checking string.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include +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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking string.h presence" >&5 -echo $ECHO_N "checking string.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +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 -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: string.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: string.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: string.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: string.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: string.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: string.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: string.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: string.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: string.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: string.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: string.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: string.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: string.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: string.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: string.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: string.h: in the future, the compiler will take precedence" >&2;} - - ;; + ;; esac -{ echo "$as_me:$LINENO: checking for string.h" >&5 -echo $ECHO_N "checking for string.h... $ECHO_C" >&6; } -if test "${ac_cv_header_string_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_string_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5 -echo "${ECHO_T}$ac_cv_header_string_h" >&6; } -fi -if test $ac_cv_header_string_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRING_H 1 +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 -if test "${ac_cv_header_strings_h+set}" = set; then - { echo "$as_me:$LINENO: checking for strings.h" >&5 -echo $ECHO_N "checking for strings.h... $ECHO_C" >&6; } -if test "${ac_cv_header_strings_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_strings_h" >&5 -echo "${ECHO_T}$ac_cv_header_strings_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking strings.h usability" >&5 -echo $ECHO_N "checking strings.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include +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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking strings.h presence" >&5 -echo $ECHO_N "checking strings.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $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 +#include +int +main () +{ +struct tm t; + int o = t.tm_gmtoff; + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: strings.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: strings.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: strings.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: strings.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: strings.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: strings.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: strings.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: strings.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: strings.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: strings.h: in the future, the compiler will take precedence" >&2;} +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 - ;; -esac -{ echo "$as_me:$LINENO: checking for strings.h" >&5 -echo $ECHO_N "checking for strings.h... $ECHO_C" >&6; } -if test "${ac_cv_header_strings_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_strings_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_strings_h" >&5 -echo "${ECHO_T}$ac_cv_header_strings_h" >&6; } - -fi -if test $ac_cv_header_strings_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRINGS_H 1 -_ACEOF - + { $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 - -if test "${ac_cv_header_bstring_h+set}" = set; then - { echo "$as_me:$LINENO: checking for bstring.h" >&5 -echo $ECHO_N "checking for bstring.h... $ECHO_C" >&6; } -if test "${ac_cv_header_bstring_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_bstring_h" >&5 -echo "${ECHO_T}$ac_cv_header_bstring_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking bstring.h usability" >&5 -echo $ECHO_N "checking bstring.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $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. */ -$ac_includes_default -#include +#include +int +main () +{ +struct stat t; + int o = t.st_gen; + ; + return 0; +} _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_header_compiler=no +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 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking bstring.h presence" >&5 -echo $ECHO_N "checking bstring.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +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 -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: bstring.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: bstring.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: bstring.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: bstring.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: bstring.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: bstring.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: bstring.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: bstring.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: bstring.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: bstring.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: bstring.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: bstring.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: bstring.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: bstring.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: bstring.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: bstring.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for bstring.h" >&5 -echo $ECHO_N "checking for bstring.h... $ECHO_C" >&6; } -if test "${ac_cv_header_bstring_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_bstring_h=$ac_header_preproc +# Check whether --enable-libusb was given. +if test "${enable_libusb+set}" = set; then : + enableval=$enable_libusb; fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_bstring_h" >&5 -echo "${ECHO_T}$ac_cv_header_bstring_h" >&6; } -fi -if test $ac_cv_header_bstring_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_BSTRING_H 1 -_ACEOF -fi +LIBUSB="" -if test "${ac_cv_header_usersec_h+set}" = set; then - { echo "$as_me:$LINENO: checking for usersec.h" >&5 -echo $ECHO_N "checking for usersec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_usersec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_usersec_h" >&5 -echo "${ECHO_T}$ac_cv_header_usersec_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usersec.h usability" >&5 -echo $ECHO_N "checking usersec.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_header_compiler=no + CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" + LIBUSB="`$PKGCONFIG --libs libusb-1.0`" + 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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +# Check whether --enable-tcp_wrappers was given. +if test "${enable_tcp_wrappers+set}" = set; then : + enableval=$enable_tcp_wrappers; +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking usersec.h presence" >&5 -echo $ECHO_N "checking usersec.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi +LIBWRAP="" -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: usersec.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: usersec.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: usersec.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: usersec.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: usersec.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: usersec.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: usersec.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: usersec.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: usersec.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: usersec.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: usersec.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: usersec.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: usersec.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: usersec.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: usersec.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: usersec.h: in the future, the compiler will take precedence" >&2;} +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. */ - ;; -esac -{ echo "$as_me:$LINENO: checking for usersec.h" >&5 -echo $ECHO_N "checking for usersec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_usersec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +/* 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_header_usersec_h=$ac_header_preproc + ac_cv_lib_wrap_hosts_access=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_usersec_h" >&5 -echo "${ECHO_T}$ac_cv_header_usersec_h" >&6; } - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if test $ac_cv_header_usersec_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_USERSEC_H 1 -_ACEOF +{ $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 -if test "${ac_cv_header_sys_ioctl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/ioctl.h" >&5 -echo $ECHO_N "checking for sys/ioctl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_ioctl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ioctl_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ioctl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/ioctl.h usability" >&5 -echo $ECHO_N "checking sys/ioctl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/ioctl.h presence" >&5 -echo $ECHO_N "checking sys/ioctl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +case $uname in + Darwin* | *BSD*) + ARFLAGS="-rcv" + ;; + *) + ARFLAGS="crvs" + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/ioctl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/ioctl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/ioctl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/ioctl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/ioctl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/ioctl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/ioctl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/ioctl.h: in the future, the compiler will take precedence" >&2;} +BACKLIBS="" +SERVERLIBS="" - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/ioctl.h" >&5 -echo $ECHO_N "checking for sys/ioctl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_ioctl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_ioctl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ioctl_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ioctl_h" >&6; } -fi -if test $ac_cv_header_sys_ioctl_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_IOCTL_H 1 -_ACEOF +SAVELIBS="$LIBS" +LIBS="" +# Check whether --enable-acl was given. +if test "${enable_acl+set}" = set; then : + enableval=$enable_acl; fi - -if test "${ac_cv_header_sys_param_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/param.h" >&5 -echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_param_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_param_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_param_h" >&6; } +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 - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/param.h usability" >&5 -echo $ECHO_N "checking sys/param.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/param.h presence" >&5 -echo $ECHO_N "checking sys/param.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +/* 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 -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 : - ac_header_preproc=no +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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/param.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/param.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/param.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/param.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/param.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/param.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/param.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/param.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/param.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/param.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/param.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/param.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/param.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/param.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/param.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/param.h: in the future, the compiler will take precedence" >&2;} + SERVERLIBS="$SERVERLIBS $LIBS" +fi +LIBS="$SAVELIBS" - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/param.h" >&5 -echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_param_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -d /etc/dbus-1; then + DBUSDIR="/etc/dbus-1" else - ac_cv_header_sys_param_h=$ac_header_preproc + DBUSDIR="" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_param_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_param_h" >&6; } +# Check whether --enable-dbus was given. +if test "${enable_dbus+set}" = set; then : + enableval=$enable_dbus; fi -if test $ac_cv_header_sys_param_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_PARAM_H 1 -_ACEOF + +# Check whether --with-dbusdir was given. +if test "${with_dbusdir+set}" = set; then : + withval=$with_dbusdir; DBUSDIR="$withval" fi -if test "${ac_cv_header_sys_ucred_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/ucred.h" >&5 -echo $ECHO_N "checking for sys/ucred.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_ucred_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ucred_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ucred_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/ucred.h usability" >&5 -echo $ECHO_N "checking sys/ucred.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + LIBS="$SAVELIBS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/ucred.h presence" >&5 -echo $ECHO_N "checking sys/ucred.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + + +CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" +CUPS_SYSTEM_AUTHKEY="" +INSTALLXPC="" +LEGACY_BACKENDS="parallel" + +case $uname in + Darwin*) + LEGACY_BACKENDS="" + 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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/ucred.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/ucred.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/ucred.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/ucred.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/ucred.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/ucred.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/ucred.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ucred.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/ucred.h: in the future, the compiler will take precedence" >&2;} + 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 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/ucred.h" >&5 -echo $ECHO_N "checking for sys/ucred.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_ucred_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_ucred_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ucred_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ucred_h" >&6; } + + + 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 -if test $ac_cv_header_sys_ucred_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_UCRED_H 1 -_ACEOF + + + 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 -if test "${ac_cv_header_scsi_sg_h+set}" = set; then - { echo "$as_me:$LINENO: checking for scsi/sg.h" >&5 -echo $ECHO_N "checking for scsi/sg.h... $ECHO_C" >&6; } -if test "${ac_cv_header_scsi_sg_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_header_scsi_sg_h" >&5 -echo "${ECHO_T}$ac_cv_header_scsi_sg_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking scsi/sg.h usability" >&5 -echo $ECHO_N "checking scsi/sg.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include + + + + 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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking scsi/sg.h presence" >&5 -echo $ECHO_N "checking scsi/sg.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + SAVELIBS="$LIBS" + LIBS="$LIBS -framework ApplicationServices" + for ac_func in ColorSyncRegisterDevice +do : + ac_fn_c_check_func "$LINENO" "ColorSyncRegisterDevice" "ac_cv_func_ColorSyncRegisterDevice" +if test "x$ac_cv_func_ColorSyncRegisterDevice" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_COLORSYNCREGISTERDEVICE 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + LIBS="$SAVELIBS" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: scsi/sg.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: scsi/sg.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: scsi/sg.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: scsi/sg.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: scsi/sg.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: scsi/sg.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: scsi/sg.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: scsi/sg.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: scsi/sg.h: in the future, the compiler will take precedence" >&2;} + 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 - ;; -esac -{ echo "$as_me:$LINENO: checking for scsi/sg.h" >&5 -echo $ECHO_N "checking for scsi/sg.h... $ECHO_C" >&6; } -if test "${ac_cv_header_scsi_sg_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_scsi_sg_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_scsi_sg_h" >&5 -echo "${ECHO_T}$ac_cv_header_scsi_sg_h" >&6; } + + + 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 -if test $ac_cv_header_scsi_sg_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SCSI_SG_H 1 +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 -if test "${ac_cv_header_iconv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 -echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + + + 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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 -echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + 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 -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-adminkey was given. +if test "${with_adminkey+set}" = set; then : + withval=$with_adminkey; default_adminkey="$withval" else - ac_cv_header_iconv_h=$ac_header_preproc + default_adminkey="default" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } -fi -if test $ac_cv_header_iconv_h = yes; then - SAVELIBS="$LIBS" - LIBS="" - { echo "$as_me:$LINENO: checking for library containing iconv_open" >&5 -echo $ECHO_N "checking for library containing iconv_open... $ECHO_C" >&6; } -if test "${ac_cv_search_iconv_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_iconv_open=$ac_res +# Check whether --with-operkey was given. +if test "${with_operkey+set}" = set; then : + withval=$with_operkey; default_operkey="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + default_operkey="default" +fi -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 : -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_iconv_open+set}" = set; then - break -fi -done -if test "${ac_cv_search_iconv_open+set}" = set; then - : -else - ac_cv_search_iconv_open=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_iconv_open" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV_H 1 -_ACEOF + $as_echo "#define HAVE_AUTHORIZATION_H 1" >>confdefs.h - SAVELIBS="$SAVELIBS $LIBS" -fi - LIBS="$SAVELIBS" + if test "x$default_adminkey" != xdefault; then + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" + elif grep -q system.print.operator /etc/authorization; then + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" + else + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey 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 -if test "${ac_cv_header_sys_mount_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/mount.h" >&5 -echo $ECHO_N "checking for sys/mount.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_mount_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mount_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_mount_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/mount.h usability" >&5 -echo $ECHO_N "checking sys/mount.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/mount.h presence" >&5 -echo $ECHO_N "checking sys/mount.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/mount.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/mount.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/mount.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/mount.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/mount.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/mount.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/mount.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/mount.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/mount.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/mount.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/mount.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/mount.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/mount.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/mount.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/mount.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/mount.h: in the future, the compiler will take precedence" >&2;} + fi + if test $uversion -ge 110; then + # Broken public headers in 10.7... + { $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 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/mount.h" >&5 -echo $ECHO_N "checking for sys/mount.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_mount_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_mount_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mount_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_mount_h" >&6; } + 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 -if test $ac_cv_header_sys_mount_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_MOUNT_H 1 -_ACEOF -fi + ;; +esac -if test "${ac_cv_header_sys_statfs_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/statfs.h" >&5 -echo $ECHO_N "checking for sys/statfs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_statfs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_statfs_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_statfs_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/statfs.h usability" >&5 -echo $ECHO_N "checking sys/statfs.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include + +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_PRINTOPERATOR_AUTH "$CUPS_DEFAULT_PRINTOPERATOR_AUTH" _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/statfs.h presence" >&5 -echo $ECHO_N "checking sys/statfs.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +COMPONENTS="all" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/statfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/statfs.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/statfs.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/statfs.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/statfs.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/statfs.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/statfs.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statfs.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/statfs.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/statfs.h" >&5 -echo $ECHO_N "checking for sys/statfs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_statfs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_statfs_h=$ac_header_preproc +# Check whether --with-components was given. +if test "${with_components+set}" = set; then : + withval=$with_components; COMPONENTS="$withval" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_statfs_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_statfs_h" >&6; } -fi -if test $ac_cv_header_sys_statfs_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_STATFS_H 1 -_ACEOF -fi +case "$COMPONENTS" in + all) + BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" + ;; + core) + BUILDDIRS="data locale" + ;; -if test "${ac_cv_header_sys_statvfs_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5 -echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_statvfs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/statvfs.h usability" >&5 -echo $ECHO_N "checking sys/statvfs.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + *) + as_fn_error $? "Bad build component \"$COMPONENT\" specified!" "$LINENO" 5 + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/statvfs.h presence" >&5 -echo $ECHO_N "checking sys/statvfs.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/statvfs.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/statvfs.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/statvfs.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/statvfs.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/statvfs.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5 -echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_statvfs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_statvfs_h=$ac_header_preproc +if test "$prefix" = "NONE"; then + prefix="/" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6; } +if test "$exec_prefix" = "NONE"; then + if test "$prefix" = "/"; then + exec_prefix="/usr" + else + exec_prefix="$prefix" + fi fi -if test $ac_cv_header_sys_statvfs_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_STATVFS_H 1 -_ACEOF +if test "$bindir" = "\${exec_prefix}/bin"; then + bindir="$exec_prefix/bin" fi +cat >>confdefs.h <<_ACEOF +#define CUPS_BINDIR "$bindir" +_ACEOF + -if test "${ac_cv_header_sys_vfs_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/vfs.h" >&5 -echo $ECHO_N "checking for sys/vfs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_vfs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "$sbindir" = "\${exec_prefix}/sbin"; then + sbindir="$exec_prefix/sbin" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_vfs_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_vfs_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/vfs.h usability" >&5 -echo $ECHO_N "checking sys/vfs.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include + +cat >>confdefs.h <<_ACEOF +#define CUPS_SBINDIR "$sbindir" _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then + sharedstatedir="/usr/com" +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/vfs.h presence" >&5 -echo $ECHO_N "checking sys/vfs.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no +if test "$datarootdir" = "\${prefix}/share"; then + if test "$prefix" = "/"; then + datarootdir="/usr/share" + else + datarootdir="$prefix/share" + fi fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/vfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/vfs.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/vfs.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/vfs.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/vfs.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/vfs.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/vfs.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/vfs.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/vfs.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/vfs.h" >&5 -echo $ECHO_N "checking for sys/vfs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_vfs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_vfs_h=$ac_header_preproc +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 -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_vfs_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_vfs_h" >&6; } +if test "$includedir" = "\${prefix}/include" -a "$prefix" = "/"; then + includedir="/usr/include" fi -if test $ac_cv_header_sys_vfs_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_VFS_H 1 -_ACEOF +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 + IRIX*) + libdir="$exec_prefix/lib32" + ;; + Linux*) + if test -d /usr/lib64; then + libdir="$exec_prefix/lib64" + fi + ;; + HP-UX*) + if test -d /usr/lib/hpux32; then + libdir="$exec_prefix/lib/hpux32" + fi + ;; + esac +fi -for ac_func in statfs statvfs -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-privateinclude was given. +if test "${with_privateinclude+set}" = set; then : + withval=$with_privateinclude; privateinclude="$withval" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + privateinclude="" +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +if test "x$privateinclude" != x -a "x$privateinclude" != xnone; then + PRIVATEINCLUDE="$privateinclude/cups" +else + privateinclude="" + PRIVATEINCLUDE="" +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +# Check whether --with-rcdir was given. +if test "${with_rcdir+set}" = set; then : + withval=$with_rcdir; rcdir="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + rcdir="" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +# Check whether --with-rclevels was given. +if test "${with_rclevels+set}" = set; then : + withval=$with_rclevels; rclevels="$withval" +else + rclevels="2 3 5" fi -done - - - -for ac_func in strdup strlcat strlcpy -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-rcstart was given. +if test "${with_rcstart+set}" = set; then : + withval=$with_rcstart; rcstart="$withval" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func + rcstart="99" +fi -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +# Check whether --with-rcstop was given. +if test "${with_rcstop+set}" = set; then : + withval=$with_rcstop; rcstop="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + rcstop="00" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +# Check whether --with-smfmanifestdir was given. +if test "${with_smfmanifestdir+set}" = set; then : + withval=$with_smfmanifestdir; smfmanifestdir="$withval" +else + smfmanifestdir="" fi -done -if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then - echo Forcing snprintf emulation for HP-UX. -else +INITDIR="" +INITDDIR="" +RCLEVELS="$rclevels" +RCSTART="$rcstart" +RCSTOP="$rcstop" +SMFMANIFESTDIR="" -for ac_func in snprintf vsnprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +if test x$rcdir = x; then + case "$uname" in + AIX*) + INITDIR="/etc/rc.d" + ;; -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + Darwin*) + # Darwin and MacOS X... + if test -x /sbin/launchd; then + INITDDIR="/System/Library/LaunchDaemons" + else + INITDDIR="/System/Library/StartupItems/PrintingServices" + fi + ;; -#ifdef __STDC__ -# include -#else -# include -#endif + FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*) + # FreeBSD and OpenBSD + ;; -#undef $ac_func + HP-UX*) + INITDIR="/sbin" + RCLEVELS="2" + RCSTART="380" + RCSTOP="620" + ;; -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif + IRIX*) + # IRIX + INITDIR="/etc" + RCSTART="60" + RCSTOP="25" + ;; -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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" + ;; - eval "$as_ac_var=no" -fi + NetBSD*) + # NetBSD + INITDDIR="/etc/rc.d" + ;; -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + OSF1*) + INITDIR="/sbin" + ;; -fi -done + 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 -for ac_func in random lrand48 arc4random -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +# Check whether --with-xinetd was given. +if test "${with_xinetd+set}" = set; then : + withval=$with_xinetd; XINETD="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + XINETD="" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +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 -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + + + +# Check whether --with-lpdconfig was given. +if test "${with_lpdconfig+set}" = set; then : + withval=$with_lpdconfig; LPDCONFIG="$withval" +else + LPDCONFIG="" fi -done +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 -for ac_func in geteuid -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_LPD_CONFIG "$LPDCONFIG" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func +# Check whether --with-smbconfig was given. +if test "${with_smbconfig+set}" = set; then : + withval=$with_smbconfig; SMBCONFIG="$withval" +else + SMBCONFIG="" +fi -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} +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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SMB_CONFIG "$SMBCONFIG" +_ACEOF - eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +# Cache data... + +# Check whether --with-cachedir was given. +if test "${with_cachedir+set}" = set; then : + withval=$with_cachedir; cachedir="$withval" +else + cachedir="" fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + +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 -done +cat >>confdefs.h <<_ACEOF +#define CUPS_CACHEDIR "$CUPS_CACHEDIR" +_ACEOF -for ac_func in setpgid -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +# Data files +CUPS_DATADIR="$datadir/cups" +cat >>confdefs.h <<_ACEOF +#define CUPS_DATADIR "$datadir/cups" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func +# Icon directory -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +# Check whether --with-icondir was given. +if test "${with_icondir+set}" = set; then : + withval=$with_icondir; icondir="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + icondir="" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +if test "x$icondir" = x -a -d /usr/share/icons; then + ICONDIR="/usr/share/icons" +else + ICONDIR="$icondir" fi -done -for ac_func in vsyslog -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Menu directory + +# Check whether --with-menudir was given. +if test "${with_menudir+set}" = set; then : + withval=$with_menudir; menudir="$withval" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + menudir="" +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +if test "x$menudir" = x -a -d /usr/share/applications; then + MENUDIR="/usr/share/applications" +else + MENUDIR="$menudir" +fi -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Documentation files - eval "$as_ac_var=no" +# Check whether --with-docdir was given. +if test "${with_docdir+set}" = set; then : + withval=$with_docdir; docdir="$withval" +else + docdir="" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +if test x$docdir = x; then + CUPS_DOCROOT="$datadir/doc/cups" + docdir="$datadir/doc/cups" +else + CUPS_DOCROOT="$docdir" 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 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define CUPS_DOCROOT "$docdir" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif +# Fonts -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +# Check whether --with-fontpath was given. +if test "${with_fontpath+set}" = set; then : + withval=$with_fontpath; fontpath="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + fontpath="" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +if test "x$fontpath" = "x"; then + CUPS_FONTPATH="$datadir/cups/fonts" +else + CUPS_FONTPATH="$fontpath" fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + + +cat >>confdefs.h <<_ACEOF +#define CUPS_FONTPATH "$CUPS_FONTPATH" _ACEOF -fi -done - ;; -esac +# 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" + ;; -for ac_func in sigaction -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + *) + # This is the standard System V location... + CUPS_LOCALEDIR="$exec_prefix/lib/locale" + ;; + esac else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + CUPS_LOCALEDIR="$localedir" +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +cat >>confdefs.h <<_ACEOF +#define CUPS_LOCALEDIR "$CUPS_LOCALEDIR" +_ACEOF -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif +# Log files... -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +# Check whether --with-logdir was given. +if test "${with_logdir+set}" = set; then : + withval=$with_logdir; logdir="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + logdir="" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + +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 -done - +cat >>confdefs.h <<_ACEOF +#define CUPS_LOGDIR "$CUPS_LOGDIR" +_ACEOF -for ac_func in waitpid wait3 -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +# Longer-term spool data +CUPS_REQUESTS="$localstatedir/spool/cups" +cat >>confdefs.h <<_ACEOF +#define CUPS_REQUESTS "$localstatedir/spool/cups" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif +# 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 -int -main () -{ -return $ac_func (); - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define CUPS_SERVERBIN "$CUPS_SERVERBIN" _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + + +# Configuration files +CUPS_SERVERROOT="$sysconfdir/cups" +cat >>confdefs.h <<_ACEOF +#define CUPS_SERVERROOT "$sysconfdir/cups" _ACEOF -fi -done -{ echo "$as_me:$LINENO: checking for tm_gmtoff member in tm structure" >&5 -echo $ECHO_N "checking for tm_gmtoff member in tm structure... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -struct tm t; - int o = t.tm_gmtoff; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +# Transient run-time state +case "$uname" in + Darwin*) + # Darwin (Mac OS X) + CUPS_STATEDIR="$CUPS_SERVERROOT" + ;; + *) + # All others + CUPS_STATEDIR="$localstatedir/run/cups" + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_TM_GMTOFF 1 +cat >>confdefs.h <<_ACEOF +#define CUPS_STATEDIR "$CUPS_STATEDIR" _ACEOF -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: checking for st_gen member in stat structure" >&5 -echo $ECHO_N "checking for st_gen member in stat structure... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -struct stat t; - int o = t.st_gen; - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_ST_GEN 1 -_ACEOF -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +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" + ;; + IRIX) + # SGI IRIX + mandir="/usr/share/catman/u_man" + AMANDIR="/usr/share/catman/a_man" + PMANDIR="/usr/share/catman/p_man" + ;; + *) + # All others + mandir="/usr/man" + AMANDIR="/usr/man" + PMANDIR="/usr/man" + ;; + esac +else + AMANDIR="$mandir" + PMANDIR="$mandir" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -for ac_func in removefile -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +case "$uname" in + IRIX*) + # SGI IRIX + MAN1EXT=1 + MAN5EXT=5 + MAN7EXT=7 + MAN8EXT=1m + MAN8DIR=1 + ;; + SunOS* | HP-UX*) + # Solaris and HP-UX + MAN1EXT=1 + MAN5EXT=5 + MAN7EXT=7 + MAN8EXT=1m + MAN8DIR=1m + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and Mac 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 -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done -# Check whether --enable-libusb was given. -if test "${enable_libusb+set}" = set; then - enableval=$enable_libusb; + +# Check whether --enable-32bit was given. +if test "${enable_32bit+set}" = set; then : + enableval=$enable_32bit; fi -LIBUSB="" +INSTALL32="" +LIB32CUPS="" +LIB32CUPSIMAGE="" +LIB32DIR="" +UNINSTALL32="" + + -if test x$enable_libusb = xyes; then - check_libusb=yes -elif test x$enable_libusb != xno -a $uname != Darwin; then - check_libusb=yes -else - check_libusb=no + + + +# Check whether --enable-64bit was given. +if test "${enable_64bit+set}" = set; then : + enableval=$enable_64bit; fi -if test $check_libusb = yes; then - { echo "$as_me:$LINENO: checking for usb_get_string_simple in -lusb" >&5 -echo $ECHO_N "checking for usb_get_string_simple in -lusb... $ECHO_C" >&6; } -if test "${ac_cv_lib_usb_usb_get_string_simple+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lusb $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 usb_get_string_simple (); -int -main () -{ -return usb_get_string_simple (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_usb_usb_get_string_simple=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_usb_usb_get_string_simple=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb_usb_get_string_simple" >&5 -echo "${ECHO_T}$ac_cv_lib_usb_usb_get_string_simple" >&6; } -if test $ac_cv_lib_usb_usb_get_string_simple = yes; then - - if test "${ac_cv_header_usb_h+set}" = set; then - { echo "$as_me:$LINENO: checking for usb.h" >&5 -echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; } -if test "${ac_cv_header_usb_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 -echo "${ECHO_T}$ac_cv_header_usb_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usb.h usability" >&5 -echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking usb.h presence" >&5 -echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for usb.h" >&5 -echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; } -if test "${ac_cv_header_usb_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_usb_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 -echo "${ECHO_T}$ac_cv_header_usb_h" >&6; } - -fi -if test $ac_cv_header_usb_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_USB_H 1 -_ACEOF - - LIBUSB="-lusb" -fi +INSTALL64="" +LIB64CUPS="" +LIB64CUPSIMAGE="" +LIB64DIR="" +UNINSTALL64="" -fi -fi -# Check whether --enable-tcp_wrappers was given. -if test "${enable_tcp_wrappers+set}" = set; then - enableval=$enable_tcp_wrappers; -fi -LIBWRAP="" +case "$uname" in + HP-UX*) + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + INSTALL32="install32bit" + LIB32CUPS="32bit/libcups.so.2" + LIB32CUPSIMAGE="32bit/libcupsimage.so.2" + LIB32DIR="$exec_prefix/lib" + if test -d /usr/lib/hpux32; then + LIB32DIR="${LIB32DIR}/hpux32" + fi + UNINSTALL32="uninstall32bit" + fi -if test x$enable_tcp_wrappers = xyes; then - { echo "$as_me:$LINENO: checking for hosts_access in -lwrap" >&5 -echo $ECHO_N "checking for hosts_access in -lwrap... $ECHO_C" >&6; } -if test "${ac_cv_lib_wrap_hosts_access+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lwrap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + INSTALL64="install64bit" + LIB64CUPS="64bit/libcups.so.2" + LIB64CUPSIMAGE="64bit/libcupsimage.so.2" + LIB64DIR="$exec_prefix/lib" + if test -d /usr/lib/hpux64; then + LIB64DIR="${LIB64DIR}/hpux64" + fi + UNINSTALL64="uninstall64bit" + fi + ;; -/* 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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_wrap_hosts_access=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + IRIX) + if test "x$enable_32bit" = xyes; then + INSTALL32="install32bit" + LIB32CUPS="32bit/libcups.so.2" + LIB32CUPSIMAGE="32bit/libcupsimage.so.2" + LIB32DIR="$prefix/lib32" + UNINSTALL32="uninstall32bit" + fi - ac_cv_lib_wrap_hosts_access=no -fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + INSTALL64="install64bit" + LIB64CUPS="64bit/libcups.so.2" + LIB64CUPSIMAGE="64bit/libcupsimage.so.2" + LIB64DIR="$prefix/lib64" + UNINSTALL64="uninstall64bit" + fi + ;; -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_hosts_access" >&5 -echo "${ECHO_T}$ac_cv_lib_wrap_hosts_access" >&6; } -if test $ac_cv_lib_wrap_hosts_access = yes; then - - if test "${ac_cv_header_tcpd_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tcpd.h" >&5 -echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tcpd_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5 -echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking tcpd.h usability" >&5 -echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + Linux*) + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + INSTALL32="install32bit" + LIB32CUPS="32bit/libcups.so.2" + LIB32CUPSIMAGE="32bit/libcupsimage.so.2" + LIB32DIR="$exec_prefix/lib" + if test -d /usr/lib32; then + LIB32DIR="${LIB32DIR}32" + fi + UNINSTALL32="uninstall32bit" + fi - ac_header_compiler=no -fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + INSTALL64="install64bit" + LIB64CUPS="64bit/libcups.so.2" + LIB64CUPSIMAGE="64bit/libcupsimage.so.2" + LIB64DIR="$exec_prefix/lib" + if test -d /usr/lib64; then + LIB64DIR="${LIB64DIR}64" + fi + UNINSTALL64="uninstall64bit" + fi + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + SunOS*) + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + INSTALL32="install32bit" + LIB32CUPS="32bit/libcups.so.2" + LIB32CUPSIMAGE="32bit/libcupsimage.so.2" + LIB32DIR="$exec_prefix/lib/32" + UNINSTALL32="uninstall32bit" + fi -# Is the header present? -{ echo "$as_me:$LINENO: checking tcpd.h presence" >&5 -echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + INSTALL64="install64bit" + LIB64CUPS="64bit/libcups.so.2" + LIB64CUPSIMAGE="64bit/libcupsimage.so.2" + LIB64DIR="$exec_prefix/lib/64" + UNINSTALL64="uninstall64bit" + fi + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tcpd.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tcpd.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tcpd.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tcpd.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for tcpd.h" >&5 -echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tcpd_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tcpd_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5 -echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; } +PICFLAG=1 +DSOFLAGS="${DSOFLAGS:=}" +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; fi -if test $ac_cv_header_tcpd_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_TCPD_H 1 -_ACEOF - LIBWRAP="-lwrap" -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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver_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" + LIBCUPSDRIVER="libcupsdriver.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" + LIBCUPSDRIVER="libcupsdriver.a" + LIBCUPSIMAGE="libcupsimage.a" + LIBCUPSMIME="libcupsmime.a" + LIBCUPSPPDC="libcupsppdc.a" + DSO=":" + DSOXX=":" fi -fi - -case $uname in - Darwin* | *BSD*) - ARFLAGS="-rcv" - ;; - *) - ARFLAGS="crvs" - ;; -esac +# 32-bit and 64-bit libraries need variations of the standard +# DSOFLAGS... +DSO32FLAGS="$DSOFLAGS" +DSO64FLAGS="$DSOFLAGS" -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 - { echo "$as_me:$LINENO: checking for library containing acl_init" >&5 -echo $ECHO_N "checking for library containing acl_init... $ECHO_C" >&6; } -if test "${ac_cv_search_acl_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_acl_init=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_acl_init+set}" = set; then - break -fi -done -if test "${ac_cv_search_acl_init+set}" = set; then - : -else - ac_cv_search_acl_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_acl_init" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_ACL_INIT 1 -_ACEOF -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 +if test x$enable_shared = xno; then + LINKCUPS="../cups/lib$cupsbase.a" + LINKCUPSIMAGE="../filter/libcupsimage.a" + + EXTLINKCUPS="-lcups" + EXTLINKCUPSDRIVER="-lcupsdriver" + EXTLINKCUPSIMAGE="-lcupsimage" +else + if test $uname = AIX; then + LINKCUPS="-l${cupsbase}_s" + LINKCUPSIMAGE="-lcupsimage_s" + EXTLINKCUPS="-lcups_s" + EXTLINKCUPSDRIVER="-lcupsdriver_s" + EXTLINKCUPSIMAGE="-lcupsimage_s" + else + LINKCUPS="-l${cupsbase}" + LINKCUPSIMAGE="-lcupsimage" -# Check whether --with-dbusdir was given. -if test "${with_dbusdir+set}" = set; then - withval=$with_dbusdir; DBUSDIR="$withval" + EXTLINKCUPS="-lcups" + EXTLINKCUPSDRIVER="-lcupsdriver" + EXTLINKCUPSIMAGE="-lcupsimage" + fi fi -DBUS_NOTIFIER="" -DBUS_NOTIFIERLIBS="" -if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then - { echo "$as_me:$LINENO: checking for DBUS" >&5 -echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; } - if $PKGCONFIG --exists dbus-1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_DBUS 1 -_ACEOF - 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" - { echo "$as_me:$LINENO: checking for dbus_message_iter_init_append" >&5 -echo $ECHO_N "checking for dbus_message_iter_init_append... $ECHO_C" >&6; } -if test "${ac_cv_func_dbus_message_iter_init_append+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dbus_message_iter_init_append to an innocuous variant, in case declares dbus_message_iter_init_append. - For example, HP-UX 11i declares gettimeofday. */ -#define dbus_message_iter_init_append innocuous_dbus_message_iter_init_append -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dbus_message_iter_init_append (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef dbus_message_iter_init_append +EXPORT_LDFLAGS="" -/* 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 dbus_message_iter_init_append (); -/* 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_dbus_message_iter_init_append || defined __stub___dbus_message_iter_init_append -choke me -#endif +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="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)" + IMGLIBS="" -int -main () -{ -return dbus_message_iter_init_append (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dbus_message_iter_init_append=yes + # 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" + DSO32FLAGS="-Wl,+s,+b,$LIB32DIR $DSO32FLAGS" + DSO64FLAGS="-Wl,+s,+b,$LIB64DIR $DSO64FLAGS" + ;; + *) + DSOFLAGS="+s +b $libdir $DSOFLAGS" + DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS" + DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS" + ;; + 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" + DSO32FLAGS="-R$LIB32DIR $DSO32FLAGS" + DSO64FLAGS="-R$LIB64DIR $DSO64FLAGS" + LDFLAGS="$LDFLAGS -R$libdir" + EXPORT_LDFLAGS="-R$libdir" + fi + ;; + *BSD*) + # *BSD... + if test $exec_prefix != /usr; then + DSOFLAGS="-Wl,-R$libdir $DSOFLAGS" + DSO32FLAGS="-Wl,-R$LIB32DIR $DSO32FLAGS" + DSO64FLAGS="-Wl,-R$LIB64DIR $DSO64FLAGS" + LDFLAGS="$LDFLAGS -Wl,-R$libdir" + EXPORT_LDFLAGS="-Wl,-R$libdir" + fi + ;; + IRIX | Linux | GNU) + # IRIX, Linux, and HURD... + if test $exec_prefix != /usr; then + DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS" + DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS" + DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS" + LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir" + EXPORT_LDFLAGS="-Wl,-rpath,$libdir" + fi + ;; + esac else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dbus_message_iter_init_append=no + DSOLIBS="" + IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dbus_message_iter_init_append" >&5 -echo "${ECHO_T}$ac_cv_func_dbus_message_iter_init_append" >&6; } -if test $ac_cv_func_dbus_message_iter_init_append = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_DBUS_MESSAGE_ITER_INIT_APPEND 1 -_ACEOF -fi - LIBS="$SAVELIBS" + + + + +# 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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + LIBTOOL="" fi fi +if test x$LIBTOOL != x; then + LIBCUPS="libcups.la" + LIBCUPSIMAGE="libcupsimage.la" + LINKCUPS="../cups/\$(LIBCUPS)" + LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)" + DSO="\$(CC)" +fi -CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" -CUPS_SYSTEM_AUTHKEY="" -INSTALLXPC="" -LEGACY_BACKENDS="parallel" -case $uname in - Darwin*) - LEGACY_BACKENDS="" - BACKLIBS="$BACKLIBS -framework IOKit" - SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" - LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS" - if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5 -echo $ECHO_N "checking for ApplicationServices/ApplicationServices.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5 -echo "${ECHO_T}$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ApplicationServices/ApplicationServices.h usability" >&5 -echo $ECHO_N "checking ApplicationServices/ApplicationServices.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +INSTALL_STRIP="" +OPTIM="" - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking ApplicationServices/ApplicationServices.h presence" >&5 -echo $ECHO_N "checking ApplicationServices/ApplicationServices.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +# Check whether --with-optim was given. +if test "${with_optim+set}" = set; then : + withval=$with_optim; fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: in the future, the compiler will take precedence" >&2;} +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +fi - ;; -esac -{ echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5 -echo $ECHO_N "checking for ApplicationServices/ApplicationServices.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ApplicationServices_ApplicationServices_h=$ac_header_preproc +# Check whether --enable-debug_guards was given. +if test "${enable_debug_guards+set}" = set; then : + enableval=$enable_debug_guards; fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5 -echo "${ECHO_T}$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6; } +# Check whether --enable-debug_printfs was given. +if test "${enable_debug_printfs+set}" = set; then : + enableval=$enable_debug_printfs; fi -if test $ac_cv_header_ApplicationServices_ApplicationServices_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_APPLICATIONSERVICES_H 1 -_ACEOF +# Check whether --enable-unit_tests was given. +if test "${enable_unit_tests+set}" = set; then : + enableval=$enable_unit_tests; fi - if test "${ac_cv_header_CoreFoundation_CoreFoundation_h+set}" = set; then - { echo "$as_me:$LINENO: checking for CoreFoundation/CoreFoundation.h" >&5 -echo $ECHO_N "checking for CoreFoundation/CoreFoundation.h... $ECHO_C" >&6; } -if test "${ac_cv_header_CoreFoundation_CoreFoundation_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreFoundation_CoreFoundation_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreFoundation_CoreFoundation_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking CoreFoundation/CoreFoundation.h usability" >&5 -echo $ECHO_N "checking CoreFoundation/CoreFoundation.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if test x$enable_debug = xyes; then + OPTIM="-g" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + INSTALL_STRIP="-s" +fi - ac_header_compiler=no +if test x$enable_debug_printfs = xyes; then + CFLAGS="$CFLAGS -DDEBUG" + CXXFLAGS="$CXXFLAGS -DDEBUG" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +if test x$enable_debug_guards = xyes; then + CFLAGS="$CFLAGS -DDEBUG_GUARDS" + CXXFLAGS="$CXXFLAGS -DDEBUG_GUARDS" +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking CoreFoundation/CoreFoundation.h presence" >&5 -echo $ECHO_N "checking CoreFoundation/CoreFoundation.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if test x$enable_unit_tests = xyes; then + UNITTESTS="unittests" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + UNITTESTS="" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CoreFoundation.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: CoreFoundation/CoreFoundation.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for CoreFoundation/CoreFoundation.h" >&5 -echo $ECHO_N "checking for CoreFoundation/CoreFoundation.h... $ECHO_C" >&6; } -if test "${ac_cv_header_CoreFoundation_CoreFoundation_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_CoreFoundation_CoreFoundation_h=$ac_header_preproc +# Check whether --with-archflags was given. +if test "${with_archflags+set}" = set; then : + withval=$with_archflags; fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreFoundation_CoreFoundation_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreFoundation_CoreFoundation_h" >&6; } -fi -if test $ac_cv_header_CoreFoundation_CoreFoundation_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_COREFOUNDATION_H 1 -_ACEOF +# Check whether --with-ldarchflags was given. +if test "${with_ldarchflags+set}" = set; then : + withval=$with_ldarchflags; fi - if test "${ac_cv_header_CoreFoundation_CFPriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for CoreFoundation/CFPriv.h" >&5 -echo $ECHO_N "checking for CoreFoundation/CFPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_CoreFoundation_CFPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreFoundation_CFPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreFoundation_CFPriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking CoreFoundation/CFPriv.h usability" >&5 -echo $ECHO_N "checking CoreFoundation/CFPriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if test -z "$with_archflags"; then + ARCHFLAGS="" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ARCHFLAGS="$with_archflags" +fi - ac_header_compiler=no +if test -z "$with_ldarchflags"; then + if test "$uname" = Darwin; then + # Only create 32-bit programs by default + LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`" + else + LDARCHFLAGS="$ARCHFLAGS" + fi +else + LDARCHFLAGS="$with_ldarchflags" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking CoreFoundation/CFPriv.h presence" >&5 -echo $ECHO_N "checking CoreFoundation/CFPriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + + +# Check whether --with-arch32flags was given. +if test "${with_arch32flags+set}" = set; then : + withval=$with_arch32flags; fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +ARCH32FLAGS="" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFPriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: CoreFoundation/CFPriv.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for CoreFoundation/CFPriv.h" >&5 -echo $ECHO_N "checking for CoreFoundation/CFPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_CoreFoundation_CFPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_CoreFoundation_CFPriv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreFoundation_CFPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreFoundation_CFPriv_h" >&6; } +# Check whether --with-arch64flags was given. +if test "${with_arch64flags+set}" = set; then : + withval=$with_arch64flags; fi -if test $ac_cv_header_CoreFoundation_CFPriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_CFPRIV_H 1 -_ACEOF -fi +ARCH64FLAGS="" - if test "${ac_cv_header_CoreFoundation_CFBundlePriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for CoreFoundation/CFBundlePriv.h" >&5 -echo $ECHO_N "checking for CoreFoundation/CFBundlePriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_CoreFoundation_CFBundlePriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-relro was given. +if test "${enable_relro+set}" = set; then : + enableval=$enable_relro; fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreFoundation_CFBundlePriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreFoundation_CFBundlePriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking CoreFoundation/CFBundlePriv.h usability" >&5 -echo $ECHO_N "checking CoreFoundation/CFBundlePriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +CXXLIBS="${CXXLIBS:=}" -# Is the header present? -{ echo "$as_me:$LINENO: checking CoreFoundation/CFBundlePriv.h presence" >&5 -echo $ECHO_N "checking CoreFoundation/CFBundlePriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi +PIEFLAGS="" -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreFoundation/CFBundlePriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: CoreFoundation/CFBundlePriv.h: in the future, the compiler will take precedence" >&2;} +RELROFLAGS="" - ;; -esac -{ echo "$as_me:$LINENO: checking for CoreFoundation/CFBundlePriv.h" >&5 -echo $ECHO_N "checking for CoreFoundation/CFBundlePriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_CoreFoundation_CFBundlePriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_CoreFoundation_CFBundlePriv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreFoundation_CFBundlePriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreFoundation_CFBundlePriv_h" >&6; } -fi -if test $ac_cv_header_CoreFoundation_CFBundlePriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_CFBUNDLEPRIV_H 1 -_ACEOF +PHPOPTIONS="" -fi +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 - if test "${ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h+set}" = set; then - { echo "$as_me:$LINENO: checking for IOKit/pwr_mgt/IOPMLibPrivate.h" >&5 -echo $ECHO_N "checking for IOKit/pwr_mgt/IOPMLibPrivate.h... $ECHO_C" >&6; } -if test "${ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h" >&5 -echo "${ECHO_T}$ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking IOKit/pwr_mgt/IOPMLibPrivate.h usability" >&5 -echo $ECHO_N "checking IOKit/pwr_mgt/IOPMLibPrivate.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + # Generate position-independent code as needed... + if test $PICFLAG = 1 -a $uname != AIX; then + OPTIM="-fPIC $OPTIM" + fi - ac_header_compiler=no -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. */ -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +int +main () +{ -# Is the header present? -{ echo "$as_me:$LINENO: checking IOKit/pwr_mgt/IOPMLibPrivate.h presence" >&5 -echo $ECHO_N "checking IOKit/pwr_mgt/IOPMLibPrivate.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_link "$LINENO"; then : + OPTIM="$OPTIM -fstack-protector" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + { $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" -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: IOKit/pwr_mgt/IOPMLibPrivate.h: in the future, the compiler will take precedence" >&2;} + # 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. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -fPIE" >&5 +$as_echo_n "checking if GCC supports -fPIE... " >&6; } + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fPIE" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac -{ echo "$as_me:$LINENO: checking for IOKit/pwr_mgt/IOPMLibPrivate.h" >&5 -echo $ECHO_N "checking for IOKit/pwr_mgt/IOPMLibPrivate.h... $ECHO_C" >&6; } -if test "${ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h" >&5 -echo "${ECHO_T}$ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h" >&6; } +int +main () +{ -fi -if test $ac_cv_header_IOKit_pwr_mgt_IOPMLibPrivate_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H 1 + ; + return 0; +} _ACEOF - +if ac_fn_c_try_compile "$LINENO"; then : + case "$CC" in + *clang) + PIEFLAGS="-fPIE -Wl,-pie" + ;; + *) + PIEFLAGS="-fPIE -pie" + ;; + esac + { $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" + if test "x$with_optim" = x; then + # Add useful warning options for tracking down problems... + OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM" - - -for ac_func in SCDynamicStoreCopyComputerName -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + # Additional warning options for development testing... + if test -d .svn; then + OPTIM="-Wshadow -Werror $OPTIM" + PHPOPTIONS="-Wno-shadow" + 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. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif int main () { -return $ac_func (); + ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$OLDCFLAGS" + fi + fi -fi -done + 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" + ;; + HP-UX*) + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + if test -z "$with_arch32flags"; then + ARCH32FLAGS="-milp32" + else + ARCH32FLAGS="$with_arch32flags" + fi - SAVELIBS="$LIBS" - LIBS="$LIBS -framework ApplicationServices" - -for ac_func in ColorSyncRegisterDevice -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - LIBS="$SAVELIBS" - - if test "${ac_cv_header_membership_h+set}" = set; then - { echo "$as_me:$LINENO: checking for membership.h" >&5 -echo $ECHO_N "checking for membership.h... $ECHO_C" >&6; } -if test "${ac_cv_header_membership_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_membership_h" >&5 -echo "${ECHO_T}$ac_cv_header_membership_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking membership.h usability" >&5 -echo $ECHO_N "checking membership.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking membership.h presence" >&5 -echo $ECHO_N "checking membership.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: membership.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: membership.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: membership.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: membership.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: membership.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: membership.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: membership.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: membership.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: membership.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: membership.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: membership.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: membership.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: membership.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: membership.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: membership.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: membership.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for membership.h" >&5 -echo $ECHO_N "checking for membership.h... $ECHO_C" >&6; } -if test "${ac_cv_header_membership_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_membership_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_membership_h" >&5 -echo "${ECHO_T}$ac_cv_header_membership_h" >&6; } - -fi -if test $ac_cv_header_membership_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_MEMBERSHIP_H 1 -_ACEOF - -fi - - - if test "${ac_cv_header_membershipPriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for membershipPriv.h" >&5 -echo $ECHO_N "checking for membershipPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_membershipPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_membershipPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_membershipPriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking membershipPriv.h usability" >&5 -echo $ECHO_N "checking membershipPriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking membershipPriv.h presence" >&5 -echo $ECHO_N "checking membershipPriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: membershipPriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: membershipPriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: membershipPriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: membershipPriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: membershipPriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: membershipPriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: membershipPriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: membershipPriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: membershipPriv.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for membershipPriv.h" >&5 -echo $ECHO_N "checking for membershipPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_membershipPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_membershipPriv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_membershipPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_membershipPriv_h" >&6; } - -fi -if test $ac_cv_header_membershipPriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_MEMBERSHIPPRIV_H 1 -_ACEOF - -fi - - - -for ac_func in mbr_uid_to_uuid -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - -for ac_func in vproc_transaction_begin -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - if test "${ac_cv_header_dlfcn_h+set}" = set; then - { echo "$as_me:$LINENO: checking for dlfcn.h" >&5 -echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; } -if test "${ac_cv_header_dlfcn_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 -echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking dlfcn.h usability" >&5 -echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking dlfcn.h presence" >&5 -echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: dlfcn.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: dlfcn.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: dlfcn.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: dlfcn.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: dlfcn.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: dlfcn.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: dlfcn.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: dlfcn.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: dlfcn.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for dlfcn.h" >&5 -echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; } -if test "${ac_cv_header_dlfcn_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_dlfcn_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 -echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; } - -fi -if test $ac_cv_header_dlfcn_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - - - - if test "${ac_cv_header_notify_h+set}" = set; then - { echo "$as_me:$LINENO: checking for notify.h" >&5 -echo $ECHO_N "checking for notify.h... $ECHO_C" >&6; } -if test "${ac_cv_header_notify_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_notify_h" >&5 -echo "${ECHO_T}$ac_cv_header_notify_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking notify.h usability" >&5 -echo $ECHO_N "checking notify.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking notify.h presence" >&5 -echo $ECHO_N "checking notify.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: notify.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: notify.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: notify.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: notify.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: notify.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: notify.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: notify.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: notify.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: notify.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: notify.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: notify.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: notify.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: notify.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: notify.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: notify.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: notify.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for notify.h" >&5 -echo $ECHO_N "checking for notify.h... $ECHO_C" >&6; } -if test "${ac_cv_header_notify_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_notify_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_notify_h" >&5 -echo "${ECHO_T}$ac_cv_header_notify_h" >&6; } - -fi -if test $ac_cv_header_notify_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_NOTIFY_H 1 -_ACEOF - -fi - - - -for ac_func in notify_post -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 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 - - - if test "${ac_cv_header_Security_Authorization_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/Authorization.h" >&5 -echo $ECHO_N "checking for Security/Authorization.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_Authorization_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_Authorization_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_Authorization_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/Authorization.h usability" >&5 -echo $ECHO_N "checking Security/Authorization.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/Authorization.h presence" >&5 -echo $ECHO_N "checking Security/Authorization.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/Authorization.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/Authorization.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/Authorization.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/Authorization.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/Authorization.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/Authorization.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/Authorization.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/Authorization.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/Authorization.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/Authorization.h" >&5 -echo $ECHO_N "checking for Security/Authorization.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_Authorization_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_Authorization_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_Authorization_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_Authorization_h" >&6; } - -fi -if test $ac_cv_header_Security_Authorization_h = yes; then - - cat >>confdefs.h <<\_ACEOF -#define HAVE_AUTHORIZATION_H 1 -_ACEOF - - - if test "x$default_adminkey" != xdefault; then - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" - elif grep -q system.print.operator /etc/authorization; then - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" - else - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey 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 - - - if test "${ac_cv_header_Security_SecBasePriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecBasePriv.h" >&5 -echo $ECHO_N "checking for Security/SecBasePriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecBasePriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecBasePriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecBasePriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecBasePriv.h usability" >&5 -echo $ECHO_N "checking Security/SecBasePriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecBasePriv.h presence" >&5 -echo $ECHO_N "checking Security/SecBasePriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecBasePriv.h" >&5 -echo $ECHO_N "checking for Security/SecBasePriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecBasePriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_SecBasePriv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecBasePriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecBasePriv_h" >&6; } - -fi -if test $ac_cv_header_Security_SecBasePriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECBASEPRIV_H 1 -_ACEOF - -fi - - - - if test $uversion -ge 100; then - if test "${ac_cv_header_sandbox_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sandbox.h" >&5 -echo $ECHO_N "checking for sandbox.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sandbox_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sandbox_h" >&5 -echo "${ECHO_T}$ac_cv_header_sandbox_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sandbox.h usability" >&5 -echo $ECHO_N "checking sandbox.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sandbox.h presence" >&5 -echo $ECHO_N "checking sandbox.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sandbox.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sandbox.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sandbox.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sandbox.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sandbox.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sandbox.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sandbox.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sandbox.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sandbox.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sandbox.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sandbox.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sandbox.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sandbox.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sandbox.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sandbox.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sandbox.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for sandbox.h" >&5 -echo $ECHO_N "checking for sandbox.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sandbox_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sandbox_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sandbox_h" >&5 -echo "${ECHO_T}$ac_cv_header_sandbox_h" >&6; } - -fi -if test $ac_cv_header_sandbox_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SANDBOX_H 1 -_ACEOF - -fi - - - fi - if test $uversion -ge 110; then - # Broken public headers in 10.7... - { echo "$as_me:$LINENO: checking for sandbox/private.h presence" >&5 -echo $ECHO_N "checking for sandbox/private.h presence... $ECHO_C" >&6; } - if test -f /usr/local/include/sandbox/private.h; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS." >&5 -echo "$as_me: error: Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS." >&2;} - { (exit 1); exit 1; }; } - fi - fi - - if test "${ac_cv_header_xpc_xpc_h+set}" = set; then - { echo "$as_me:$LINENO: checking for xpc/xpc.h" >&5 -echo $ECHO_N "checking for xpc/xpc.h... $ECHO_C" >&6; } -if test "${ac_cv_header_xpc_xpc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_xpc_xpc_h" >&5 -echo "${ECHO_T}$ac_cv_header_xpc_xpc_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking xpc/xpc.h usability" >&5 -echo $ECHO_N "checking xpc/xpc.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking xpc/xpc.h presence" >&5 -echo $ECHO_N "checking xpc/xpc.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: xpc/xpc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: xpc/xpc.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: xpc/xpc.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: xpc/xpc.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: xpc/xpc.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: xpc/xpc.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: xpc/xpc.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: xpc/xpc.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: xpc/xpc.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for xpc/xpc.h" >&5 -echo $ECHO_N "checking for xpc/xpc.h... $ECHO_C" >&6; } -if test "${ac_cv_header_xpc_xpc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_xpc_xpc_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_xpc_xpc_h" >&5 -echo "${ECHO_T}$ac_cv_header_xpc_xpc_h" >&6; } - -fi -if test $ac_cv_header_xpc_xpc_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_XPC 1 -_ACEOF - - INSTALLXPC="install-xpc" -fi - - - ;; -esac - - -cat >>confdefs.h <<_ACEOF -#define CUPS_DEFAULT_PRINTOPERATOR_AUTH "$CUPS_DEFAULT_PRINTOPERATOR_AUTH" -_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 driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" - ;; - - core) - BUILDDIRS="data locale" - ;; - - *) - { { echo "$as_me:$LINENO: error: Bad build component \"$COMPONENT\" specified!" >&5 -echo "$as_me: error: Bad build component \"$COMPONENT\" specified!" >&2;} - { (exit 1); exit 1; }; } - ;; -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 - IRIX*) - libdir="$exec_prefix/lib32" - ;; - Linux*) - if test -d /usr/lib64; 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" - ;; - - IRIX*) - # IRIX - INITDIR="/etc" - RCSTART="60" - RCSTOP="25" - ;; - - 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 -case "$uname" in - Darwin*) - # Darwin (Mac OS X) - CUPS_STATEDIR="$CUPS_SERVERROOT" - ;; - *) - # All others - CUPS_STATEDIR="$localstatedir/run/cups" - ;; -esac -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" - ;; - IRIX) - # SGI IRIX - mandir="/usr/share/catman/u_man" - AMANDIR="/usr/share/catman/a_man" - PMANDIR="/usr/share/catman/p_man" - ;; - *) - # All others - mandir="/usr/man" - AMANDIR="/usr/man" - PMANDIR="/usr/man" - ;; - esac -else - AMANDIR="$mandir" - PMANDIR="$mandir" -fi - - - - -case "$uname" in - IRIX*) - # SGI IRIX - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=1m - MAN8DIR=1 - ;; - SunOS* | HP-UX*) - # Solaris and HP-UX - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=1m - MAN8DIR=1m - ;; - Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and Mac 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 - - - - - - - - - - -# Check whether --enable-32bit was given. -if test "${enable_32bit+set}" = set; then - enableval=$enable_32bit; -fi - - -INSTALL32="" -LIB32CUPS="" -LIB32CUPSIMAGE="" -LIB32DIR="" -UNINSTALL32="" - - - - - - - -# Check whether --enable-64bit was given. -if test "${enable_64bit+set}" = set; then - enableval=$enable_64bit; -fi - - -INSTALL64="" -LIB64CUPS="" -LIB64CUPSIMAGE="" -LIB64DIR="" -UNINSTALL64="" - - - - - - - -case "$uname" in - HP-UX*) - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - INSTALL32="install32bit" - LIB32CUPS="32bit/libcups.so.2" - LIB32CUPSIMAGE="32bit/libcupsimage.so.2" - LIB32DIR="$exec_prefix/lib" - if test -d /usr/lib/hpux32; then - LIB32DIR="${LIB32DIR}/hpux32" - fi - UNINSTALL32="uninstall32bit" - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - INSTALL64="install64bit" - LIB64CUPS="64bit/libcups.so.2" - LIB64CUPSIMAGE="64bit/libcupsimage.so.2" - LIB64DIR="$exec_prefix/lib" - if test -d /usr/lib/hpux64; then - LIB64DIR="${LIB64DIR}/hpux64" - fi - UNINSTALL64="uninstall64bit" - fi - ;; - - IRIX) - if test "x$enable_32bit" = xyes; then - INSTALL32="install32bit" - LIB32CUPS="32bit/libcups.so.2" - LIB32CUPSIMAGE="32bit/libcupsimage.so.2" - LIB32DIR="$prefix/lib32" - UNINSTALL32="uninstall32bit" - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - INSTALL64="install64bit" - LIB64CUPS="64bit/libcups.so.2" - LIB64CUPSIMAGE="64bit/libcupsimage.so.2" - LIB64DIR="$prefix/lib64" - UNINSTALL64="uninstall64bit" - fi - ;; - - Linux*) - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - INSTALL32="install32bit" - LIB32CUPS="32bit/libcups.so.2" - LIB32CUPSIMAGE="32bit/libcupsimage.so.2" - LIB32DIR="$exec_prefix/lib" - if test -d /usr/lib32; then - LIB32DIR="${LIB32DIR}32" - fi - UNINSTALL32="uninstall32bit" - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - INSTALL64="install64bit" - LIB64CUPS="64bit/libcups.so.2" - LIB64CUPSIMAGE="64bit/libcupsimage.so.2" - LIB64DIR="$exec_prefix/lib" - if test -d /usr/lib64; then - LIB64DIR="${LIB64DIR}64" - fi - UNINSTALL64="uninstall64bit" - fi - ;; - - SunOS*) - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - INSTALL32="install32bit" - LIB32CUPS="32bit/libcups.so.2" - LIB32CUPSIMAGE="32bit/libcupsimage.so.2" - LIB32DIR="$exec_prefix/lib/32" - UNINSTALL32="uninstall32bit" - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - INSTALL64="install64bit" - LIB64CUPS="64bit/libcups.so.2" - LIB64CUPSIMAGE="64bit/libcupsimage.so.2" - LIB64DIR="$exec_prefix/lib/64" - UNINSTALL64="uninstall64bit" - fi - ;; -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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver_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" - LIBCUPSDRIVER="libcupsdriver.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" - LIBCUPSDRIVER="libcupsdriver.a" - LIBCUPSIMAGE="libcupsimage.a" - LIBCUPSMIME="libcupsmime.a" - LIBCUPSPPDC="libcupsppdc.a" - DSO=":" - DSOXX=":" -fi - -# 32-bit and 64-bit libraries need variations of the standard -# DSOFLAGS... -DSO32FLAGS="$DSOFLAGS" -DSO64FLAGS="$DSOFLAGS" - - - - - - - - - - - - - - - -if test x$enable_shared = xno; then - LINKCUPS="../cups/lib$cupsbase.a" - LINKCUPSIMAGE="../filter/libcupsimage.a" - - EXTLINKCUPS="-lcups" - EXTLINKCUPSDRIVER="-lcupsdriver" - EXTLINKCUPSIMAGE="-lcupsimage" -else - if test $uname = AIX; then - LINKCUPS="-l${cupsbase}_s" - LINKCUPSIMAGE="-lcupsimage_s" - - EXTLINKCUPS="-lcups_s" - EXTLINKCUPSDRIVER="-lcupsdriver_s" - EXTLINKCUPSIMAGE="-lcupsimage_s" - else - LINKCUPS="-l${cupsbase}" - LINKCUPSIMAGE="-lcupsimage" - - EXTLINKCUPS="-lcups" - EXTLINKCUPSDRIVER="-lcupsdriver" - 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="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(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" - DSO32FLAGS="-Wl,+s,+b,$LIB32DIR $DSO32FLAGS" - DSO64FLAGS="-Wl,+s,+b,$LIB64DIR $DSO64FLAGS" - ;; - *) - DSOFLAGS="+s +b $libdir $DSOFLAGS" - DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS" - DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS" - ;; - 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" - DSO32FLAGS="-R$LIB32DIR $DSO32FLAGS" - DSO64FLAGS="-R$LIB64DIR $DSO64FLAGS" - LDFLAGS="$LDFLAGS -R$libdir" - EXPORT_LDFLAGS="-R$libdir" - fi - ;; - *BSD*) - # *BSD... - if test $exec_prefix != /usr; then - DSOFLAGS="-Wl,-R$libdir $DSOFLAGS" - DSO32FLAGS="-Wl,-R$LIB32DIR $DSO32FLAGS" - DSO64FLAGS="-Wl,-R$LIB64DIR $DSO64FLAGS" - LDFLAGS="$LDFLAGS -Wl,-R$libdir" - EXPORT_LDFLAGS="-Wl,-R$libdir" - fi - ;; - IRIX | Linux | GNU) - # IRIX, Linux, and HURD... - if test $exec_prefix != /usr; then - DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS" - DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS" - DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS" - LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir" - EXPORT_LDFLAGS="-Wl,-rpath,$libdir" - fi - ;; - esac -else - DSOLIBS="" - IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(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 32-bit programs by default - LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`" - else - LDARCHFLAGS="$ARCHFLAGS" - fi -else - LDARCHFLAGS="$with_ldarchflags" -fi - - - - - -# Check whether --with-arch32flags was given. -if test "${with_arch32flags+set}" = set; then - withval=$with_arch32flags; -fi - -ARCH32FLAGS="" - - - -# Check whether --with-arch64flags was given. -if test "${with_arch64flags+set}" = set; then - withval=$with_arch64flags; -fi - -ARCH64FLAGS="" - - -# Check whether --enable-relro was given. -if test "${enable_relro+set}" = set; then - enableval=$enable_relro; -fi - - -CXXLIBS="${CXXLIBS:=}" - - -PIEFLAGS="" - - -RELROFLAGS="" - - -PHPOPTIONS="" - - -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. - { echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5 -echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; } - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - OPTIM="$OPTIM -fstack-protector" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$OLDCFLAGS" - - # 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. - { echo "$as_me:$LINENO: checking if GCC supports -fPIE" >&5 -echo $ECHO_N "checking if GCC supports -fPIE... $ECHO_C" >&6; } - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fPIE" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - case "$CC" in - *clang) - PIEFLAGS="-fPIE -Wl,-pie" - ;; - *) - PIEFLAGS="-fPIE -pie" - ;; - esac - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$OLDCFLAGS" - - 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" - PHPOPTIONS="-Wno-shadow" - else - { echo "$as_me:$LINENO: checking if GCC supports -Wno-tautological-compare" >&5 -echo $ECHO_N "checking if GCC supports -Wno-tautological-compare... $ECHO_C" >&6; } - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wno-tautological-compare" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - OPTIM="$OPTIM -Wno-tautological-compare" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}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" - ;; - - HP-UX*) - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - if test -z "$with_arch32flags"; then - ARCH32FLAGS="-milp32" - else - ARCH32FLAGS="$with_arch32flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="-mlp64" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - if test -z "$with_arch64flags"; then - ARCH64FLAGS="-mlp64" - else - ARCH64FLAGS="$with_arch64flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="-milp32" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - fi - ;; - - IRIX) - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - if test -z "$with_arch32flags"; then - ARCH32FLAGS="-n32 -mips3" - else - ARCH32FLAGS="$with_arch32flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="-64 -mips4" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - if test -z "$with_arch64flags"; then - ARCH64FLAGS="-64 -mips4" - else - ARCH64FLAGS="$with_arch64flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="-n32 -mips3" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - fi - ;; - - 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 - - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - if test -z "$with_arch32flags"; then - ARCH32FLAGS="-m32" - else - ARCH32FLAGS="$with_arch32flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="-m64" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - if test -z "$with_arch64flags"; then - ARCH64FLAGS="-m64" - else - ARCH64FLAGS="$with_arch64flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="-m32" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - fi - ;; - - SunOS*) - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - if test -z "$with_arch32flags"; then - ARCH32FLAGS="-m32" - else - ARCH32FLAGS="$with_arch32flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="-m64" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - if test -z "$with_arch64flags"; then - ARCH64FLAGS="-m64" - else - ARCH64FLAGS="$with_arch64flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="-m32" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - 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 - - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - if test -z "$with_arch32flags"; then - ARCH32FLAGS="+DD32" - else - ARCH32FLAGS="$with_arch32flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="+DD64" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - if test -z "$with_arch64flags"; then - ARCH64FLAGS="+DD64" - else - ARCH64FLAGS="$with_arch64flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="+DD32" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - fi - ;; - IRIX) - if test -z "$OPTIM"; then - if test "x$with_optim" = x; then - OPTIM="-O2" - else - OPTIM="$with_optim $OPTIM" - fi - fi - - if test "x$with_optim" = x; then - OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM" - fi - - if test "x$enable_32bit" = xyes; then - # Build 32-bit libraries, 64-bit base... - if test -z "$with_arch32flags"; then - ARCH32FLAGS="-n32 -mips3" - else - ARCH32FLAGS="$with_arch32flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="-64 -mips4" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - fi - - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries, 32-bit base... - if test -z "$with_arch64flags"; then - ARCH64FLAGS="-64 -mips4" - else - ARCH64FLAGS="$with_arch64flags" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="-n32 -mips3" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - 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 - - if test "x$enable_32bit" = xyes; then - # Compiling on a Solaris system, build 64-bit - # binaries with separate 32-bit libraries... - ARCH32FLAGS="-xarch=generic" - - if test "x$with_optim" = x; then - # Suppress all of Sun's questionable - # warning messages, and default to - # 64-bit compiles of everything else... - OPTIM="-w $OPTIM" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch64flags"; then - ARCHFLAGS="-xarch=generic64" - else - ARCHFLAGS="$with_arch64flags" - fi - fi - else - if test "x$enable_64bit" = xyes; then - # Build 64-bit libraries... - ARCH64FLAGS="-xarch=generic64" - fi - - if test "x$with_optim" = x; then - # Suppress all of Sun's questionable - # warning messages, and default to - # 32-bit compiles of everything else... - OPTIM="-w $OPTIM" - fi - - if test -z "$with_archflags"; then - if test -z "$with_arch32flags"; then - ARCHFLAGS="-xarch=generic" - else - ARCHFLAGS="$with_arch32flags" - fi - fi - 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 - - - - -# Check whether --enable-image was given. -if test "${enable_image+set}" = set; then - enableval=$enable_image; -fi - - -DEFAULT_IMAGEFILTERS="#" -IMGFILTERS="" -if test "x$enable_image" != xno; then - { echo "$as_me:$LINENO: checking whether to build image filters" >&5 -echo $ECHO_N "checking whether to build image filters... $ECHO_C" >&6; } - if test "x$enable_image" = xyes -o $uname != Darwin; then - IMGFILTERS="imagetops imagetoraster" - DEFAULT_IMAGEFILTERS="" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi -fi - - - - -# Check whether --enable-jpeg was given. -if test "${enable_jpeg+set}" = set; then - enableval=$enable_jpeg; -fi - -# Check whether --enable-png was given. -if test "${enable_png+set}" = set; then - enableval=$enable_png; -fi - -# Check whether --enable-tiff was given. -if test "${enable_tiff+set}" = set; then - enableval=$enable_tiff; -fi - - -LIBJPEG="" -LIBPNG="" -LIBTIFF="" -LIBZ="" - - - - - - -{ echo "$as_me:$LINENO: checking for library containing pow" >&5 -echo $ECHO_N "checking for library containing pow... $ECHO_C" >&6; } -if test "${ac_cv_search_pow+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 pow (); -int -main () -{ -return pow (); - ; - 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_pow=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_pow+set}" = set; then - break -fi -done -if test "${ac_cv_search_pow+set}" = set; then - : -else - ac_cv_search_pow=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5 -echo "${ECHO_T}$ac_cv_search_pow" >&6; } -ac_res=$ac_cv_search_pow -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - -SAVELIBS="$LIBS" - -if test x$enable_jpeg != xno; then - if test "${ac_cv_header_jpeglib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jpeglib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } - -fi -if test $ac_cv_header_jpeglib_h = yes; then - { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } -if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 jpeg_destroy_decompress (); -int -main () -{ -return jpeg_destroy_decompress (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_destroy_decompress=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_destroy_decompress=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } -if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBJPEG 1 -_ACEOF - - LIBJPEG="-ljpeg" - LIBS="$LIBS -ljpeg" -fi - -fi - - -else - { echo "$as_me:$LINENO: JPEG support disabled with --disable-jpeg." >&5 -echo "$as_me: JPEG support disabled with --disable-jpeg." >&6;} -fi - -if test "${ac_cv_header_zlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_zlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } - -fi -if test $ac_cv_header_zlib_h = yes; then - { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5 -echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; } -if test "${ac_cv_lib_z_gzgets+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_z_gzgets=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_z_gzgets=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5 -echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; } -if test $ac_cv_lib_z_gzgets = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBZ 1 -_ACEOF - - LIBZ="-lz" - LIBS="$LIBS -lz" -fi - -fi - - - -if test x$enable_png != xno; then - if test "${ac_cv_header_png_h+set}" = set; then - { echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_png_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - -fi -if test $ac_cv_header_png_h = yes; then - { echo "$as_me:$LINENO: checking for png_create_read_struct in -lpng" >&5 -echo $ECHO_N "checking for png_create_read_struct in -lpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png_png_create_read_struct+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 png_create_read_struct (); -int -main () -{ -return png_create_read_struct (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_create_read_struct=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_create_read_struct=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_create_read_struct" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_create_read_struct" >&6; } -if test $ac_cv_lib_png_png_create_read_struct = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPNG 1 -_ACEOF - - LIBPNG="-lpng" -fi - -fi - - -else - { echo "$as_me:$LINENO: PNG support disabled with --disable-png." >&5 -echo "$as_me: PNG support disabled with --disable-png." >&6;} -fi - -if test x$enable_tiff != xno; then - if test "${ac_cv_header_tiff_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tiff.h" >&5 -echo $ECHO_N "checking for tiff.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tiff_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tiff_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiff_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking tiff.h usability" >&5 -echo $ECHO_N "checking tiff.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking tiff.h presence" >&5 -echo $ECHO_N "checking tiff.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: tiff.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tiff.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tiff.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tiff.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tiff.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tiff.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tiff.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tiff.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tiff.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tiff.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tiff.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tiff.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tiff.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiff.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tiff.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tiff.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for tiff.h" >&5 -echo $ECHO_N "checking for tiff.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tiff_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tiff_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tiff_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiff_h" >&6; } - -fi -if test $ac_cv_header_tiff_h = yes; then - { echo "$as_me:$LINENO: checking for TIFFReadScanline in -ltiff" >&5 -echo $ECHO_N "checking for TIFFReadScanline in -ltiff... $ECHO_C" >&6; } -if test "${ac_cv_lib_tiff_TIFFReadScanline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 TIFFReadScanline (); -int -main () -{ -return TIFFReadScanline (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_tiff_TIFFReadScanline=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tiff_TIFFReadScanline=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadScanline" >&6; } -if test $ac_cv_lib_tiff_TIFFReadScanline = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBTIFF 1 -_ACEOF - - LIBTIFF="-ltiff" -fi - -fi - - -else - { echo "$as_me:$LINENO: TIFF support disabled with --disable-tiff." >&5 -echo "$as_me: TIFF support disabled with --disable-tiff." >&6;} -fi - -LIBS="$SAVELIBS" - -EXPORT_LIBJPEG="$LIBJPEG" -EXPORT_LIBPNG="$LIBPNG" -EXPORT_LIBTIFF="$LIBTIFF" -EXPORT_LIBZ="$LIBZ" - - - - - - -if test "${ac_cv_header_stdlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for stdlib.h" >&5 -echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_stdlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking stdlib.h usability" >&5 -echo $ECHO_N "checking stdlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking stdlib.h presence" >&5 -echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: stdlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: stdlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: stdlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: stdlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: stdlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: stdlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: stdlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: stdlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: stdlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: stdlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: stdlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: stdlib.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for stdlib.h" >&5 -echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_stdlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_stdlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6; } - -fi -if test $ac_cv_header_stdlib_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - - - - - -if test "${ac_cv_header_resolv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for resolv.h" >&5 -echo $ECHO_N "checking for resolv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_resolv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5 -echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking resolv.h usability" >&5 -echo $ECHO_N "checking resolv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking resolv.h presence" >&5 -echo $ECHO_N "checking resolv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: resolv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: resolv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: resolv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: resolv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: resolv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: resolv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: resolv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: resolv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: resolv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: resolv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: resolv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: resolv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: resolv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: resolv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: resolv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: resolv.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for resolv.h" >&5 -echo $ECHO_N "checking for resolv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_resolv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_resolv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5 -echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; } - -fi -if test $ac_cv_header_resolv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_RESOLV_H 1 -_ACEOF - -fi - - -{ echo "$as_me:$LINENO: checking for library containing socket" >&5 -echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; } -if test "${ac_cv_search_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_socket=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_socket+set}" = set; then - break -fi -done -if test "${ac_cv_search_socket+set}" = set; then - : -else - ac_cv_search_socket=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 -echo "${ECHO_T}$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 - -{ echo "$as_me:$LINENO: checking for library containing gethostbyaddr" >&5 -echo $ECHO_N "checking for library containing gethostbyaddr... $ECHO_C" >&6; } -if test "${ac_cv_search_gethostbyaddr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_gethostbyaddr=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_gethostbyaddr+set}" = set; then - break -fi -done -if test "${ac_cv_search_gethostbyaddr+set}" = set; then - : -else - ac_cv_search_gethostbyaddr=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyaddr" >&5 -echo "${ECHO_T}$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 - -{ echo "$as_me:$LINENO: checking for library containing getifaddrs" >&5 -echo $ECHO_N "checking for library containing getifaddrs... $ECHO_C" >&6; } -if test "${ac_cv_search_getifaddrs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_getifaddrs=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_getifaddrs+set}" = set; then - break -fi -done -if test "${ac_cv_search_getifaddrs+set}" = set; then - : -else - ac_cv_search_getifaddrs=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_getifaddrs" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETIFADDRS 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for library containing hstrerror" >&5 -echo $ECHO_N "checking for library containing hstrerror... $ECHO_C" >&6; } -if test "${ac_cv_search_hstrerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_hstrerror=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_hstrerror+set}" = set; then - break -fi -done -if test "${ac_cv_search_hstrerror+set}" = set; then - : -else - ac_cv_search_hstrerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_hstrerror" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_HSTRERROR 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for library containing rresvport_af" >&5 -echo $ECHO_N "checking for library containing rresvport_af... $ECHO_C" >&6; } -if test "${ac_cv_search_rresvport_af+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_rresvport_af=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_rresvport_af+set}" = set; then - break -fi -done -if test "${ac_cv_search_rresvport_af+set}" = set; then - : -else - ac_cv_search_rresvport_af=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_rresvport_af" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_RRESVPORT_AF 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for library containing __res_init" >&5 -echo $ECHO_N "checking for library containing __res_init... $ECHO_C" >&6; } -if test "${ac_cv_search___res_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search___res_init=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search___res_init+set}" = set; then - break -fi -done -if test "${ac_cv_search___res_init+set}" = set; then - : -else - ac_cv_search___res_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search___res_init" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_RES_INIT 1 -_ACEOF - -else - { echo "$as_me:$LINENO: checking for library containing res_9_init" >&5 -echo $ECHO_N "checking for library containing res_9_init... $ECHO_C" >&6; } -if test "${ac_cv_search_res_9_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_res_9_init=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_res_9_init+set}" = set; then - break -fi -done -if test "${ac_cv_search_res_9_init+set}" = set; then - : -else - ac_cv_search_res_9_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_res_9_init" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_RES_INIT 1 -_ACEOF - -else - { echo "$as_me:$LINENO: checking for library containing res_init" >&5 -echo $ECHO_N "checking for library containing res_init... $ECHO_C" >&6; } -if test "${ac_cv_search_res_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_res_init=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_res_init+set}" = set; then - break -fi -done -if test "${ac_cv_search_res_init+set}" = set; then - : -else - ac_cv_search_res_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_res_init" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_RES_INIT 1 -_ACEOF - -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 - { echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5 -echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6; } -if test "${ac_cv_search_getaddrinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_getaddrinfo=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_getaddrinfo+set}" = set; then - break -fi -done -if test "${ac_cv_search_getaddrinfo+set}" = set; then - : -else - ac_cv_search_getaddrinfo=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETADDRINFO 1 -_ACEOF - -fi - - { echo "$as_me:$LINENO: checking for library containing getnameinfo" >&5 -echo $ECHO_N "checking for library containing getnameinfo... $ECHO_C" >&6; } -if test "${ac_cv_search_getnameinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_getnameinfo=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_getnameinfo+set}" = set; then - break -fi -done -if test "${ac_cv_search_getnameinfo+set}" = set; then - : -else - ac_cv_search_getnameinfo=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_getnameinfo" >&5 -echo "${ECHO_T}$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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETNAMEINFO 1 -_ACEOF - -fi - -fi - -{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5 -echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; } -if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -int -main () -{ -static struct sockaddr ac_aggr; -if (ac_aggr.sa_len) -return 0; - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_sa_len=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -int -main () -{ -static struct sockaddr ac_aggr; -if (sizeof ac_aggr.sa_len) -return 0; - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_sa_len=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_sockaddr_sa_len=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 -{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5 -echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; } - -if test "${ac_cv_header_sys_sockio_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/sockio.h" >&5 -echo $ECHO_N "checking for sys/sockio.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_sockio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sockio_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_sockio_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/sockio.h usability" >&5 -echo $ECHO_N "checking sys/sockio.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/sockio.h presence" >&5 -echo $ECHO_N "checking sys/sockio.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/sockio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/sockio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/sockio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/sockio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/sockio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/sockio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/sockio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/sockio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/sockio.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/sockio.h" >&5 -echo $ECHO_N "checking for sys/sockio.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_sockio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_sockio_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sockio_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_sockio_h" >&6; } - -fi -if test $ac_cv_header_sys_sockio_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_SOCKIO_H 1 -_ACEOF - -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 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_APPLETALK_AT_PROTO_H 1 -_ACEOF - -fi - -done - - - - -{ echo "$as_me:$LINENO: checking for poll" >&5 -echo $ECHO_N "checking for poll... $ECHO_C" >&6; } -if test "${ac_cv_func_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define poll to an innocuous variant, in case declares poll. - For example, HP-UX 11i declares gettimeofday. */ -#define poll innocuous_poll - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char poll (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef poll - -/* 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 poll (); -/* 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_poll || defined __stub___poll -choke me -#endif - -int -main () -{ -return poll (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_poll=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_poll=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_poll" >&5 -echo "${ECHO_T}$ac_cv_func_poll" >&6; } -if test $ac_cv_func_poll = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_POLL 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for epoll_create" >&5 -echo $ECHO_N "checking for epoll_create... $ECHO_C" >&6; } -if test "${ac_cv_func_epoll_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define epoll_create to an innocuous variant, in case declares epoll_create. - For example, HP-UX 11i declares gettimeofday. */ -#define epoll_create innocuous_epoll_create - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char epoll_create (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef epoll_create - -/* 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 epoll_create (); -/* 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_epoll_create || defined __stub___epoll_create -choke me -#endif - -int -main () -{ -return epoll_create (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_epoll_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_epoll_create=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_epoll_create" >&5 -echo "${ECHO_T}$ac_cv_func_epoll_create" >&6; } -if test $ac_cv_func_epoll_create = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EPOLL 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for kqueue" >&5 -echo $ECHO_N "checking for kqueue... $ECHO_C" >&6; } -if test "${ac_cv_func_kqueue+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define kqueue to an innocuous variant, in case declares kqueue. - For example, HP-UX 11i declares gettimeofday. */ -#define kqueue innocuous_kqueue - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char kqueue (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef kqueue - -/* 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 kqueue (); -/* 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_kqueue || defined __stub___kqueue -choke me -#endif - -int -main () -{ -return kqueue (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_kqueue=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_kqueue=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_kqueue" >&5 -echo "${ECHO_T}$ac_cv_func_kqueue" >&6; } -if test $ac_cv_func_kqueue = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_KQUEUE 1 -_ACEOF + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="-mlp64" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + fi -fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + if test -z "$with_arch64flags"; then + ARCH64FLAGS="-mlp64" + else + ARCH64FLAGS="$with_arch64flags" + fi + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="-milp32" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + fi + ;; + IRIX) + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + if test -z "$with_arch32flags"; then + ARCH32FLAGS="-n32 -mips3" + else + ARCH32FLAGS="$with_arch32flags" + fi + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="-64 -mips4" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + fi -# Check whether --enable-slp was given. -if test "${enable_slp+set}" = set; then - enableval=$enable_slp; -fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + if test -z "$with_arch64flags"; then + ARCH64FLAGS="-64 -mips4" + else + ARCH64FLAGS="$with_arch64flags" + fi + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="-n32 -mips3" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + fi + ;; -# Check whether --with-openslp-libs was given. -if test "${with_openslp_libs+set}" = set; then - withval=$with_openslp_libs; LDFLAGS="-L$withval $LDFLAGS" - DSOFLAGS="-L$withval $DSOFLAGS" -fi + 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 + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + if test -z "$with_arch32flags"; then + ARCH32FLAGS="-m32" + else + ARCH32FLAGS="$with_arch32flags" + fi -# Check whether --with-openslp-includes was given. -if test "${with_openslp_includes+set}" = set; then - withval=$with_openslp_includes; CFLAGS="-I$withval $CFLAGS" - CPPFLAGS="-I$withval $CPPFLAGS" -fi + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="-m64" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + if test -z "$with_arch64flags"; then + ARCH64FLAGS="-m64" + else + ARCH64FLAGS="$with_arch64flags" + fi -LIBSLP="" + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="-m32" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + fi + ;; -if test x$enable_slp != xno; then - if test "${ac_cv_header_slp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for slp.h" >&5 -echo $ECHO_N "checking for slp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_slp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_slp_h" >&5 -echo "${ECHO_T}$ac_cv_header_slp_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking slp.h usability" >&5 -echo $ECHO_N "checking slp.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + SunOS*) + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + if test -z "$with_arch32flags"; then + ARCH32FLAGS="-m32" + else + ARCH32FLAGS="$with_arch32flags" + fi - ac_header_compiler=no -fi + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="-m64" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + if test -z "$with_arch64flags"; then + ARCH64FLAGS="-m64" + else + ARCH64FLAGS="$with_arch64flags" + fi -# Is the header present? -{ echo "$as_me:$LINENO: checking slp.h presence" >&5 -echo $ECHO_N "checking slp.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="-m32" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + fi + ;; + esac else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi + # 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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + CFLAGS="-Ae $CFLAGS" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: slp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: slp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: slp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: slp.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: slp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: slp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: slp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: slp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: slp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: slp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: slp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: slp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: slp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: slp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: slp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: slp.h: in the future, the compiler will take precedence" >&2;} + if test $PICFLAG = 1; then + OPTIM="+z $OPTIM" + fi - ;; -esac -{ echo "$as_me:$LINENO: checking for slp.h" >&5 -echo $ECHO_N "checking for slp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_slp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_slp_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_slp_h" >&5 -echo "${ECHO_T}$ac_cv_header_slp_h" >&6; } - -fi -if test $ac_cv_header_slp_h = yes; then - { echo "$as_me:$LINENO: checking for SLPOpen in -lslp" >&5 -echo $ECHO_N "checking for SLPOpen in -lslp... $ECHO_C" >&6; } -if test "${ac_cv_lib_slp_SLPOpen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lslp $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + if test -z "$with_arch32flags"; then + ARCH32FLAGS="+DD32" + else + ARCH32FLAGS="$with_arch32flags" + fi -/* 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 SLPOpen (); -int -main () -{ -return SLPOpen (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_slp_SLPOpen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="+DD64" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + fi - ac_cv_lib_slp_SLPOpen=no -fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + if test -z "$with_arch64flags"; then + ARCH64FLAGS="+DD64" + else + ARCH64FLAGS="$with_arch64flags" + fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_slp_SLPOpen" >&5 -echo "${ECHO_T}$ac_cv_lib_slp_SLPOpen" >&6; } -if test $ac_cv_lib_slp_SLPOpen = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBSLP 1 -_ACEOF + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="+DD32" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + fi + ;; + IRIX) + if test -z "$OPTIM"; then + if test "x$with_optim" = x; then + OPTIM="-O2" + else + OPTIM="$with_optim $OPTIM" + fi + fi - LIBSLP="-lslp" -fi + if test "x$with_optim" = x; then + OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM" + fi -fi + if test "x$enable_32bit" = xyes; then + # Build 32-bit libraries, 64-bit base... + if test -z "$with_arch32flags"; then + ARCH32FLAGS="-n32 -mips3" + else + ARCH32FLAGS="$with_arch32flags" + fi + + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="-64 -mips4" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + fi + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries, 32-bit base... + if test -z "$with_arch64flags"; then + ARCH64FLAGS="-64 -mips4" + else + ARCH64FLAGS="$with_arch64flags" + fi -fi + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="-n32 -mips3" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + 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 + if test "x$enable_32bit" = xyes; then + # Compiling on a Solaris system, build 64-bit + # binaries with separate 32-bit libraries... + ARCH32FLAGS="-xarch=generic" + if test "x$with_optim" = x; then + # Suppress all of Sun's questionable + # warning messages, and default to + # 64-bit compiles of everything else... + OPTIM="-w $OPTIM" + fi + if test -z "$with_archflags"; then + if test -z "$with_arch64flags"; then + ARCHFLAGS="-xarch=generic64" + else + ARCHFLAGS="$with_arch64flags" + fi + fi + else + if test "x$enable_64bit" = xyes; then + # Build 64-bit libraries... + ARCH64FLAGS="-xarch=generic64" + fi + if test "x$with_optim" = x; then + # Suppress all of Sun's questionable + # warning messages, and default to + # 32-bit compiles of everything else... + OPTIM="-w $OPTIM" + fi -# Check whether --enable-gssapi was given. -if test "${enable_gssapi+set}" = set; then - enableval=$enable_gssapi; + if test -z "$with_archflags"; then + if test -z "$with_arch32flags"; then + ARCHFLAGS="-xarch=generic" + else + ARCHFLAGS="$with_arch32flags" + fi + fi + 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" -LIBGSSAPI="" + # 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" + ;; -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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_KRB5CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + 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 -fi -KRB5CONFIG=$ac_cv_path_KRB5CONFIG -if test -n "$KRB5CONFIG"; then - { echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5 -echo "${ECHO_T}$KRB5CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - if test "x$KRB5CONFIG" != x; then - case "$uname" in - Darwin) - # Mac OS X weak-links to the Kerberos framework... - LIBGSSAPI="-weak_framework Kerberos" - { echo "$as_me:$LINENO: checking for GSS framework" >&5 -echo $ECHO_N "checking for GSS framework... $ECHO_C" >&6; } - if test -d /System/Library/Frameworks/GSS.framework; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - LIBGSSAPI="$LIBGSSAPI -weak_framework GSS" - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - ;; - SunOS*) - # Solaris has a non-standard krb5-config, don't use it! - { echo "$as_me:$LINENO: checking for gss_display_status in -lgss" >&5 -echo $ECHO_N "checking for gss_display_status in -lgss... $ECHO_C" >&6; } -if test "${ac_cv_lib_gss_gss_display_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgss $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_gss_gss_display_status=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gss_gss_display_status=no +# Check whether --enable-image was given. +if test "${enable_image+set}" = set; then : + enableval=$enable_image; +fi + + +DEFAULT_IMAGEFILTERS="#" +IMGFILTERS="" +if test "x$enable_image" != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build image filters" >&5 +$as_echo_n "checking whether to build image filters... " >&6; } + if test "x$enable_image" = xyes -o $uname != Darwin; then + IMGFILTERS="imagetops imagetoraster" + DEFAULT_IMAGEFILTERS="" + { $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 fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + + + +# Check whether --enable-jpeg was given. +if test "${enable_jpeg+set}" = set; then : + enableval=$enable_jpeg; fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_display_status" >&5 -echo "${ECHO_T}$ac_cv_lib_gss_gss_display_status" >&6; } -if test $ac_cv_lib_gss_gss_display_status = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI 1 -_ACEOF +# Check whether --enable-png was given. +if test "${enable_png+set}" = set; then : + enableval=$enable_png; +fi - CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" - CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" - LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" +# Check whether --enable-tiff was given. +if test "${enable_tiff+set}" = set; then : + enableval=$enable_tiff; fi - ;; - *) - # Other platforms just ask for GSSAPI - CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" - CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" - LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" - ;; - esac -cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI 1 -_ACEOF +LIBJPEG="" +LIBPNG="" +LIBTIFF="" +LIBZ="" - else - # Check for vendor-specific implementations... - case "$uname" in - HP-UX*) - { echo "$as_me:$LINENO: checking for gss_display_status in -lgss" >&5 -echo $ECHO_N "checking for gss_display_status in -lgss... $ECHO_C" >&6; } -if test "${ac_cv_lib_gss_gss_display_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5 +$as_echo_n "checking for library containing pow... " >&6; } +if ${ac_cv_search_pow+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgss $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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. @@ -16374,70 +7627,61 @@ #ifdef __cplusplus extern "C" #endif -char gss_display_status (); +char pow (); int main () { -return gss_display_status (); +return pow (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_gss_gss_display_status=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_pow=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_pow+:} false; then : + break +fi +done +if ${ac_cv_search_pow+:} false; then : - ac_cv_lib_gss_gss_display_status=no +else + ac_cv_search_pow=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pow" >&5 +$as_echo "$ac_cv_search_pow" >&6; } +ac_res=$ac_cv_search_pow +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_display_status" >&5 -echo "${ECHO_T}$ac_cv_lib_gss_gss_display_status" >&6; } -if test $ac_cv_lib_gss_gss_display_status = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI 1 -_ACEOF - LIBGSSAPI="-lgss -lgssapi_krb5" -fi +SAVELIBS="$LIBS" - ;; - SunOS*) - { echo "$as_me:$LINENO: checking for gss_display_status in -lgss" >&5 -echo $ECHO_N "checking for gss_display_status in -lgss... $ECHO_C" >&6; } -if test "${ac_cv_lib_gss_gss_display_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test x$enable_jpeg != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" +if test "x$ac_cv_header_jpeglib_h" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5 +$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } +if ${ac_cv_lib_jpeg_jpeg_destroy_decompress+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgss $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-ljpeg $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16446,828 +7690,294 @@ #ifdef __cplusplus extern "C" #endif -char gss_display_status (); +char jpeg_destroy_decompress (); int main () { -return gss_display_status (); +return jpeg_destroy_decompress (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_gss_gss_display_status=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_jpeg_jpeg_destroy_decompress=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gss_gss_display_status=no + ac_cv_lib_jpeg_jpeg_destroy_decompress=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_display_status" >&5 -echo "${ECHO_T}$ac_cv_lib_gss_gss_display_status" >&6; } -if test $ac_cv_lib_gss_gss_display_status = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI 1 -_ACEOF - - LIBGSSAPI="-lgss" -fi - - ;; - esac - fi - - if test "x$LIBGSSAPI" != x; then - if test "${ac_cv_header_krb5_h+set}" = set; then - { echo "$as_me:$LINENO: checking for krb5.h" >&5 -echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6; } -if test "${ac_cv_header_krb5_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_krb5_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking krb5.h usability" >&5 -echo $ECHO_N "checking krb5.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking krb5.h presence" >&5 -echo $ECHO_N "checking krb5.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: krb5.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: krb5.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: krb5.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: krb5.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: krb5.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: krb5.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: krb5.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: krb5.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for krb5.h" >&5 -echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6; } -if test "${ac_cv_header_krb5_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_krb5_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_krb5_h" >&6; } - -fi -if test $ac_cv_header_krb5_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_KRB5_H 1 -_ACEOF - -fi - - - if test -d /System/Library/Frameworks/GSS.framework; then - gssdir="/System/Library/Frameworks/GSS.framework" - { echo "$as_me:$LINENO: checking for GSS/gssapi.h presence" >&5 -echo $ECHO_N "checking for GSS/gssapi.h presence... $ECHO_C" >&6; } - if test -f $gssdir/Headers/gssapi.h; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSS_GSSAPI_H 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - { echo "$as_me:$LINENO: checking for GSS/gssapi_generic.h presence" >&5 -echo $ECHO_N "checking for GSS/gssapi_generic.h presence... $ECHO_C" >&6; } - if test -f $gssdir/Headers/gssapi_generic.h; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI_GENERIC_H 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - { echo "$as_me:$LINENO: checking for GSS/gssapi_krb5.h presence" >&5 -echo $ECHO_N "checking for GSS/gssapi_krb5.h presence... $ECHO_C" >&6; } - if test -f $gssdir/Headers/gssapi_krb5.h; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI_KRB5_H 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - { echo "$as_me:$LINENO: checking for GSS/gssapi_spi.h presence" >&5 -echo $ECHO_N "checking for GSS/gssapi_spi.h presence... $ECHO_C" >&6; } - if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking for GSS/gssapi_spi.h usability" >&5 -echo $ECHO_N "checking for GSS/gssapi_spi.h usability... $ECHO_C" >&6; } - if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSS_GSSAPI_SPI_H 1 -_ACEOF - - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test $uversion -ge 110; then - # Broken public headers in 10.7... - { { echo "$as_me:$LINENO: error: Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS." >&5 -echo "$as_me: error: Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS." >&2;} - { (exit 1); exit 1; }; } - fi - fi - else - if test "${ac_cv_header_gssapi_h+set}" = set; then - { echo "$as_me:$LINENO: checking for gssapi.h" >&5 -echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking gssapi.h usability" >&5 -echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking gssapi.h presence" >&5 -echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gssapi.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gssapi.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for gssapi.h" >&5 -echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_gssapi_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 +$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } +if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = xyes; then : + $as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h + LIBJPEG="-ljpeg" + LIBS="$LIBS -ljpeg" fi -if test $ac_cv_header_gssapi_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI_H 1 -_ACEOF fi - if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then - { echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5 -echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: JPEG support disabled with --disable-jpeg." >&5 +$as_echo "$as_me: JPEG support disabled with --disable-jpeg." >&6;} fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; } + +INSTALL_GZIP="" +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 - # Is the header compilable? -{ echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5 -echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include + +/* 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 -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_gzgets=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_header_compiler=no + LIBZ="-lz" + LIBS="$LIBS -lz" + if test "x$GZIP" != x; then + INSTALL_GZIP="-z" + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5 -echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;} +if test x$enable_png != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" +if test "x$ac_cv_header_png_h" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in -lpng" >&5 +$as_echo_n "checking for png_create_read_struct in -lpng... " >&6; } +if ${ac_cv_lib_png_png_create_read_struct+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac -{ echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5 -echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +/* 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 png_create_read_struct (); +int +main () +{ +return png_create_read_struct (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_create_read_struct=yes else - ac_cv_header_gssapi_gssapi_h=$ac_header_preproc + ac_cv_lib_png_png_create_read_struct=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5 +$as_echo "$ac_cv_lib_png_png_create_read_struct" >&6; } +if test "x$ac_cv_lib_png_png_create_read_struct" = xyes; then : + $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h + LIBPNG="-lpng" fi -if test $ac_cv_header_gssapi_gssapi_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI_GSSAPI_H 1 -_ACEOF fi - if test "${ac_cv_header_gssapi_gssapi_generic_h+set}" = set; then - { echo "$as_me:$LINENO: checking for gssapi/gssapi_generic.h" >&5 -echo $ECHO_N "checking for gssapi/gssapi_generic.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_gssapi_generic_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_generic_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_generic_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking gssapi/gssapi_generic.h usability" >&5 -echo $ECHO_N "checking gssapi/gssapi_generic.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + { $as_echo "$as_me:${as_lineno-$LINENO}: PNG support disabled with --disable-png." >&5 +$as_echo "$as_me: PNG support disabled with --disable-png." >&6;} fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking gssapi/gssapi_generic.h presence" >&5 -echo $ECHO_N "checking gssapi/gssapi_generic.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if test x$enable_tiff != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "tiff.h" "ac_cv_header_tiff_h" "$ac_includes_default" +if test "x$ac_cv_header_tiff_h" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadScanline in -ltiff" >&5 +$as_echo_n "checking for TIFFReadScanline in -ltiff... " >&6; } +if ${ac_cv_lib_tiff_TIFFReadScanline+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltiff $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* 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 TIFFReadScanline (); +int +main () +{ +return TIFFReadScanline (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tiff_TIFFReadScanline=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_tiff_TIFFReadScanline=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_tiff_TIFFReadScanline" >&5 +$as_echo "$ac_cv_lib_tiff_TIFFReadScanline" >&6; } +if test "x$ac_cv_lib_tiff_TIFFReadScanline" = xyes; then : + $as_echo "#define HAVE_LIBTIFF 1" >>confdefs.h - ac_header_preproc=no + LIBTIFF="-ltiff" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_generic.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gssapi/gssapi_generic.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for gssapi/gssapi_generic.h" >&5 -echo $ECHO_N "checking for gssapi/gssapi_generic.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_gssapi_generic_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_gssapi_gssapi_generic_h=$ac_header_preproc + { $as_echo "$as_me:${as_lineno-$LINENO}: TIFF support disabled with --disable-tiff." >&5 +$as_echo "$as_me: TIFF support disabled with --disable-tiff." >&6;} fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_generic_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_generic_h" >&6; } -fi -if test $ac_cv_header_gssapi_gssapi_generic_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI_GENERIC_H 1 -_ACEOF +LIBS="$SAVELIBS" -fi +EXPORT_LIBJPEG="$LIBJPEG" +EXPORT_LIBPNG="$LIBPNG" +EXPORT_LIBTIFF="$LIBTIFF" +EXPORT_LIBZ="$LIBZ" - if test "${ac_cv_header_gssapi_gssapi_krb5_h+set}" = set; then - { echo "$as_me:$LINENO: checking for gssapi/gssapi_krb5.h" >&5 -echo $ECHO_N "checking for gssapi/gssapi_krb5.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_gssapi_krb5_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_krb5_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking gssapi/gssapi_krb5.h usability" >&5 -echo $ECHO_N "checking gssapi/gssapi_krb5.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking gssapi/gssapi_krb5.h presence" >&5 -echo $ECHO_N "checking gssapi/gssapi_krb5.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi +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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gssapi/gssapi_krb5.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gssapi/gssapi_krb5.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for gssapi/gssapi_krb5.h" >&5 -echo $ECHO_N "checking for gssapi/gssapi_krb5.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gssapi_gssapi_krb5_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_gssapi_gssapi_krb5_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_krb5_h" >&6; } -fi -if test $ac_cv_header_gssapi_gssapi_krb5_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSSAPI_KRB5_H 1 -_ACEOF -fi +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 +fi - SAVELIBS="$LIBS" - LIBS="$LIBS $LIBGSSAPI" - { echo "$as_me:$LINENO: checking for __ApplePrivate_gss_acquire_cred_ex_f" >&5 -echo $ECHO_N "checking for __ApplePrivate_gss_acquire_cred_ex_f... $ECHO_C" >&6; } -if test "${ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define __ApplePrivate_gss_acquire_cred_ex_f to an innocuous variant, in case declares __ApplePrivate_gss_acquire_cred_ex_f. - For example, HP-UX 11i declares gettimeofday. */ -#define __ApplePrivate_gss_acquire_cred_ex_f innocuous___ApplePrivate_gss_acquire_cred_ex_f - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char __ApplePrivate_gss_acquire_cred_ex_f (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include +/* 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" -#undef __ApplePrivate_gss_acquire_cred_ex_f +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 @@ -17275,401 +7985,337 @@ #ifdef __cplusplus extern "C" #endif -char __ApplePrivate_gss_acquire_cred_ex_f (); -/* 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___ApplePrivate_gss_acquire_cred_ex_f || defined __stub_____ApplePrivate_gss_acquire_cred_ex_f -choke me -#endif - +char gethostbyaddr (); int main () { -return __ApplePrivate_gss_acquire_cred_ex_f (); +return gethostbyaddr (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f=no +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_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_gethostbyaddr+:} false; then : + break fi -{ echo "$as_me:$LINENO: result: $ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f" >&5 -echo "${ECHO_T}$ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f" >&6; } -if test $ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSS_ACQUIRE_CRED_EX_F 1 -_ACEOF +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 - { echo "$as_me:$LINENO: checking for GSS_C_NT_HOSTBASED_SERVICE" >&5 -echo $ECHO_N "checking for GSS_C_NT_HOSTBASED_SERVICE... $ECHO_C" >&6; } - if test x$ac_cv_header_gssapi_gssapi_h = xyes; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $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. */ - #include + +/* 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 () { - gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; +return getifaddrs (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1 -_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 : - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $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. */ - #include + +/* 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 () { - gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; +return hstrerror (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1 -_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 : - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $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. */ - #include + +/* 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 () { - gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; +return rresvport_af (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - LIBS="$SAVELIBS" - fi +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 - - -# Check whether --with-gssservicename was given. -if test "${with_gssservicename+set}" = set; then - withval=$with_gssservicename; default_gssservicename="$withval" -else - default_gssservicename="default" +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 : - -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-ldap was given. -if test "${enable_ldap+set}" = set; then - enableval=$enable_ldap; + ac_cv_search_rresvport_af=no fi - - -# Check whether --with-ldap-libs was given. -if test "${with_ldap_libs+set}" = set; then - withval=$with_ldap_libs; LDFLAGS="-L$withval $LDFLAGS" - DSOFLAGS="-L$withval $DSOFLAGS" +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 - -# Check whether --with-ldap-includes was given. -if test "${with_ldap_includes+set}" = set; then - withval=$with_ldap_includes; CFLAGS="-I$withval $CFLAGS" - CPPFLAGS="-I$withval $CPPFLAGS" fi - -LIBLDAP="" - -if test x$enable_ldap != xno; then - if test "${ac_cv_header_ldap_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ldap.h" >&5 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_h" >&6; } +{ $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 - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ldap.h usability" >&5 -echo $ECHO_N "checking ldap.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +/* 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 : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ldap.h presence" >&5 -echo $ECHO_N "checking ldap.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + 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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +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. */ -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ldap.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ldap.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ldap.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ldap.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ldap.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ldap.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ldap.h: in the future, the compiler will take precedence" >&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 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 : - ;; -esac -{ echo "$as_me:$LINENO: checking for ldap.h" >&5 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_ldap_h=$ac_header_preproc + ac_cv_search_res_9_init=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_h" >&6; } - +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -if test $ac_cv_header_ldap_h = yes; then +{ $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 - { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 -echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; } -if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $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. @@ -17678,69 +8324,63 @@ #ifdef __cplusplus extern "C" #endif -char ldap_initialize (); +char res_init (); int main () { -return ldap_initialize (); +return res_init (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ldap_ldap_initialize=yes +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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_cv_lib_ldap_ldap_initialize=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; } -if test $ac_cv_lib_ldap_ldap_initialize = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_OPENLDAP 1 -_ACEOF +fi - LIBLDAP="-lldap" - { echo "$as_me:$LINENO: checking for ldap_start_tls in -lldap" >&5 -echo $ECHO_N "checking for ldap_start_tls in -lldap... $ECHO_C" >&6; } -if test "${ac_cv_lib_ldap_ldap_start_tls+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +# 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_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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. @@ -17749,67 +8389,55 @@ #ifdef __cplusplus extern "C" #endif -char ldap_start_tls (); +char getaddrinfo (); int main () { -return ldap_start_tls (); +return getaddrinfo (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ldap_ldap_start_tls=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ldap_ldap_start_tls=no +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 : -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +else + ac_cv_search_getaddrinfo=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_start_tls" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_start_tls" >&6; } -if test $ac_cv_lib_ldap_ldap_start_tls = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP_SSL 1 -_ACEOF +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 - { echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5 -echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; } -if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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. @@ -17818,194 +8446,175 @@ #ifdef __cplusplus extern "C" #endif -char ldap_init (); +char getnameinfo (); int main () { -return ldap_init (); +return getnameinfo (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ldap_ldap_init=yes +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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_cv_lib_ldap_ldap_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_init" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_init" >&6; } -if test $ac_cv_lib_ldap_ldap_init = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_MOZILLA_LDAP 1 -_ACEOF +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 : - LIBLDAP="-lldap" - { echo "$as_me:$LINENO: checking for ldap_ssl.h" >&5 -echo $ECHO_N "checking for ldap_ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_ssl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + 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" -#include + cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_DOMAINSOCKET "$CUPS_DEFAULT_DOMAINSOCKET" _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_ldap_ssl_h=yes + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_cv_header_ldap_ssl_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +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 -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_ssl_h" >&6; } -if test $ac_cv_header_ldap_ssl_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP_SSL_H 1 -_ACEOF + +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 - { echo "$as_me:$LINENO: checking for ldapssl_init in -lldap" >&5 -echo $ECHO_N "checking for ldapssl_init in -lldap... $ECHO_C" >&6; } -if test "${ac_cv_lib_ldap_ldapssl_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 ldapssl_init (); -int -main () -{ -return ldapssl_init (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ldap_ldapssl_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ldap_ldapssl_init=no +# Check whether --enable-slp was given. +if test "${enable_slp+set}" = set; then : + enableval=$enable_slp; fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldapssl_init" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldapssl_init" >&6; } -if test $ac_cv_lib_ldap_ldapssl_init = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP_SSL 1 -_ACEOF +# Check whether --with-openslp-libs was given. +if test "${with_openslp_libs+set}" = set; then : + withval=$with_openslp_libs; LDFLAGS="-L$withval $LDFLAGS" + DSOFLAGS="-L$withval $DSOFLAGS" fi + +# Check whether --with-openslp-includes was given. +if test "${with_openslp_includes+set}" = set; then : + withval=$with_openslp_includes; CFLAGS="-I$withval $CFLAGS" + CPPFLAGS="-I$withval $CPPFLAGS" fi -fi +LIBSLP="" - { echo "$as_me:$LINENO: checking for ldap_set_rebind_proc in -lldap" >&5 -echo $ECHO_N "checking for ldap_set_rebind_proc in -lldap... $ECHO_C" >&6; } -if test "${ac_cv_lib_ldap_ldap_set_rebind_proc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test x$enable_slp != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "slp.h" "ac_cv_header_slp_h" "$ac_includes_default" +if test "x$ac_cv_header_slp_h" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLPOpen in -lslp" >&5 +$as_echo_n "checking for SLPOpen in -lslp... " >&6; } +if ${ac_cv_lib_slp_SLPOpen+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lslp $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -18014,55 +8623,32 @@ #ifdef __cplusplus extern "C" #endif -char ldap_set_rebind_proc (); +char SLPOpen (); int main () { -return ldap_set_rebind_proc (); +return SLPOpen (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ldap_ldap_set_rebind_proc=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_slp_SLPOpen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ldap_ldap_set_rebind_proc=no + ac_cv_lib_slp_SLPOpen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_rebind_proc" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_rebind_proc" >&6; } -if test $ac_cv_lib_ldap_ldap_set_rebind_proc = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LDAP_REBIND_PROC 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_slp_SLPOpen" >&5 +$as_echo "$ac_cv_lib_slp_SLPOpen" >&6; } +if test "x$ac_cv_lib_slp_SLPOpen" = xyes; then : + $as_echo "#define HAVE_LIBSLP 1" >>confdefs.h + LIBSLP="-lslp" fi - fi @@ -18073,1517 +8659,913 @@ -# Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then - enableval=$enable_threads; +# Check whether --enable-gssapi was given. +if test "${enable_gssapi+set}" = set; then : + enableval=$enable_gssapi; fi -have_pthread=no -PTHREAD_FLAGS="" +LIBGSSAPI="" -if test "x$enable_threads" != xno; then - if test "${ac_cv_header_pthread_h+set}" = set; then - { echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } + +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 - # Is the header compilable? -{ echo "$as_me:$LINENO: checking pthread.h usability" >&5 -echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + 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 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + { $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 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking pthread.h presence" >&5 -echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "x$KRB5CONFIG" != x; then + case "$uname" in + Darwin) + # Mac 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. */ -#include + +/* 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_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gss_gss_display_status=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 : - ac_header_preproc=no +$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h + + CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" + LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + ;; + *) + # Other platforms just ask for GSSAPI + CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" + LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" + ;; + esac -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} +$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h - ;; -esac -{ echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + 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_cv_header_pthread_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgss $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if test $ac_cv_header_pthread_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_H 1 +/* 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 - if test x$ac_cv_header_pthread_h = xyes; then - for flag in -lpthreads -lpthread -pthread; do - { echo "$as_me:$LINENO: checking for pthread_create using $flag" >&5 -echo $ECHO_N "checking for pthread_create using $flag... $ECHO_C" >&6; } - SAVELIBS="$LIBS" - LIBS="$flag $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ;; + 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. */ -#include + +/* 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 () { -pthread_create(0, 0, 0, 0); +return gss_display_status (); ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - have_pthread=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gss_gss_display_status=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - LIBS="$SAVELIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $have_pthread" >&5 -echo "${ECHO_T}$have_pthread" >&6; } - if test $have_pthread = yes; then - PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT" + 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 - # Solaris requires -D_POSIX_PTHREAD_SEMANTICS to - # be POSIX-compliant... :( - if test $uname = SunOS; then - PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS" + { $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_krb5.h presence" >&5 +$as_echo_n "checking for GSS/gssapi_krb5.h presence... " >&6; } + if test -f $gssdir/Headers/gssapi_krb5.h; then + $as_echo "#define HAVE_GSSAPI_KRB5_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; then + # Broken public headers in 10.7... + as_fn_error $? "Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS." "$LINENO" 5 fi - break fi - done - 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 -# Check whether --enable-ssl was given. -if test "${enable_ssl+set}" = set; then - enableval=$enable_ssl; -fi + ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_gssapi_generic_h" = xyes; then : + $as_echo "#define HAVE_GSSAPI_GENERIC_H 1" >>confdefs.h -# 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; + ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_krb5.h" "ac_cv_header_gssapi_gssapi_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_gssapi_gssapi_krb5_h" = xyes; then : + $as_echo "#define HAVE_GSSAPI_KRB5_H 1" >>confdefs.h + 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 + 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 -# 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 + { $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 -if test x$enable_ssl != xno; then - if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then - if test $uname = Darwin; then - if test "${ac_cv_header_Security_SecureTransport_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecureTransport.h" >&5 -echo $ECHO_N "checking for Security/SecureTransport.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecureTransport_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecureTransport_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecureTransport_h" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecureTransport.h usability" >&5 -echo $ECHO_N "checking Security/SecureTransport.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $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. */ -$ac_includes_default -#include + #include +int +main () +{ + gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; + ; + return 0; +} _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h - ac_header_compiler=no + { $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 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecureTransport.h presence" >&5 -echo $ECHO_N "checking Security/SecureTransport.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + #include +int +main () +{ + gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h - ac_header_preproc=no + { $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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + LIBS="$SAVELIBS" + fi +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransport.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecureTransport.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecureTransport.h" >&5 -echo $ECHO_N "checking for Security/SecureTransport.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecureTransport_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-gssservicename was given. +if test "${with_gssservicename+set}" = set; then : + withval=$with_gssservicename; default_gssservicename="$withval" else - ac_cv_header_Security_SecureTransport_h=$ac_header_preproc + default_gssservicename="default" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecureTransport_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecureTransport_h" >&6; } + +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 -if test $ac_cv_header_Security_SecureTransport_h = yes; then - have_ssl=1 - cat >>confdefs.h <<\_ACEOF -#define HAVE_SSL 1 +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_GSSSERVICENAME "$CUPS_DEFAULT_GSSSERVICENAME" _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_CDSASSL 1 -_ACEOF - if test "${ac_cv_header_Security_SecureTransportPriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecureTransportPriv.h" >&5 -echo $ECHO_N "checking for Security/SecureTransportPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecureTransportPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecureTransportPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecureTransportPriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecureTransportPriv.h usability" >&5 -echo $ECHO_N "checking Security/SecureTransportPriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +# Check whether --enable-ldap was given. +if test "${enable_ldap+set}" = set; then : + enableval=$enable_ldap; fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecureTransportPriv.h presence" >&5 -echo $ECHO_N "checking Security/SecureTransportPriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +# Check whether --with-ldap-libs was given. +if test "${with_ldap_libs+set}" = set; then : + withval=$with_ldap_libs; LDFLAGS="-L$withval $LDFLAGS" + DSOFLAGS="-L$withval $DSOFLAGS" fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecureTransportPriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecureTransportPriv.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecureTransportPriv.h" >&5 -echo $ECHO_N "checking for Security/SecureTransportPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecureTransportPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_SecureTransportPriv_h=$ac_header_preproc +# Check whether --with-ldap-includes was given. +if test "${with_ldap_includes+set}" = set; then : + withval=$with_ldap_includes; CFLAGS="-I$withval $CFLAGS" + CPPFLAGS="-I$withval $CPPFLAGS" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecureTransportPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecureTransportPriv_h" >&6; } -fi -if test $ac_cv_header_Security_SecureTransportPriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECURETRANSPORTPRIV_H 1 -_ACEOF -fi +LIBLDAP="" +if test x$enable_ldap != xno; then + ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" +if test "x$ac_cv_header_ldap_h" = xyes; then : - if test "${ac_cv_header_Security_SecCertificate_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecCertificate.h" >&5 -echo $ECHO_N "checking for Security/SecCertificate.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecCertificate_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecCertificate_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecCertificate_h" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5 +$as_echo_n "checking for ldap_initialize in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_initialize+:} false; then : + $as_echo_n "(cached) " >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecCertificate.h usability" >&5 -echo $ECHO_N "checking Security/SecCertificate.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lldap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecCertificate.h presence" >&5 -echo $ECHO_N "checking Security/SecCertificate.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +/* 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 ldap_initialize (); +int +main () +{ +return ldap_initialize (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ldap_ldap_initialize=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + ac_cv_lib_ldap_ldap_initialize=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_ldap_ldap_initialize" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; } +if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then : + $as_echo "#define HAVE_LDAP 1" >>confdefs.h -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + $as_echo "#define HAVE_OPENLDAP 1" >>confdefs.h -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecCertificate.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecCertificate.h: in the future, the compiler will take precedence" >&2;} + LIBLDAP="-lldap" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_start_tls in -lldap" >&5 +$as_echo_n "checking for ldap_start_tls in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_start_tls+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lldap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecCertificate.h" >&5 -echo $ECHO_N "checking for Security/SecCertificate.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecCertificate_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +/* 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 ldap_start_tls (); +int +main () +{ +return ldap_start_tls (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ldap_ldap_start_tls=yes else - ac_cv_header_Security_SecCertificate_h=$ac_header_preproc + ac_cv_lib_ldap_ldap_start_tls=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecCertificate_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecCertificate_h" >&6; } - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if test $ac_cv_header_Security_SecCertificate_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECCERTIFICATE_H 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_start_tls" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_start_tls" >&6; } +if test "x$ac_cv_lib_ldap_ldap_start_tls" = xyes; then : + $as_echo "#define HAVE_LDAP_SSL 1" >>confdefs.h fi - - if test "${ac_cv_header_Security_SecItem_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecItem.h" >&5 -echo $ECHO_N "checking for Security/SecItem.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecItem_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecItem_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecItem_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecItem.h usability" >&5 -echo $ECHO_N "checking Security/SecItem.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_init in -lldap" >&5 +$as_echo_n "checking for ldap_init in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lldap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include + +/* 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 ldap_init (); +int +main () +{ +return ldap_init (); + ; + return 0; +} _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ldap_ldap_init=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_lib_ldap_ldap_init=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_ldap_ldap_init" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_init" >&6; } +if test "x$ac_cv_lib_ldap_ldap_init" = xyes; then : + $as_echo "#define HAVE_LDAP 1" >>confdefs.h -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + $as_echo "#define HAVE_MOZILLA_LDAP 1" >>confdefs.h -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecItem.h presence" >&5 -echo $ECHO_N "checking Security/SecItem.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + LIBLDAP="-lldap" + ac_fn_c_check_header_compile "$LINENO" "ldap_ssl.h" "ac_cv_header_ldap_ssl_h" "#include +" +if test "x$ac_cv_header_ldap_ssl_h" = xyes; then : + $as_echo "#define HAVE_LDAP_SSL_H 1" >>confdefs.h - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecItem.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecItem.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecItem.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecItem.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecItem.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecItem.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecItem.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecItem.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecItem.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldapssl_init in -lldap" >&5 +$as_echo_n "checking for ldapssl_init in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldapssl_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lldap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecItem.h" >&5 -echo $ECHO_N "checking for Security/SecItem.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecItem_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +/* 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 ldapssl_init (); +int +main () +{ +return ldapssl_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ldap_ldapssl_init=yes else - ac_cv_header_Security_SecItem_h=$ac_header_preproc + ac_cv_lib_ldap_ldapssl_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecItem_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecItem_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldapssl_init" >&5 +$as_echo "$ac_cv_lib_ldap_ldapssl_init" >&6; } +if test "x$ac_cv_lib_ldap_ldapssl_init" = xyes; then : + $as_echo "#define HAVE_LDAP_SSL 1" >>confdefs.h fi -if test $ac_cv_header_Security_SecItem_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECITEM_H 1 -_ACEOF fi - { echo "$as_me:$LINENO: checking for Security/SecItemPriv.h" >&5 -echo $ECHO_N "checking for Security/SecItemPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecItemPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_rebind_proc in -lldap" >&5 +$as_echo_n "checking for ldap_set_rebind_proc in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_set_rebind_proc+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lldap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +/* 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 ldap_set_rebind_proc (); +int +main () +{ +return ldap_set_rebind_proc (); + ; + return 0; +} _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_Security_SecItemPriv_h=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ldap_ldap_set_rebind_proc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_Security_SecItemPriv_h=no + ac_cv_lib_ldap_ldap_set_rebind_proc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecItemPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecItemPriv_h" >&6; } -if test $ac_cv_header_Security_SecItemPriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECITEMPRIV_H 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_rebind_proc" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_set_rebind_proc" >&6; } +if test "x$ac_cv_lib_ldap_ldap_set_rebind_proc" = xyes; then : + $as_echo "#define HAVE_LDAP_REBIND_PROC 1" >>confdefs.h fi - if test "${ac_cv_header_Security_SecPolicy_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecPolicy.h" >&5 -echo $ECHO_N "checking for Security/SecPolicy.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecPolicy_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecPolicy_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecPolicy_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecPolicy.h usability" >&5 -echo $ECHO_N "checking Security/SecPolicy.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecPolicy.h presence" >&5 -echo $ECHO_N "checking Security/SecPolicy.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicy.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecPolicy.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecPolicy.h" >&5 -echo $ECHO_N "checking for Security/SecPolicy.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecPolicy_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_SecPolicy_h=$ac_header_preproc +# Check whether --enable-threads was given. +if test "${enable_threads+set}" = set; then : + enableval=$enable_threads; fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecPolicy_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecPolicy_h" >&6; } -fi -if test $ac_cv_header_Security_SecPolicy_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECPOLICY_H 1 -_ACEOF -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 - if test "${ac_cv_header_Security_SecPolicyPriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecPolicyPriv.h" >&5 -echo $ECHO_N "checking for Security/SecPolicyPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecPolicyPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecPolicyPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecPolicyPriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecPolicyPriv.h usability" >&5 -echo $ECHO_N "checking Security/SecPolicyPriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecPolicyPriv.h presence" >&5 -echo $ECHO_N "checking Security/SecPolicyPriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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 +#include +int +main () +{ +pthread_create(0, 0, 0, 0); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if ac_fn_c_try_link "$LINENO"; then : + have_pthread=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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; } - ac_header_preproc=no + 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 -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecPolicyPriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecPolicyPriv.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecPolicyPriv.h" >&5 -echo $ECHO_N "checking for Security/SecPolicyPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecPolicyPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_SecPolicyPriv_h=$ac_header_preproc + + +# Check whether --enable-ssl was given. +if test "${enable_ssl+set}" = set; then : + enableval=$enable_ssl; fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecPolicyPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecPolicyPriv_h" >&6; } +# 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 -if test $ac_cv_header_Security_SecPolicyPriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECPOLICYPRIV_H 1 -_ACEOF +# Check whether --enable-openssl was given. +if test "${enable_openssl+set}" = set; then : + enableval=$enable_openssl; fi - if test "${ac_cv_header_Security_SecBasePriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecBasePriv.h" >&5 -echo $ECHO_N "checking for Security/SecBasePriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecBasePriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# 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 -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecBasePriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecBasePriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecBasePriv.h usability" >&5 -echo $ECHO_N "checking Security/SecBasePriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + +# 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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecBasePriv.h presence" >&5 -echo $ECHO_N "checking Security/SecBasePriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +SSLFLAGS="" +SSLLIBS="" +have_ssl=0 - ac_header_preproc=no -fi +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 : -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } + have_ssl=1 + $as_echo "#define HAVE_SSL 1" >>confdefs.h -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecBasePriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecBasePriv.h: in the future, the compiler will take precedence" >&2;} + $as_echo "#define HAVE_CDSASSL 1" >>confdefs.h - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecBasePriv.h" >&5 -echo $ECHO_N "checking for Security/SecBasePriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecBasePriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_SecBasePriv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecBasePriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecBasePriv_h" >&6; } -fi -if test $ac_cv_header_Security_SecBasePriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECBASEPRIV_H 1 -_ACEOF + 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 - if test "${ac_cv_header_Security_SecIdentitySearchPriv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Security/SecIdentitySearchPriv.h" >&5 -echo $ECHO_N "checking for Security/SecIdentitySearchPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecIdentitySearchPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecIdentitySearchPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecIdentitySearchPriv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking Security/SecIdentitySearchPriv.h usability" >&5 -echo $ECHO_N "checking Security/SecIdentitySearchPriv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking Security/SecIdentitySearchPriv.h presence" >&5 -echo $ECHO_N "checking Security/SecIdentitySearchPriv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Security/SecIdentitySearchPriv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Security/SecIdentitySearchPriv.h: in the future, the compiler will take precedence" >&2;} + 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 - ;; -esac -{ echo "$as_me:$LINENO: checking for Security/SecIdentitySearchPriv.h" >&5 -echo $ECHO_N "checking for Security/SecIdentitySearchPriv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_Security_SecIdentitySearchPriv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_Security_SecIdentitySearchPriv_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Security_SecIdentitySearchPriv_h" >&5 -echo "${ECHO_T}$ac_cv_header_Security_SecIdentitySearchPriv_h" >&6; } -fi -if test $ac_cv_header_Security_SecIdentitySearchPriv_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECIDENTITYSEARCHPRIV_H 1 -_ACEOF + + 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 - SAVELIBS="$LIBS" - LIBS="$LIBS -framework Security" - { echo "$as_me:$LINENO: checking for SSLSetProtocolVersionMax" >&5 -echo $ECHO_N "checking for SSLSetProtocolVersionMax... $ECHO_C" >&6; } -if test "${ac_cv_func_SSLSetProtocolVersionMax+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define SSLSetProtocolVersionMax to an innocuous variant, in case declares SSLSetProtocolVersionMax. - For example, HP-UX 11i declares gettimeofday. */ -#define SSLSetProtocolVersionMax innocuous_SSLSetProtocolVersionMax +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char SSLSetProtocolVersionMax (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + 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 -#undef SSLSetProtocolVersionMax +fi -/* 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 SSLSetProtocolVersionMax (); -/* 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_SSLSetProtocolVersionMax || defined __stub___SSLSetProtocolVersionMax -choke me -#endif -int -main () -{ -return SSLSetProtocolVersionMax (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_SSLSetProtocolVersionMax=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + 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 - ac_cv_func_SSLSetProtocolVersionMax=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + + + SAVELIBS="$LIBS" + LIBS="$LIBS -framework Security" + ac_fn_c_check_func "$LINENO" "SSLSetProtocolVersionMax" "ac_cv_func_SSLSetProtocolVersionMax" +if test "x$ac_cv_func_SSLSetProtocolVersionMax" = xyes; then : + fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_SSLSetProtocolVersionMax" >&5 -echo "${ECHO_T}$ac_cv_func_SSLSetProtocolVersionMax" >&6; } LIBS="$SAVELIBS" - { echo "$as_me:$LINENO: checking for SecCertificateCopyData" >&5 -echo $ECHO_N "checking for SecCertificateCopyData... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SecCertificateCopyData" >&5 +$as_echo_n "checking for SecCertificateCopyData... " >&6; } if test $uversion -ge 100; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECCERTIFICATECOPYDATA 1 -_ACEOF + $as_echo "#define HAVE_SECCERTIFICATECOPYDATA 1" >>confdefs.h - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { echo "$as_me:$LINENO: checking for SecIdentitySearchCreateWithPolicy" >&5 -echo $ECHO_N "checking for SecIdentitySearchCreateWithPolicy... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SecIdentitySearchCreateWithPolicy" >&5 +$as_echo_n "checking for SecIdentitySearchCreateWithPolicy... " >&6; } if test $uversion -ge 80; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY 1 -_ACEOF + $as_echo "#define HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY 1" >>confdefs.h - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - { echo "$as_me:$LINENO: checking for SecPolicyCreateSSL" >&5 -echo $ECHO_N "checking for SecPolicyCreateSSL... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SecPolicyCreateSSL" >&5 +$as_echo_n "checking for SecPolicyCreateSSL... " >&6; } if test $uversion -ge 110; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SECPOLICYCREATESSL 1 -_ACEOF + $as_echo "#define HAVE_SECPOLICYCREATESSL 1" >>confdefs.h - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi - cat >>confdefs.h <<\_ACEOF -#define HAVE_CSSMERRORSTRING 1 -_ACEOF + $as_echo "#define HAVE_CSSMERRORSTRING 1" >>confdefs.h fi fi @@ -19591,10 +9573,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LIBGNUTLSCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -19606,14 +9588,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -19621,20 +9603,20 @@ fi LIBGNUTLSCONFIG=$ac_cv_path_LIBGNUTLSCONFIG if test -n "$LIBGNUTLSCONFIG"; then - { echo "$as_me:$LINENO: result: $LIBGNUTLSCONFIG" >&5 -echo "${ECHO_T}$LIBGNUTLSCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLSCONFIG" >&5 +$as_echo "$LIBGNUTLSCONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LIBGCRYPTCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -19646,14 +9628,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -19661,11 +9643,11 @@ fi LIBGCRYPTCONFIG=$ac_cv_path_LIBGCRYPTCONFIG if test -n "$LIBGCRYPTCONFIG"; then - { echo "$as_me:$LINENO: result: $LIBGCRYPTCONFIG" >&5 -echo "${ECHO_T}$LIBGCRYPTCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPTCONFIG" >&5 +$as_echo "$LIBGCRYPTCONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -19673,25 +9655,17 @@ have_ssl=1 SSLLIBS=`$PKGCONFIG --libs gnutls` SSLFLAGS=`$PKGCONFIG --cflags gnutls` - cat >>confdefs.h <<\_ACEOF -#define HAVE_SSL 1 -_ACEOF + $as_echo "#define HAVE_SSL 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUTLS 1 -_ACEOF + $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h elif test "x$LIBGNUTLSCONFIG" != x; then have_ssl=1 SSLLIBS=`$LIBGNUTLSCONFIG --libs` SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` - cat >>confdefs.h <<\_ACEOF -#define HAVE_SSL 1 -_ACEOF + $as_echo "#define HAVE_SSL 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUTLS 1 -_ACEOF + $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h fi @@ -19707,152 +9681,24 @@ fi if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then - if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 -echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5 -echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5 -echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 -echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_openssl_ssl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } - -fi -if test $ac_cv_header_openssl_ssl_h = yes; 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" + "-lcrypto" \ + "-lcrypto -lrsaref" \ + "-lcrypto -lRSAglue -lrsaref" do - { echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5 -echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -19870,54 +9716,36 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ssl_SSL_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ssl_SSL_new=no + ac_cv_lib_ssl_SSL_new=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; } -if test $ac_cv_lib_ssl_SSL_new = yes; then +{ $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" - cat >>confdefs.h <<\_ACEOF -#define HAVE_SSL 1 -_ACEOF + $as_echo "#define HAVE_SSL 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF + $as_echo "#define HAVE_LIBSSL 1" >>confdefs.h fi if test "x${SSLLIBS}" != "x"; then + LIBS="$SAVELIBS $SSLLIBS" + 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 : + $as_echo "#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1" >>confdefs.h + +fi + break fi done @@ -19931,15 +9759,13 @@ IPPALIASES="http" if test $have_ssl = 1; then - { echo "$as_me:$LINENO: result: Using SSLLIBS=\"$SSLLIBS\"" >&5 -echo "${ECHO_T} Using SSLLIBS=\"$SSLLIBS\"" >&6; } - { echo "$as_me:$LINENO: result: Using SSLFLAGS=\"$SSLFLAGS\"" >&5 -echo "${ECHO_T} Using SSLFLAGS=\"$SSLFLAGS\"" >&6; } + { $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 - { { echo "$as_me:$LINENO: error: Unable to enable SSL support." >&5 -echo "$as_me: error: Unable to enable SSL support." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Unable to enable SSL support." "$LINENO" 5 fi @@ -19951,15 +9777,14 @@ - # Check whether --enable-pam was given. -if test "${enable_pam+set}" = set; then +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 +if test "${with_pam_module+set}" = set; then : withval=$with_pam_module; fi @@ -19977,19 +9802,14 @@ if test x$enable_pam != xno; then SAVELIBS="$LIBS" - -{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20007,39 +9827,18 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $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 @@ -20048,19 +9847,14 @@ fi - -{ echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; } -if test "${ac_cv_lib_pam_pam_start+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20078,39 +9872,18 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pam_pam_start=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pam_pam_start=no + ac_cv_lib_pam_pam_start=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; } -if test $ac_cv_lib_pam_pam_start = yes; then +{ $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 @@ -20119,18 +9892,14 @@ fi - { echo "$as_me:$LINENO: checking for pam_set_item in -lpam" >&5 -echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6; } -if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20148,57 +9917,30 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pam_pam_set_item=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pam_pam_set_item=no + ac_cv_lib_pam_pam_set_item=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_set_item" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6; } -if test $ac_cv_lib_pam_pam_set_item = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PAM_SET_ITEM 1 -_ACEOF +{ $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 - { echo "$as_me:$LINENO: checking for pam_setcred in -lpam" >&5 -echo $ECHO_N "checking for pam_setcred in -lpam... $ECHO_C" >&6; } -if test "${ac_cv_lib_pam_pam_setcred+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20216,302 +9958,32 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pam_pam_setcred=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pam_pam_setcred=no + ac_cv_lib_pam_pam_setcred=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_setcred" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_setcred" >&6; } -if test $ac_cv_lib_pam_pam_setcred = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PAM_SETCRED 1 -_ACEOF - -fi - - if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 -echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 -echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ $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 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_security_pam_appl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } + 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 - if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5 -echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5 -echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5 -echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5 -echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_pam_pam_appl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; } - -fi -if test $ac_cv_header_pam_pam_appl_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PAM_PAM_APPL_H 1 -_ACEOF + 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 @@ -20578,16 +10050,16 @@ # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then +if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 @@ -20595,11 +10067,7 @@ 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -20618,58 +10086,14 @@ return 0; } _ACEOF - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext CC="$CC -n32" - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32'; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext break done @@ -20677,23 +10101,19 @@ rm -f conftest.$ac_ext fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } +{ $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 - { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -20712,37 +10132,11 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=no; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include @@ -20762,38 +10156,16 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } +{ $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) ;; *) @@ -20802,19 +10174,15 @@ _ACEOF ;; esac -rm -f -r conftest* +rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -20833,37 +10201,11 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=no; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 #include @@ -20883,38 +10225,16 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } +{ $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) ;; *) @@ -20923,7 +10243,7 @@ _ACEOF ;; esac -rm -f -r conftest* +rm -rf conftest* fi fi @@ -20938,156 +10258,48 @@ if test x$ac_cv_sys_file_offset_bits = x64; then LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64" - fi -fi - - -{ echo "$as_me:$LINENO: checking for long long int" >&5 -echo $ECHO_N "checking for long long int... $ECHO_C" >&6; } -if test "${ac_cv_c_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$GCC" = yes; then - ac_cv_c_long_long=yes - else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -long long int i; - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_long_long=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_long_long=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_long_long" >&5 -echo "${ECHO_T}$ac_cv_c_long_long" >&6; } - -if test $ac_cv_c_long_long = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_LONG 1 -_ACEOF - + fi fi -{ echo "$as_me:$LINENO: checking for strtoll" >&5 -echo $ECHO_N "checking for strtoll... $ECHO_C" >&6; } -if test "${ac_cv_func_strtoll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +{ $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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "$GCC" = yes; then + ac_cv_c_long_long=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define strtoll to an innocuous variant, in case declares strtoll. - For example, HP-UX 11i declares gettimeofday. */ -#define strtoll innocuous_strtoll - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strtoll (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef strtoll - -/* 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 strtoll (); -/* 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_strtoll || defined __stub___strtoll -choke me -#endif int main () { -return strtoll (); +long long int i; ; return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_strtoll=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_long_long=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strtoll=no + 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 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strtoll" >&5 -echo "${ECHO_T}$ac_cv_func_strtoll" >&6; } -if test $ac_cv_func_strtoll = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRTOLL 1 -_ACEOF + +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 @@ -21095,20 +10307,20 @@ # Check whether --enable-dnssd was given. -if test "${enable_dnssd+set}" = set; then +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 +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 +if test "${with_dnssd_includes+set}" = set; then : withval=$with_dnssd_includes; CFLAGS="-I$withval $CFLAGS" CPPFLAGS="-I$withval $CPPFLAGS" fi @@ -21118,162 +10330,28 @@ DNSSD_BACKEND="" if test x$enable_dnssd != xno; then - if test "${ac_cv_header_dns_sd_h+set}" = set; then - { echo "$as_me:$LINENO: checking for dns_sd.h" >&5 -echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6; } -if test "${ac_cv_header_dns_sd_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5 -echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking dns_sd.h usability" >&5 -echo $ECHO_N "checking dns_sd.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking dns_sd.h presence" >&5 -echo $ECHO_N "checking dns_sd.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: dns_sd.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: dns_sd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: dns_sd.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: dns_sd.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: dns_sd.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: dns_sd.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: dns_sd.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: dns_sd.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: dns_sd.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: dns_sd.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: dns_sd.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: dns_sd.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for dns_sd.h" >&5 -echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6; } -if test "${ac_cv_header_dns_sd_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_dns_sd_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5 -echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6; } - -fi -if test $ac_cv_header_dns_sd_h = yes; 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... - cat >>confdefs.h <<\_ACEOF -#define HAVE_DNSSD 1 -_ACEOF + $as_echo "#define HAVE_DNSSD 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define HAVE_COREFOUNDATION 1 -_ACEOF + $as_echo "#define HAVE_COREFOUNDATION 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define HAVE_SYSTEMCONFIGURATION 1 -_ACEOF + $as_echo "#define HAVE_SYSTEMCONFIGURATION 1" >>confdefs.h DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" DNSSD_BACKEND="dnssd" ;; *) # All others... - { echo "$as_me:$LINENO: checking for current version of dns_sd library" >&5 -echo $ECHO_N "checking for current version of dns_sd library... $ECHO_C" >&6; } + { $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -21288,39 +10366,17 @@ return 0; } _ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_DNSSD 1 -_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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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" ;; @@ -21338,7 +10394,7 @@ # Check whether --enable-launchd was given. -if test "${enable_launchd+set}" = set; then +if test "${enable_launchd+set}" = set; then : enableval=$enable_launchd; fi @@ -21347,223 +10403,15 @@ LAUNCHDLIBS="" if test x$enable_launchd != xno; then - { echo "$as_me:$LINENO: checking for launch_msg" >&5 -echo $ECHO_N "checking for launch_msg... $ECHO_C" >&6; } -if test "${ac_cv_func_launch_msg+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define launch_msg to an innocuous variant, in case declares launch_msg. - For example, HP-UX 11i declares gettimeofday. */ -#define launch_msg innocuous_launch_msg - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char launch_msg (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef launch_msg - -/* 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 launch_msg (); -/* 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_launch_msg || defined __stub___launch_msg -choke me -#endif - -int -main () -{ -return launch_msg (); - ; - return 0; -} -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_launch_msg=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_launch_msg=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_launch_msg" >&5 -echo "${ECHO_T}$ac_cv_func_launch_msg" >&6; } -if test $ac_cv_func_launch_msg = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LAUNCHD 1 -_ACEOF - -fi - - if test "${ac_cv_header_launch_h+set}" = set; then - { echo "$as_me:$LINENO: checking for launch.h" >&5 -echo $ECHO_N "checking for launch.h... $ECHO_C" >&6; } -if test "${ac_cv_header_launch_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_launch_h" >&5 -echo "${ECHO_T}$ac_cv_header_launch_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking launch.h usability" >&5 -echo $ECHO_N "checking launch.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking launch.h presence" >&5 -echo $ECHO_N "checking launch.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: launch.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: launch.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: launch.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: launch.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: launch.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: launch.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: launch.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: launch.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: launch.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: launch.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: launch.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: launch.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: launch.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: launch.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: launch.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: launch.h: in the future, the compiler will take precedence" >&2;} + 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 - ;; -esac -{ echo "$as_me:$LINENO: checking for launch.h" >&5 -echo $ECHO_N "checking for launch.h... $ECHO_C" >&6; } -if test "${ac_cv_header_launch_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_launch_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_launch_h" >&5 -echo "${ECHO_T}$ac_cv_header_launch_h" >&6; } -fi -if test $ac_cv_header_launch_h = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LAUNCH_H 1 -_ACEOF + 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 @@ -21590,7 +10438,7 @@ # Check whether --with-languages was given. -if test "${with_languages+set}" = set; then +if test "${with_languages+set}" = set; then : withval=$with_languages; case "$withval" in none | no) LANGUAGES="" ;; @@ -21603,7 +10451,7 @@ # Check whether --with-bundledir was given. -if test "${with_bundledir+set}" = set; then +if test "${with_bundledir+set}" = set; then : withval=$with_bundledir; CUPS_BUNDLEDIR="$withval" else if test "x$uname" = xDarwin -a $uversion -ge 100; then @@ -21625,7 +10473,7 @@ # Check whether --with-config_file_perm was given. -if test "${with_config_file_perm+set}" = set; then +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 @@ -21643,7 +10491,7 @@ # Check whether --with-log_file_perm was given. -if test "${with_log_file_perm+set}" = set; then +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" @@ -21657,7 +10505,7 @@ # Check whether --with-fatal_errors was given. -if test "${with_fatal_errors+set}" = set; then +if test "${with_fatal_errors+set}" = set; then : withval=$with_fatal_errors; CUPS_FATAL_ERRORS="$withval" else CUPS_FATAL_ERRORS="config" @@ -21672,7 +10520,7 @@ # Check whether --with-log_level was given. -if test "${with_log_level+set}" = set; then +if test "${with_log_level+set}" = set; then : withval=$with_log_level; CUPS_LOG_LEVEL="$withval" else CUPS_LOG_LEVEL="warn" @@ -21686,7 +10534,7 @@ # Check whether --with-access_log_level was given. -if test "${with_access_log_level+set}" = set; then +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" @@ -21699,7 +10547,7 @@ # Check whether --enable-browsing was given. -if test "${enable_browsing+set}" = set; then +if test "${enable_browsing+set}" = set; then : enableval=$enable_browsing; fi @@ -21720,7 +10568,7 @@ # Check whether --with-local_protocols was given. -if test "${with_local_protocols+set}" = set; then +if test "${with_local_protocols+set}" = set; then : withval=$with_local_protocols; default_local_protocols="$withval" else default_local_protocols="default" @@ -21749,7 +10597,7 @@ # Check whether --with-remote_protocols was given. -if test "${with_remote_protocols+set}" = set; then +if test "${with_remote_protocols+set}" = set; then : withval=$with_remote_protocols; default_remote_protocols="$withval" else default_remote_protocols="default" @@ -21777,7 +10625,7 @@ # Check whether --enable-browse_short was given. -if test "${enable_browse_short+set}" = set; then +if test "${enable_browse_short+set}" = set; then : enableval=$enable_browse_short; fi @@ -21797,7 +10645,7 @@ # Check whether --enable-default_shared was given. -if test "${enable_default_shared+set}" = set; then +if test "${enable_default_shared+set}" = set; then : enableval=$enable_default_shared; fi @@ -21817,7 +10665,7 @@ # Check whether --enable-implicit was given. -if test "${enable_implicit+set}" = set; then +if test "${enable_implicit+set}" = set; then : enableval=$enable_implicit; fi @@ -21837,29 +10685,29 @@ # Check whether --enable-use_network_default was given. -if test "${enable_use_network_default+set}" = set; then +if test "${enable_use_network_default+set}" = set; then : enableval=$enable_use_network_default; fi if test "x$enable_use_network_default" != xno; then - { echo "$as_me:$LINENO: checking whether to use network default printers" >&5 -echo $ECHO_N "checking whether to use network default printers... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use network default printers" >&5 +$as_echo_n "checking whether to use network default printers... " >&6; } if test "x$enable_use_network_default" = xyes -o $uname != Darwin; then CUPS_USE_NETWORK_DEFAULT="Yes" cat >>confdefs.h <<_ACEOF #define CUPS_DEFAULT_USE_NETWORK_DEFAULT 1 _ACEOF - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else CUPS_USE_NETWORK_DEFAULT="No" cat >>confdefs.h <<_ACEOF #define CUPS_DEFAULT_USE_NETWORK_DEFAULT 0 _ACEOF - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else CUPS_USE_NETWORK_DEFAULT="No" @@ -21872,105 +10720,101 @@ # Check whether --with-cups_user was given. -if test "${with_cups_user+set}" = set; then +if test "${with_cups_user+set}" = set; then : withval=$with_cups_user; CUPS_USER="$withval" else - { echo "$as_me:$LINENO: checking for default print user" >&5 -echo $ECHO_N "checking for default print user... $ECHO_C" >&6; } + { $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 - { echo "$as_me:$LINENO: result: $CUPS_USER" >&5 -echo "${ECHO_T}$CUPS_USER" >&6; } + { $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" - { echo "$as_me:$LINENO: result: $user" >&5 -echo "${ECHO_T}$user" >&6; } + { $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" - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi else CUPS_USER="nobody" - { echo "$as_me:$LINENO: result: no password file" >&5 -echo "${ECHO_T}no password file" >&6; } + { $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 - { { echo "$as_me:$LINENO: error: The default user for CUPS cannot be root!" >&5 -echo "$as_me: error: The default user for CUPS cannot be root!" >&2;} - { (exit 1); exit 1; }; } + 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 +if test "${with_cups_group+set}" = set; then : withval=$with_cups_group; CUPS_GROUP="$withval" else - { echo "$as_me:$LINENO: checking for default print group" >&5 -echo $ECHO_N "checking for default print group... $ECHO_C" >&6; } + { $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 - { echo "$as_me:$LINENO: result: $CUPS_GROUP" >&5 -echo "${ECHO_T}$CUPS_GROUP" >&6; } + { $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" - { echo "$as_me:$LINENO: result: $group" >&5 -echo "${ECHO_T}$group" >&6; } + { $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" - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi else CUPS_GROUP="nobody" - { echo "$as_me:$LINENO: result: no group file" >&5 -echo "${ECHO_T}no group file" >&6; } + { $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 - { { echo "$as_me:$LINENO: error: The default group for CUPS cannot be root!" >&5 -echo "$as_me: error: The default group for CUPS cannot be root!" >&2;} - { (exit 1); exit 1; }; } + 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 +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 - { echo "$as_me:$LINENO: checking for default system groups" >&5 -echo $ECHO_N "checking for default system groups... $ECHO_C" >&6; } + { $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" @@ -21986,16 +10830,16 @@ if test "x$CUPS_SYSTEM_GROUPS" = x; then CUPS_SYSTEM_GROUPS="$GROUP_LIST" - { echo "$as_me:$LINENO: result: no groups found" >&5 -echo "${ECHO_T}no groups found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no groups found" >&5 +$as_echo "no groups found" >&6; } else - { echo "$as_me:$LINENO: result: \"$CUPS_SYSTEM_GROUPS\"" >&5 -echo "${ECHO_T}\"$CUPS_SYSTEM_GROUPS\"" >&6; } + { $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" - { echo "$as_me:$LINENO: result: no group file" >&5 -echo "${ECHO_T}no group file" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no group file" >&5 +$as_echo "no group file" >&6; } fi fi fi @@ -22005,9 +10849,7 @@ for group in $CUPS_SYSTEM_GROUPS; do if test "x$CUPS_GROUP" = "x$group"; then - { { echo "$as_me:$LINENO: error: The default system groups cannot contain the default CUPS group!" >&5 -echo "$as_me: error: The default system groups cannot contain the default CUPS group!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "The default system groups cannot contain the default CUPS group!" "$LINENO" 5 fi done @@ -22031,7 +10873,7 @@ # Check whether --with-printcap was given. -if test "${with_printcap+set}" = set; then +if test "${with_printcap+set}" = set; then : withval=$with_printcap; default_printcap="$withval" else default_printcap="default" @@ -22070,7 +10912,7 @@ # Check whether --with-lpdconfigfile was given. -if test "${with_lpdconfigfile+set}" = set; then +if test "${with_lpdconfigfile+set}" = set; then : withval=$with_lpdconfigfile; default_lpdconfigfile="$withval" else default_lpdconfigfile="default" @@ -22105,7 +10947,7 @@ # Check whether --with-smbconfigfile was given. -if test "${with_smbconfigfile+set}" = set; then +if test "${with_smbconfigfile+set}" = set; then : withval=$with_smbconfigfile; default_smbconfigfile="$withval" else default_smbconfigfile="default" @@ -22133,7 +10975,7 @@ # Check whether --with-max-copies was given. -if test "${with_max_copies+set}" = set; then +if test "${with_max_copies+set}" = set; then : withval=$with_max_copies; CUPS_MAX_COPIES="$withval" else CUPS_MAX_COPIES="9999" @@ -22147,7 +10989,7 @@ # Check whether --enable-raw_printing was given. -if test "${enable_raw_printing+set}" = set; then +if test "${enable_raw_printing+set}" = set; then : enableval=$enable_raw_printing; fi @@ -22160,7 +11002,7 @@ # Check whether --with-snmp-address was given. -if test "${with_snmp_address+set}" = set; then +if test "${with_snmp_address+set}" = set; then : withval=$with_snmp_address; if test "x$withval" = x; then CUPS_SNMP_ADDRESS="" else @@ -22177,7 +11019,7 @@ # Check whether --with-snmp-community was given. -if test "${with_snmp_community+set}" = set; then +if test "${with_snmp_community+set}" = set; then : withval=$with_snmp_community; CUPS_SNMP_COMMUNITY="Community $withval" else CUPS_SNMP_COMMUNITY="Community public" @@ -22189,7 +11031,7 @@ # Check whether --with-ipp-port was given. -if test "${with_ipp_port+set}" = set; then +if test "${with_ipp_port+set}" = set; then : withval=$with_ipp_port; DEFAULT_IPP_PORT="$withval" else DEFAULT_IPP_PORT="631" @@ -22203,12 +11045,12 @@ # Check whether --enable-bannertops was given. -if test "${enable_bannertops+set}" = set; then +if test "${enable_bannertops+set}" = set; then : enableval=$enable_bannertops; fi # Check whether --enable-texttops was given. -if test "${enable_texttops+set}" = set; then +if test "${enable_texttops+set}" = set; then : enableval=$enable_texttops; fi @@ -22255,7 +11097,7 @@ # Check whether --enable-webif was given. -if test "${enable_webif+set}" = set; then +if test "${enable_webif+set}" = set; then : enableval=$enable_webif; fi @@ -22289,7 +11131,7 @@ # Check whether --with-pdftops was given. -if test "${with_pdftops+set}" = set; then +if test "${with_pdftops+set}" = set; then : withval=$with_pdftops; fi @@ -22303,10 +11145,10 @@ if test $uname != Darwin; then # Extract the first word of "pdftops", so it can be a program name with args. set dummy pdftops; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CUPS_PDFTOPS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CUPS_PDFTOPS+:} false; then : + $as_echo_n "(cached) " >&6 else case $CUPS_PDFTOPS in [\\/]* | ?:[\\/]*) @@ -22318,14 +11160,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CUPS_PDFTOPS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22333,27 +11175,25 @@ fi CUPS_PDFTOPS=$ac_cv_path_CUPS_PDFTOPS if test -n "$CUPS_PDFTOPS"; then - { echo "$as_me:$LINENO: result: $CUPS_PDFTOPS" >&5 -echo "${ECHO_T}$CUPS_PDFTOPS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_PDFTOPS" >&5 +$as_echo "$CUPS_PDFTOPS" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$CUPS_PDFTOPS" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PDFTOPS 1 -_ACEOF + $as_echo "#define HAVE_PDFTOPS 1" >>confdefs.h PDFTOPS="pdftops" else # Extract the first word of "gs", so it can be a program name with args. set dummy gs; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CUPS_GHOSTSCRIPT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CUPS_GHOSTSCRIPT+:} false; then : + $as_echo_n "(cached) " >&6 else case $CUPS_GHOSTSCRIPT in [\\/]* | ?:[\\/]*) @@ -22365,14 +11205,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CUPS_GHOSTSCRIPT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22380,18 +11220,16 @@ fi CUPS_GHOSTSCRIPT=$ac_cv_path_CUPS_GHOSTSCRIPT if test -n "$CUPS_GHOSTSCRIPT"; then - { echo "$as_me:$LINENO: result: $CUPS_GHOSTSCRIPT" >&5 -echo "${ECHO_T}$CUPS_GHOSTSCRIPT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_GHOSTSCRIPT" >&5 +$as_echo "$CUPS_GHOSTSCRIPT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$CUPS_GHOSTSCRIPT" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GHOSTSCRIPT 1 -_ACEOF + $as_echo "#define HAVE_GHOSTSCRIPT 1" >>confdefs.h PDFTOPS="pdftops" fi @@ -22402,10 +11240,10 @@ xgs) # Extract the first word of "gs", so it can be a program name with args. set dummy gs; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CUPS_GHOSTSCRIPT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CUPS_GHOSTSCRIPT+:} false; then : + $as_echo_n "(cached) " >&6 else case $CUPS_GHOSTSCRIPT in [\\/]* | ?:[\\/]*) @@ -22417,14 +11255,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CUPS_GHOSTSCRIPT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22432,33 +11270,27 @@ fi CUPS_GHOSTSCRIPT=$ac_cv_path_CUPS_GHOSTSCRIPT if test -n "$CUPS_GHOSTSCRIPT"; then - { echo "$as_me:$LINENO: result: $CUPS_GHOSTSCRIPT" >&5 -echo "${ECHO_T}$CUPS_GHOSTSCRIPT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_GHOSTSCRIPT" >&5 +$as_echo "$CUPS_GHOSTSCRIPT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$CUPS_GHOSTSCRIPT" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GHOSTSCRIPT 1 -_ACEOF + $as_echo "#define HAVE_GHOSTSCRIPT 1" >>confdefs.h PDFTOPS="pdftops" else - { { echo "$as_me:$LINENO: error: Unable to find gs program!" >&5 -echo "$as_me: error: Unable to find gs program!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Unable to find gs program!" "$LINENO" 5 exit 1 fi ;; x/*/gs) # Use /path/to/gs without any check: CUPS_GHOSTSCRIPT="$with_pdftops" - cat >>confdefs.h <<\_ACEOF -#define HAVE_GHOSTSCRIPT 1 -_ACEOF + $as_echo "#define HAVE_GHOSTSCRIPT 1" >>confdefs.h PDFTOPS="pdftops" ;; @@ -22466,10 +11298,10 @@ xpdftops) # Extract the first word of "pdftops", so it can be a program name with args. set dummy pdftops; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CUPS_PDFTOPS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CUPS_PDFTOPS+:} false; then : + $as_echo_n "(cached) " >&6 else case $CUPS_PDFTOPS in [\\/]* | ?:[\\/]*) @@ -22481,14 +11313,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CUPS_PDFTOPS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22496,33 +11328,27 @@ fi CUPS_PDFTOPS=$ac_cv_path_CUPS_PDFTOPS if test -n "$CUPS_PDFTOPS"; then - { echo "$as_me:$LINENO: result: $CUPS_PDFTOPS" >&5 -echo "${ECHO_T}$CUPS_PDFTOPS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_PDFTOPS" >&5 +$as_echo "$CUPS_PDFTOPS" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$CUPS_PDFTOPS" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PDFTOPS 1 -_ACEOF + $as_echo "#define HAVE_PDFTOPS 1" >>confdefs.h PDFTOPS="pdftops" else - { { echo "$as_me:$LINENO: error: Unable to find pdftops program!" >&5 -echo "$as_me: error: Unable to find pdftops program!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Unable to find pdftops program!" "$LINENO" 5 exit 1 fi ;; x/*/pdftops) # Use /path/to/pdftops without any check: CUPS_PDFTOPS="$with_pdftops" - cat >>confdefs.h <<\_ACEOF -#define HAVE_PDFTOPS 1 -_ACEOF + $as_echo "#define HAVE_PDFTOPS 1" >>confdefs.h PDFTOPS="pdftops" ;; @@ -22531,42 +11357,36 @@ ;; *) # Invalid with_pdftops value: - { { echo "$as_me:$LINENO: error: Invalid with_pdftops value!" >&5 -echo "$as_me: error: Invalid with_pdftops value!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid with_pdftops value!" "$LINENO" 5 exit 1 ;; esac if test "x$CUPS_PDFTOPS" != x; then - { echo "$as_me:$LINENO: checking whether pdftops supports -origpagesizes" >&5 -echo $ECHO_N "checking whether pdftops supports -origpagesizes... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pdftops supports -origpagesizes" >&5 +$as_echo_n "checking whether pdftops supports -origpagesizes... " >&6; } if ($CUPS_PDFTOPS -h 2>&1 | grep -q -- -origpagesizes); then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_PDFTOPS_WITH_ORIGPAGESIZES 1 -_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_PDFTOPS_WITH_ORIGPAGESIZES 1" >>confdefs.h else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi DEFAULT_PDFTOPS="" elif test "x$CUPS_GHOSTSCRIPT" != x; then - { echo "$as_me:$LINENO: checking whether gs supports the ps2write device" >&5 -echo $ECHO_N "checking whether gs supports the ps2write device... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gs supports the ps2write device" >&5 +$as_echo_n "checking whether gs supports the ps2write device... " >&6; } if ($CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write); then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_GHOSTSCRIPT_PS2WRITE 1 -_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_GHOSTSCRIPT_PS2WRITE 1" >>confdefs.h else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi DEFAULT_PDFTOPS="" @@ -22589,7 +11409,7 @@ # Check whether --with-java was given. -if test "${with_java+set}" = set; then +if test "${with_java+set}" = set; then : withval=$with_java; CUPS_JAVA="$withval" else CUPS_JAVA="" @@ -22599,10 +11419,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_JAVA+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -22614,14 +11434,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22629,11 +11449,11 @@ fi JAVA=$ac_cv_path_JAVA if test -n "$JAVA"; then - { echo "$as_me:$LINENO: result: $JAVA" >&5 -echo "${ECHO_T}$JAVA" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5 +$as_echo "$JAVA" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22646,15 +11466,13 @@ if test "x$CUPS_JAVA" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_JAVA 1 -_ACEOF + $as_echo "#define HAVE_JAVA 1" >>confdefs.h fi # Check whether --with-perl was given. -if test "${with_perl+set}" = set; then +if test "${with_perl+set}" = set; then : withval=$with_perl; CUPS_PERL="$withval" else CUPS_PERL="" @@ -22664,10 +11482,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -22679,14 +11497,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22694,11 +11512,11 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22711,15 +11529,13 @@ if test "x$CUPS_PERL" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PERL 1 -_ACEOF + $as_echo "#define HAVE_PERL 1" >>confdefs.h fi # Check whether --with-php was given. -if test "${with_php+set}" = set; then +if test "${with_php+set}" = set; then : withval=$with_php; CUPS_PHP="$withval" else CUPS_PHP="" @@ -22729,10 +11545,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PHPCGI+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -22744,14 +11560,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22759,21 +11575,21 @@ fi PHPCGI=$ac_cv_path_PHPCGI if test -n "$PHPCGI"; then - { echo "$as_me:$LINENO: result: $PHPCGI" >&5 -echo "${ECHO_T}$PHPCGI" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHPCGI" >&5 +$as_echo "$PHPCGI" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PHP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -22785,14 +11601,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22800,11 +11616,11 @@ fi PHP=$ac_cv_path_PHP if test -n "$PHP"; then - { echo "$as_me:$LINENO: result: $PHP" >&5 -echo "${ECHO_T}$PHP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5 +$as_echo "$PHP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22822,9 +11638,7 @@ if test "x$CUPS_PHP" = x; then CUPS_PHP="no" else - cat >>confdefs.h <<\_ACEOF -#define HAVE_PHP 1 -_ACEOF + $as_echo "#define HAVE_PHP 1" >>confdefs.h fi @@ -22832,10 +11646,10 @@ if test "x$CUPS_PHP" != xno; then # Extract the first word of "php-config", so it can be a program name with args. set dummy php-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PHPCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PHPCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else case $PHPCONFIG in [\\/]* | ?:[\\/]*) @@ -22847,14 +11661,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_PHPCONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22862,11 +11676,11 @@ fi PHPCONFIG=$ac_cv_path_PHPCONFIG if test -n "$PHPCONFIG"; then - { echo "$as_me:$LINENO: result: $PHPCONFIG" >&5 -echo "${ECHO_T}$PHPCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHPCONFIG" >&5 +$as_echo "$PHPCONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22880,7 +11694,7 @@ # Check whether --with-python was given. -if test "${with_python+set}" = set; then +if test "${with_python+set}" = set; then : withval=$with_python; CUPS_PYTHON="$withval" else CUPS_PYTHON="" @@ -22890,10 +11704,10 @@ 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 [\\/]* | ?:[\\/]*) @@ -22905,14 +11719,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -22920,11 +11734,11 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { echo "$as_me:$LINENO: result: $PYTHON" >&5 -echo "${ECHO_T}$PYTHON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22937,9 +11751,7 @@ if test "x$CUPS_PYTHON" != x; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PYTHON 1 -_ACEOF + $as_echo "#define HAVE_PYTHON 1" >>confdefs.h fi @@ -22997,12 +11809,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_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) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -23010,8 +11823,8 @@ (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 \). + # `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" @@ -23033,13 +11846,24 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + 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 - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $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 @@ -23052,14 +11876,15 @@ 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=`echo "$ac_i" | sed "$ac_script"` + 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. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + 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 @@ -23067,12 +11892,14 @@ -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $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. @@ -23082,59 +11909,79 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +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 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # 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 ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# 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 - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +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 - PATH_SEPARATOR=: + 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 - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# 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 @@ -23143,20 +11990,19 @@ # 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.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +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 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -23167,32 +12013,111 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# 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. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +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 + -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -23206,13 +12131,17 @@ 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 -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -23227,104 +12156,103 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. 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" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); 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 -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# 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 +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - 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 + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -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 || +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' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + 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=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -23341,12 +12269,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -23361,13 +12289,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +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.61. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23380,29 +12314,41 @@ _ACEOF -cat >>$CONFIG_STATUS <<_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 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$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 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + --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 + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -23410,35 +12356,42 @@ Configuration headers: $config_headers -Report bugs to ." +Report bugs to the package provider." _ACEOF -cat >>$CONFIG_STATUS <<_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.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" -Copyright (C) 2006 Free Software Foundation, Inc. +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 -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +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 @@ -23451,34 +12404,41 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $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 - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + 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 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + 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 - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $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. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -23493,30 +12453,32 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + 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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_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 - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -23550,9 +12512,7 @@ "packaging/cups.list") CONFIG_FILES="$CONFIG_FILES packaging/cups.list" ;; "$LANGFILES") CONFIG_FILES="$CONFIG_FILES $LANGFILES" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -23574,427 +12534,302 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + 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 -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# 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 -_ACEOF +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 - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -CUPS_VERSION!$CUPS_VERSION$ac_delim -CUPS_REVISION!$CUPS_REVISION$ac_delim -CUPS_BUILD!$CUPS_BUILD$ac_delim -AWK!$AWK$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -CPP!$CPP$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -RANLIB!$RANLIB$ac_delim -AR!$AR$ac_delim -CHMOD!$CHMOD$ac_delim -HTMLDOC!$HTMLDOC$ac_delim -LD!$LD$ac_delim -LN!$LN$ac_delim -MV!$MV$ac_delim -RM!$RM$ac_delim -RMDIR!$RMDIR$ac_delim -SED!$SED$ac_delim -XDGOPEN!$XDGOPEN$ac_delim -CUPS_HTMLVIEW!$CUPS_HTMLVIEW$ac_delim -INSTALL!$INSTALL$ac_delim -INSTALLSTATIC!$INSTALLSTATIC$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim -LIBMALLOC!$LIBMALLOC$ac_delim -LIBPAPER!$LIBPAPER$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBUSB!$LIBUSB$ac_delim -LIBWRAP!$LIBWRAP$ac_delim -ARFLAGS!$ARFLAGS$ac_delim -BACKLIBS!$BACKLIBS$ac_delim -SERVERLIBS!$SERVERLIBS$ac_delim -DBUSDIR!$DBUSDIR$ac_delim -DBUS_NOTIFIER!$DBUS_NOTIFIER$ac_delim -DBUS_NOTIFIERLIBS!$DBUS_NOTIFIERLIBS$ac_delim -CUPS_DEFAULT_PRINTOPERATOR_AUTH!$CUPS_DEFAULT_PRINTOPERATOR_AUTH$ac_delim -CUPS_SYSTEM_AUTHKEY!$CUPS_SYSTEM_AUTHKEY$ac_delim -INSTALLXPC!$INSTALLXPC$ac_delim -LEGACY_BACKENDS!$LEGACY_BACKENDS$ac_delim -BUILDDIRS!$BUILDDIRS$ac_delim -privateinclude!$privateinclude$ac_delim -PRIVATEINCLUDE!$PRIVATEINCLUDE$ac_delim -INITDIR!$INITDIR$ac_delim -INITDDIR!$INITDDIR$ac_delim -RCLEVELS!$RCLEVELS$ac_delim -RCSTART!$RCSTART$ac_delim -RCSTOP!$RCSTOP$ac_delim -SMFMANIFESTDIR!$SMFMANIFESTDIR$ac_delim -XINETD!$XINETD$ac_delim -CUPS_CACHEDIR!$CUPS_CACHEDIR$ac_delim -CUPS_DATADIR!$CUPS_DATADIR$ac_delim -ICONDIR!$ICONDIR$ac_delim -MENUDIR!$MENUDIR$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + 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 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + 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 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +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 = "" - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -CUPS_DOCROOT!$CUPS_DOCROOT$ac_delim -CUPS_FONTPATH!$CUPS_FONTPATH$ac_delim -CUPS_LOCALEDIR!$CUPS_LOCALEDIR$ac_delim -CUPS_LOGDIR!$CUPS_LOGDIR$ac_delim -CUPS_REQUESTS!$CUPS_REQUESTS$ac_delim -CUPS_SERVERBIN!$CUPS_SERVERBIN$ac_delim -INSTALL_SYSV!$INSTALL_SYSV$ac_delim -CUPS_SERVERROOT!$CUPS_SERVERROOT$ac_delim -CUPS_STATEDIR!$CUPS_STATEDIR$ac_delim -AMANDIR!$AMANDIR$ac_delim -PMANDIR!$PMANDIR$ac_delim -MAN1EXT!$MAN1EXT$ac_delim -MAN5EXT!$MAN5EXT$ac_delim -MAN7EXT!$MAN7EXT$ac_delim -MAN8EXT!$MAN8EXT$ac_delim -MAN8DIR!$MAN8DIR$ac_delim -INSTALL32!$INSTALL32$ac_delim -LIB32CUPS!$LIB32CUPS$ac_delim -LIB32CUPSIMAGE!$LIB32CUPSIMAGE$ac_delim -LIB32DIR!$LIB32DIR$ac_delim -UNINSTALL32!$UNINSTALL32$ac_delim -INSTALL64!$INSTALL64$ac_delim -LIB64CUPS!$LIB64CUPS$ac_delim -LIB64CUPSIMAGE!$LIB64CUPSIMAGE$ac_delim -LIB64DIR!$LIB64DIR$ac_delim -UNINSTALL64!$UNINSTALL64$ac_delim -DSO!$DSO$ac_delim -DSOXX!$DSOXX$ac_delim -DSOFLAGS!$DSOFLAGS$ac_delim -DSO32FLAGS!$DSO32FLAGS$ac_delim -DSO64FLAGS!$DSO64FLAGS$ac_delim -LIBCUPS!$LIBCUPS$ac_delim -LIBCUPSBASE!$LIBCUPSBASE$ac_delim -LIBCUPSCGI!$LIBCUPSCGI$ac_delim -LIBCUPSDRIVER!$LIBCUPSDRIVER$ac_delim -LIBCUPSIMAGE!$LIBCUPSIMAGE$ac_delim -LIBCUPSMIME!$LIBCUPSMIME$ac_delim -LIBCUPSPPDC!$LIBCUPSPPDC$ac_delim -LIBCUPSSTATIC!$LIBCUPSSTATIC$ac_delim -EXTLINKCUPS!$EXTLINKCUPS$ac_delim -EXTLINKCUPSDRIVER!$EXTLINKCUPSDRIVER$ac_delim -EXTLINKCUPSIMAGE!$EXTLINKCUPSIMAGE$ac_delim -LINKCUPS!$LINKCUPS$ac_delim -LINKCUPSIMAGE!$LINKCUPSIMAGE$ac_delim -DSOLIBS!$DSOLIBS$ac_delim -IMGLIBS!$IMGLIBS$ac_delim -EXPORT_LDFLAGS!$EXPORT_LDFLAGS$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -INSTALL_STRIP!$INSTALL_STRIP$ac_delim -OPTIM!$OPTIM$ac_delim -UNITTESTS!$UNITTESTS$ac_delim -ARCHFLAGS!$ARCHFLAGS$ac_delim -LDARCHFLAGS!$LDARCHFLAGS$ac_delim -ARCH32FLAGS!$ARCH32FLAGS$ac_delim -ARCH64FLAGS!$ARCH64FLAGS$ac_delim -CXXLIBS!$CXXLIBS$ac_delim -PIEFLAGS!$PIEFLAGS$ac_delim -RELROFLAGS!$RELROFLAGS$ac_delim -PHPOPTIONS!$PHPOPTIONS$ac_delim -DEFAULT_IMAGEFILTERS!$DEFAULT_IMAGEFILTERS$ac_delim -IMGFILTERS!$IMGFILTERS$ac_delim -LIBJPEG!$LIBJPEG$ac_delim -LIBPNG!$LIBPNG$ac_delim -LIBTIFF!$LIBTIFF$ac_delim -LIBZ!$LIBZ$ac_delim -EXPORT_LIBJPEG!$EXPORT_LIBJPEG$ac_delim -EXPORT_LIBPNG!$EXPORT_LIBPNG$ac_delim -EXPORT_LIBTIFF!$EXPORT_LIBTIFF$ac_delim -EXPORT_LIBZ!$EXPORT_LIBZ$ac_delim -CUPS_DEFAULT_DOMAINSOCKET!$CUPS_DEFAULT_DOMAINSOCKET$ac_delim -CUPS_LISTEN_DOMAINSOCKET!$CUPS_LISTEN_DOMAINSOCKET$ac_delim -LIBSLP!$LIBSLP$ac_delim -LIBGSSAPI!$LIBGSSAPI$ac_delim -KRB5CONFIG!$KRB5CONFIG$ac_delim -LIBLDAP!$LIBLDAP$ac_delim -PTHREAD_FLAGS!$PTHREAD_FLAGS$ac_delim -LIBGNUTLSCONFIG!$LIBGNUTLSCONFIG$ac_delim -LIBGCRYPTCONFIG!$LIBGCRYPTCONFIG$ac_delim -IPPALIASES!$IPPALIASES$ac_delim -SSLFLAGS!$SSLFLAGS$ac_delim -SSLLIBS!$SSLLIBS$ac_delim -EXPORT_SSLLIBS!$EXPORT_SSLLIBS$ac_delim -PAMDIR!$PAMDIR$ac_delim -PAMFILE!$PAMFILE$ac_delim -PAMLIBS!$PAMLIBS$ac_delim -PAMMOD!$PAMMOD$ac_delim -PAMMODAUTH!$PAMMODAUTH$ac_delim -LARGEFILE!$LARGEFILE$ac_delim -DNSSDLIBS!$DNSSDLIBS$ac_delim -DNSSD_BACKEND!$DNSSD_BACKEND$ac_delim -DEFAULT_LAUNCHD_CONF!$DEFAULT_LAUNCHD_CONF$ac_delim -LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim -LANGUAGES!$LANGUAGES$ac_delim -CUPS_BUNDLEDIR!$CUPS_BUNDLEDIR$ac_delim -CUPS_CONFIG_FILE_PERM!$CUPS_CONFIG_FILE_PERM$ac_delim -CUPS_LOG_FILE_PERM!$CUPS_LOG_FILE_PERM$ac_delim -CUPS_FATAL_ERRORS!$CUPS_FATAL_ERRORS$ac_delim +} +{ + 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 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +# 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 -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +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 false false false :; do - cat >conf$$subs.sed <<_ACEOF -CUPS_LOG_LEVEL!$CUPS_LOG_LEVEL$ac_delim -CUPS_ACCESS_LOG_LEVEL!$CUPS_ACCESS_LOG_LEVEL$ac_delim -CUPS_BROWSING!$CUPS_BROWSING$ac_delim -CUPS_BROWSE_LOCAL_PROTOCOLS!$CUPS_BROWSE_LOCAL_PROTOCOLS$ac_delim -CUPS_BROWSE_REMOTE_PROTOCOLS!$CUPS_BROWSE_REMOTE_PROTOCOLS$ac_delim -CUPS_BROWSE_SHORT_NAMES!$CUPS_BROWSE_SHORT_NAMES$ac_delim -CUPS_DEFAULT_SHARED!$CUPS_DEFAULT_SHARED$ac_delim -CUPS_IMPLICIT_CLASSES!$CUPS_IMPLICIT_CLASSES$ac_delim -CUPS_USE_NETWORK_DEFAULT!$CUPS_USE_NETWORK_DEFAULT$ac_delim -CUPS_USER!$CUPS_USER$ac_delim -CUPS_GROUP!$CUPS_GROUP$ac_delim -CUPS_SYSTEM_GROUPS!$CUPS_SYSTEM_GROUPS$ac_delim -CUPS_PRIMARY_SYSTEM_GROUP!$CUPS_PRIMARY_SYSTEM_GROUP$ac_delim -CUPS_DEFAULT_PRINTCAP!$CUPS_DEFAULT_PRINTCAP$ac_delim -CUPS_MAX_COPIES!$CUPS_MAX_COPIES$ac_delim -DEFAULT_RAW_PRINTING!$DEFAULT_RAW_PRINTING$ac_delim -CUPS_SNMP_ADDRESS!$CUPS_SNMP_ADDRESS$ac_delim -CUPS_SNMP_COMMUNITY!$CUPS_SNMP_COMMUNITY$ac_delim -DEFAULT_IPP_PORT!$DEFAULT_IPP_PORT$ac_delim -BANNERTOPS!$BANNERTOPS$ac_delim -DEFAULT_BANNERTOPS!$DEFAULT_BANNERTOPS$ac_delim -DEFAULT_TEXTTOPS!$DEFAULT_TEXTTOPS$ac_delim -TEXTTOPS!$TEXTTOPS$ac_delim -FONTS!$FONTS$ac_delim -CUPS_WEBIF!$CUPS_WEBIF$ac_delim -CUPS_PDFTOPS!$CUPS_PDFTOPS$ac_delim -CUPS_GHOSTSCRIPT!$CUPS_GHOSTSCRIPT$ac_delim -DEFAULT_PDFTOPS!$DEFAULT_PDFTOPS$ac_delim -PDFTOPS!$PDFTOPS$ac_delim -JAVA!$JAVA$ac_delim -PERL!$PERL$ac_delim -PHPCGI!$PHPCGI$ac_delim -PHP!$PHP$ac_delim -PHPCONFIG!$PHPCONFIG$ac_delim -PHPDIR!$PHPDIR$ac_delim -PYTHON!$PYTHON$ac_delim -INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim -UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then +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 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - +# 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. -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ 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[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" +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" -for ac_tag in :F $CONFIG_FILES :H $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*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -24013,7 +12848,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) 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 `:'. @@ -24022,26 +12857,34 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + 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 "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + 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" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $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 >"$tmp/stdin";; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -24051,42 +12894,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -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" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`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 || -echo X"$as_dir" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -24104,20 +12912,15 @@ q } s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + 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=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + 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/ ;; @@ -24153,12 +12956,12 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_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= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -24166,36 +12969,37 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $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 +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' ;; + 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 - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +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 @@ -24204,119 +13008,49 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out +" +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' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -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;} + { 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 "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) 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 # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then 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. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $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 "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" ;; @@ -24325,11 +13059,13 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS 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. @@ -24349,7 +13085,11 @@ 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 || { (exit 1); exit 1; } + $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 diff -Nru cups-1.5.2/cups/auth.c cups-1.5.3/cups/auth.c --- cups-1.5.2/cups/auth.c 2011-10-13 07:44:32.000000000 +0200 +++ cups-1.5.3/cups/auth.c 2012-02-15 20:21:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 10067 2011-10-13 05:44:32Z mike $" + * "$Id: auth.c 10288 2012-02-15 19:21:37Z mike $" * * Authentication functions for CUPS. * @@ -124,7 +124,8 @@ const char *method, /* I - Request method ("GET", "POST", "PUT") */ const char *resource) /* I - Resource path */ { - const char *password; /* Password string */ + const char *password, /* Password string */ + *www_auth; /* WWW-Authenticate header */ char prompt[1024], /* Prompt for user */ realm[HTTP_MAX_VALUE], /* realm="xyz" string */ nonce[HTTP_MAX_VALUE]; /* nonce="xyz" string */ @@ -179,9 +180,11 @@ * Nope, see if we should retry the current username:password... */ + www_auth = http->fields[HTTP_FIELD_WWW_AUTHENTICATE]; + if ((http->digest_tries > 1 || !http->userpass[0]) && - (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) || - !strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6))) + (!_cups_strncasecmp(www_auth, "Basic", 5) || + !_cups_strncasecmp(www_auth, "Digest", 6))) { /* * Nope - get a new password from the user... @@ -197,8 +200,7 @@ cupsUser(), http->hostname[0] == '/' ? "localhost" : http->hostname); - http->digest_tries = _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], - "Digest", 5) != 0; + http->digest_tries = _cups_strncasecmp(www_auth, "Digest", 6) != 0; http->userpass[0] = '\0'; if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL) @@ -227,7 +229,7 @@ */ #ifdef HAVE_GSSAPI - if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9)) + if (!_cups_strncasecmp(www_auth, "Negotiate", 9)) { /* * Kerberos authentication... @@ -241,7 +243,7 @@ } else #endif /* HAVE_GSSAPI */ - if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5)) + if (!_cups_strncasecmp(www_auth, "Basic", 5)) { /* * Basic authentication... @@ -254,7 +256,7 @@ (int)strlen(http->userpass)); httpSetAuthString(http, "Basic", encode); } - else if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6)) + else if (!_cups_strncasecmp(www_auth, "Digest", 6)) { /* * Digest authentication... @@ -277,7 +279,7 @@ else { DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"", - http->fields[HTTP_FIELD_WWW_AUTHENTICATE])); + www_auth)); http->status = HTTP_AUTHORIZATION_CANCELED; return (-1); } @@ -874,5 +876,5 @@ /* - * End of "$Id: auth.c 10067 2011-10-13 05:44:32Z mike $". + * End of "$Id: auth.c 10288 2012-02-15 19:21:37Z mike $". */ diff -Nru cups-1.5.2/cups/cups.h cups-1.5.3/cups/cups.h --- cups-1.5.2/cups/cups.h 2012-02-05 19:38:39.000000000 +0100 +++ cups-1.5.3/cups/cups.h 2012-02-06 21:54:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: cups.h 10226 2012-02-05 18:38:39Z mike $" + * "$Id: cups.h 10235 2012-02-06 20:54:37Z mike $" * * API definitions for CUPS. * @@ -60,10 +60,10 @@ * Constants... */ -# define CUPS_VERSION 1.0502 +# define CUPS_VERSION 1.0503 # define CUPS_VERSION_MAJOR 1 # define CUPS_VERSION_MINOR 5 -# define CUPS_VERSION_PATCH 2 +# define CUPS_VERSION_PATCH 3 # define CUPS_BC_FD 3 /* Back-channel file descriptor for select/poll */ # define CUPS_DATE_ANY (time_t)-1 @@ -341,5 +341,5 @@ #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 10226 2012-02-05 18:38:39Z mike $". + * End of "$Id: cups.h 10235 2012-02-06 20:54:37Z mike $". */ diff -Nru cups-1.5.2/cups/debug.c cups-1.5.3/cups/debug.c --- cups-1.5.2/cups/debug.c 2010-09-16 23:43:57.000000000 +0200 +++ cups-1.5.3/cups/debug.c 2012-02-06 20:35:59.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: debug.c 9306 2010-09-16 21:43:57Z mike $" + * "$Id: debug.c 10234 2012-02-06 19:35:59Z mike $" * * Debugging functions for CUPS. * - * Copyright 2008-2010 by Apple Inc. + * Copyright 2008-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -32,22 +32,22 @@ # include # include # define getpid (int)GetCurrentProcessId -static int /* O - 0 on success, -1 on failure */ -gettimeofday(struct timeval *tv, /* I - Timeval struct */ - void *tz) /* I - Timezone */ -{ +int /* O - 0 on success, -1 on failure */ +_cups_gettimeofday(struct timeval *tv, /* I - Timeval struct */ + void *tz) /* I - Timezone */ +{ struct _timeb timebuffer; /* Time buffer struct */ _ftime(&timebuffer); tv->tv_sec = (long)timebuffer.time; - tv->tv_usec = timebuffer.millitm * 1000; + tv->tv_usec = timebuffer.millitm * 1000; return 0; } #else # include # include #endif /* WIN32 */ -#include #include +#include /* @@ -336,41 +336,54 @@ { *bufptr++ = '\\'; *bufptr++ = 'n'; + bytes += 2; } else if (*s == '\r') { *bufptr++ = '\\'; *bufptr++ = 'r'; + bytes += 2; } else if (*s == '\t') { *bufptr++ = '\\'; *bufptr++ = 't'; + bytes += 2; } else if (*s == '\\') { *bufptr++ = '\\'; *bufptr++ = '\\'; + bytes += 2; } else if (*s == '\'') { *bufptr++ = '\\'; *bufptr++ = '\''; + bytes += 2; } else if (*s == '\"') { *bufptr++ = '\\'; *bufptr++ = '\"'; + bytes += 2; } else if ((*s & 255) < ' ') { + if ((bufptr + 2) >= bufend) + break; + *bufptr++ = '\\'; *bufptr++ = '0'; *bufptr++ = '0' + *s / 8; *bufptr++ = '0' + (*s & 7); + bytes += 4; } else + { *bufptr++ = *s; + bytes ++; + } } bufend ++; @@ -463,15 +476,18 @@ (int)(curtime.tv_sec % 60), (int)(curtime.tv_usec / 1000)); va_start(ap, format); - debug_vsnprintf(buffer + 13, sizeof(buffer) - 14, format, ap); + bytes = debug_vsnprintf(buffer + 13, sizeof(buffer) - 14, format, ap) + 13; va_end(ap); - bytes = strlen(buffer); - if (buffer[bytes - 1] != '\n') + if (bytes >= (sizeof(buffer) - 1)) + { + buffer[sizeof(buffer) - 2] = '\n'; + bytes = sizeof(buffer) - 1; + } + else if (buffer[bytes - 1] != '\n') { - buffer[bytes] = '\n'; - bytes ++; - buffer[bytes] = '\0'; + buffer[bytes++] = '\n'; + buffer[bytes] = '\0'; } /* @@ -489,15 +505,74 @@ void DLLExport _cups_debug_puts(const char *s) /* I - String to output */ { - char format[4]; /* C%s */ + struct timeval curtime; /* Current time */ + char buffer[2048]; /* Output buffer */ + size_t bytes; /* Number of bytes in buffer */ + int level; /* Log level in message */ + + + /* + * See if we need to do any logging... + */ + if (!debug_init) + _cups_debug_set(getenv("CUPS_DEBUG_LOG"), getenv("CUPS_DEBUG_LEVEL"), + getenv("CUPS_DEBUG_FILTER"), 0); - format[0] = *s++; - format[1] = '%'; - format[2] = 's'; - format[3] = '\0'; + if (_cups_debug_fd < 0) + return; - _cups_debug_printf(format, s); + /* + * Filter as needed... + */ + + if (isdigit(s[0])) + level = *s++ - '0'; + else + level = 0; + + if (level > _cups_debug_level) + return; + + if (debug_filter) + { + int result; /* Filter result */ + + _cupsMutexLock(&debug_mutex); + result = regexec(debug_filter, s, 0, NULL, 0); + _cupsMutexUnlock(&debug_mutex); + + if (result) + return; + } + + /* + * Format the message... + */ + + gettimeofday(&curtime, NULL); + bytes = snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d.%03d %s", + (int)((curtime.tv_sec / 3600) % 24), + (int)((curtime.tv_sec / 60) % 60), + (int)(curtime.tv_sec % 60), (int)(curtime.tv_usec / 1000), + s); + + if (bytes >= (sizeof(buffer) - 1)) + { + buffer[sizeof(buffer) - 2] = '\n'; + bytes = sizeof(buffer) - 1; + } + else if (buffer[bytes - 1] != '\n') + { + buffer[bytes++] = '\n'; + buffer[bytes] = '\0'; + } + + /* + * Write it out... + */ + + write(_cups_debug_fd, buffer, bytes); } @@ -579,5 +654,5 @@ /* - * End of "$Id: debug.c 9306 2010-09-16 21:43:57Z mike $". + * End of "$Id: debug.c 10234 2012-02-06 19:35:59Z mike $". */ diff -Nru cups-1.5.2/cups/debug-private.h cups-1.5.3/cups/debug-private.h --- cups-1.5.2/cups/debug-private.h 2010-08-31 06:48:00.000000000 +0200 +++ cups-1.5.3/cups/debug-private.h 2012-02-06 20:35:59.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: debug-private.h 9276 2010-08-31 04:48:00Z mike $" + * "$Id: debug-private.h 10234 2012-02-06 19:35:59Z mike $" * * Private debugging macros for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -18,6 +18,14 @@ #ifndef _CUPS_DEBUG_PRIVATE_H_ # define _CUPS_DEBUG_PRIVATE_H_ + +/* + * Include necessary headers... + */ + +# include + + /* * C++ magic... */ @@ -88,14 +96,15 @@ extern int _cups_debug_fd; extern int _cups_debug_level; extern void DLLExport _cups_debug_printf(const char *format, ...) -#ifdef __GNUC__ -__attribute__ ((__format__ (__printf__, 1, 2))) -#endif /* __GNUC__ */ -; + __attribute__ ((__format__ (__printf__, 1, 2))); extern void DLLExport _cups_debug_puts(const char *s); extern void DLLExport _cups_debug_set(const char *logfile, const char *level, const char *filter, int force); +# ifdef WIN32 +extern int _cups_gettimeofday(struct timeval *tv, void *tz); +# define gettimeofday(a,b) _cups_gettimeofday(a, b) +# endif /* WIN32 */ # ifdef __cplusplus } @@ -104,5 +113,5 @@ #endif /* !_CUPS_DEBUG_PRIVATE_H_ */ /* - * End of "$Id: debug-private.h 9276 2010-08-31 04:48:00Z mike $". + * End of "$Id: debug-private.h 10234 2012-02-06 19:35:59Z mike $". */ diff -Nru cups-1.5.2/cups/Dependencies cups-1.5.3/cups/Dependencies --- cups-1.5.2/cups/Dependencies 2011-05-12 07:46:30.000000000 +0200 +++ cups-1.5.3/cups/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -2,213 +2,237 @@ adminutil.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h adminutil.o: array.h language.h string-private.h ../config.h debug-private.h -adminutil.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -adminutil.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -adminutil.o: language-private.h ../cups/transcode.h thread-private.h -adminutil.o: adminutil.h -array.o: string-private.h ../config.h debug-private.h array-private.h array.h -array.o: versioning.h +adminutil.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +adminutil.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +adminutil.o: ipp-private.h ../cups/ipp.h language-private.h +adminutil.o: ../cups/transcode.h thread-private.h adminutil.h +array.o: string-private.h ../config.h debug-private.h ../cups/versioning.h +array.o: array-private.h ../cups/array.h versioning.h attr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.o: array.h language.h string-private.h ../config.h debug-private.h -attr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -attr.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -attr.o: language-private.h ../cups/transcode.h thread-private.h +attr.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +attr.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +attr.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h auth.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h auth.o: array.h language.h string-private.h ../config.h debug-private.h -auth.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -auth.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -auth.o: language-private.h ../cups/transcode.h thread-private.h +auth.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +auth.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +auth.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h backchannel.o: cups.h backend.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h backend.o: array.h language.h string-private.h ../config.h debug-private.h -backend.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -backend.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -backend.o: language-private.h ../cups/transcode.h thread-private.h backend.h +backend.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +backend.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +backend.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +backend.o: thread-private.h backend.h conflicts.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h conflicts.o: array.h language.h string-private.h ../config.h debug-private.h -conflicts.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -conflicts.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -conflicts.o: language-private.h ../cups/transcode.h thread-private.h +conflicts.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +conflicts.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +conflicts.o: ipp-private.h ../cups/ipp.h language-private.h +conflicts.o: ../cups/transcode.h thread-private.h custom.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h custom.o: array.h language.h string-private.h ../config.h debug-private.h -custom.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -custom.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -custom.o: language-private.h ../cups/transcode.h thread-private.h +custom.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +custom.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +custom.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +custom.o: thread-private.h debug.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h debug.o: array.h language.h string-private.h ../config.h debug-private.h -debug.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -debug.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -debug.o: language-private.h ../cups/transcode.h thread-private.h +debug.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +debug.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +debug.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +debug.o: thread-private.h dest.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h dest.o: array.h language.h string-private.h ../config.h debug-private.h -dest.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -dest.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -dest.o: language-private.h ../cups/transcode.h thread-private.h -dir.o: string-private.h ../config.h debug-private.h dir.h versioning.h +dest.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +dest.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +dest.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h +dir.o: string-private.h ../config.h debug-private.h ../cups/versioning.h +dir.o: dir.h versioning.h emit.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h emit.o: array.h language.h string-private.h ../config.h debug-private.h -emit.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -emit.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -emit.o: language-private.h ../cups/transcode.h thread-private.h +emit.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +emit.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +emit.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h encode.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h encode.o: array.h language.h string-private.h ../config.h debug-private.h -encode.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -encode.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -encode.o: language-private.h ../cups/transcode.h thread-private.h +encode.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +encode.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +encode.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +encode.o: thread-private.h file.o: file-private.h cups-private.h ../cups/cups.h file.h versioning.h file.o: ipp.h http.h array.h language.h string-private.h ../config.h -file.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h -file.o: http-private.h ../cups/http.h md5-private.h ipp-private.h -file.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h +file.o: debug-private.h ../cups/versioning.h ppd-private.h ../cups/ppd.h +file.o: cups.h pwg-private.h http-private.h ../cups/http.h md5-private.h +file.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +file.o: thread-private.h getdevices.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h getdevices.o: array.h language.h string-private.h ../config.h debug-private.h -getdevices.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -getdevices.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -getdevices.o: language-private.h ../cups/transcode.h thread-private.h +getdevices.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +getdevices.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +getdevices.o: ipp-private.h ../cups/ipp.h language-private.h +getdevices.o: ../cups/transcode.h thread-private.h getifaddrs.o: http-private.h ../config.h ../cups/http.h md5-private.h getifaddrs.o: ipp-private.h ../cups/ipp.h getputfile.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h getputfile.o: array.h language.h string-private.h ../config.h debug-private.h -getputfile.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -getputfile.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -getputfile.o: language-private.h ../cups/transcode.h thread-private.h +getputfile.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +getputfile.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +getputfile.o: ipp-private.h ../cups/ipp.h language-private.h +getputfile.o: ../cups/transcode.h thread-private.h globals.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h globals.o: array.h language.h string-private.h ../config.h debug-private.h -globals.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -globals.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -globals.o: language-private.h ../cups/transcode.h thread-private.h +globals.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +globals.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +globals.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +globals.o: thread-private.h http.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h http.o: array.h language.h string-private.h ../config.h debug-private.h -http.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -http.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -http.o: language-private.h ../cups/transcode.h thread-private.h +http.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +http.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +http.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h http-addr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h http-addr.o: array.h language.h string-private.h ../config.h debug-private.h -http-addr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -http-addr.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -http-addr.o: language-private.h ../cups/transcode.h thread-private.h +http-addr.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +http-addr.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +http-addr.o: ipp-private.h ../cups/ipp.h language-private.h +http-addr.o: ../cups/transcode.h thread-private.h http-addrlist.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http-addrlist.o: http.h array.h language.h string-private.h ../config.h -http-addrlist.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h -http-addrlist.o: pwg-private.h http-private.h ../cups/http.h md5-private.h -http-addrlist.o: ipp-private.h ../cups/ipp.h language-private.h -http-addrlist.o: ../cups/transcode.h thread-private.h +http-addrlist.o: debug-private.h ../cups/versioning.h ppd-private.h +http-addrlist.o: ../cups/ppd.h cups.h pwg-private.h http-private.h +http-addrlist.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +http-addrlist.o: language-private.h ../cups/transcode.h thread-private.h http-support.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http-support.o: http.h array.h language.h string-private.h ../config.h -http-support.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h -http-support.o: pwg-private.h http-private.h ../cups/http.h md5-private.h -http-support.o: ipp-private.h ../cups/ipp.h language-private.h -http-support.o: ../cups/transcode.h thread-private.h +http-support.o: debug-private.h ../cups/versioning.h ppd-private.h +http-support.o: ../cups/ppd.h cups.h pwg-private.h http-private.h +http-support.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +http-support.o: language-private.h ../cups/transcode.h thread-private.h ipp.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h array.h -ipp.o: language.h string-private.h ../config.h debug-private.h ppd-private.h -ipp.o: ../cups/ppd.h cups.h pwg-private.h http-private.h ../cups/http.h -ipp.o: md5-private.h ipp-private.h ../cups/ipp.h language-private.h -ipp.o: ../cups/transcode.h thread-private.h +ipp.o: language.h string-private.h ../config.h debug-private.h +ipp.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +ipp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +ipp.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h ipp-support.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h ipp-support.o: array.h language.h string-private.h ../config.h -ipp-support.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h -ipp-support.o: pwg-private.h http-private.h ../cups/http.h md5-private.h -ipp-support.o: ipp-private.h ../cups/ipp.h language-private.h -ipp-support.o: ../cups/transcode.h thread-private.h +ipp-support.o: debug-private.h ../cups/versioning.h ppd-private.h +ipp-support.o: ../cups/ppd.h cups.h pwg-private.h http-private.h +ipp-support.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +ipp-support.o: language-private.h ../cups/transcode.h thread-private.h langprintf.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h langprintf.o: array.h language.h string-private.h ../config.h debug-private.h -langprintf.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -langprintf.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -langprintf.o: language-private.h ../cups/transcode.h thread-private.h +langprintf.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +langprintf.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +langprintf.o: ipp-private.h ../cups/ipp.h language-private.h +langprintf.o: ../cups/transcode.h thread-private.h language.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h language.o: array.h language.h string-private.h ../config.h debug-private.h -language.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -language.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -language.o: language-private.h ../cups/transcode.h thread-private.h +language.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +language.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +language.o: ipp-private.h ../cups/ipp.h language-private.h +language.o: ../cups/transcode.h thread-private.h localize.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h localize.o: array.h language.h string-private.h ../config.h debug-private.h -localize.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -localize.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -localize.o: language-private.h ../cups/transcode.h thread-private.h +localize.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +localize.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +localize.o: ipp-private.h ../cups/ipp.h language-private.h +localize.o: ../cups/transcode.h thread-private.h mark.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h mark.o: array.h language.h string-private.h ../config.h debug-private.h -mark.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -mark.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -mark.o: language-private.h ../cups/transcode.h thread-private.h +mark.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +mark.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +mark.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h md5.o: md5-private.h string-private.h ../config.h md5passwd.o: http-private.h ../config.h ../cups/http.h md5-private.h md5passwd.o: ipp-private.h ../cups/ipp.h string-private.h notify.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h notify.o: array.h language.h string-private.h ../config.h debug-private.h -notify.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -notify.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -notify.o: language-private.h ../cups/transcode.h thread-private.h +notify.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +notify.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +notify.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +notify.o: thread-private.h options.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h options.o: array.h language.h string-private.h ../config.h debug-private.h -options.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -options.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -options.o: language-private.h ../cups/transcode.h thread-private.h -page.o: string-private.h ../config.h debug-private.h ppd.h cups.h array.h -page.o: versioning.h file.h +options.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +options.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +options.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +options.o: thread-private.h +page.o: string-private.h ../config.h debug-private.h ../cups/versioning.h +page.o: ppd.h cups.h array.h versioning.h file.h ppd.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h array.h -ppd.o: language.h string-private.h ../config.h debug-private.h ppd-private.h -ppd.o: ../cups/ppd.h cups.h pwg-private.h http-private.h ../cups/http.h -ppd.o: md5-private.h ipp-private.h ../cups/ipp.h language-private.h -ppd.o: ../cups/transcode.h thread-private.h +ppd.o: language.h string-private.h ../config.h debug-private.h +ppd.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +ppd.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +ppd.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h ppd-cache.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h ppd-cache.o: array.h language.h string-private.h ../config.h debug-private.h -ppd-cache.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -ppd-cache.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -ppd-cache.o: language-private.h ../cups/transcode.h thread-private.h +ppd-cache.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +ppd-cache.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +ppd-cache.o: ipp-private.h ../cups/ipp.h language-private.h +ppd-cache.o: ../cups/transcode.h thread-private.h pwg-media.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h pwg-media.o: array.h language.h string-private.h ../config.h debug-private.h -pwg-media.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -pwg-media.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -pwg-media.o: language-private.h ../cups/transcode.h thread-private.h +pwg-media.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +pwg-media.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +pwg-media.o: ipp-private.h ../cups/ipp.h language-private.h +pwg-media.o: ../cups/transcode.h thread-private.h request.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h request.o: array.h language.h string-private.h ../config.h debug-private.h -request.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -request.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -request.o: language-private.h ../cups/transcode.h thread-private.h +request.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +request.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +request.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +request.o: thread-private.h sidechannel.o: sidechannel.h versioning.h string-private.h ../config.h -sidechannel.o: debug-private.h +sidechannel.o: debug-private.h ../cups/versioning.h snmp.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h snmp.o: array.h language.h string-private.h ../config.h debug-private.h -snmp.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -snmp.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -snmp.o: language-private.h ../cups/transcode.h thread-private.h +snmp.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +snmp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +snmp.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h snmp.o: snmp-private.h snprintf.o: string-private.h ../config.h -string.o: string-private.h ../config.h debug-private.h thread-private.h -string.o: array.h versioning.h +string.o: string-private.h ../config.h debug-private.h ../cups/versioning.h +string.o: thread-private.h array.h versioning.h tempfile.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h tempfile.o: array.h language.h string-private.h ../config.h debug-private.h -tempfile.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -tempfile.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -tempfile.o: language-private.h ../cups/transcode.h thread-private.h +tempfile.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +tempfile.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +tempfile.o: ipp-private.h ../cups/ipp.h language-private.h +tempfile.o: ../cups/transcode.h thread-private.h thread.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h thread.o: array.h language.h string-private.h ../config.h debug-private.h -thread.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -thread.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -thread.o: language-private.h ../cups/transcode.h thread-private.h +thread.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +thread.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +thread.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +thread.o: thread-private.h transcode.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h transcode.o: array.h language.h string-private.h ../config.h debug-private.h -transcode.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -transcode.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -transcode.o: language-private.h ../cups/transcode.h thread-private.h +transcode.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +transcode.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +transcode.o: ipp-private.h ../cups/ipp.h language-private.h +transcode.o: ../cups/transcode.h thread-private.h usersys.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h usersys.o: array.h language.h string-private.h ../config.h debug-private.h -usersys.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -usersys.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -usersys.o: language-private.h ../cups/transcode.h thread-private.h +usersys.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +usersys.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +usersys.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +usersys.o: thread-private.h util.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h util.o: array.h language.h string-private.h ../config.h debug-private.h -util.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -util.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -util.o: language-private.h ../cups/transcode.h thread-private.h +util.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +util.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +util.o: ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h testadmin.o: adminutil.h cups.h string-private.h ../config.h -testarray.o: string-private.h ../config.h debug-private.h array.h -testarray.o: versioning.h dir.h +testarray.o: string-private.h ../config.h debug-private.h +testarray.o: ../cups/versioning.h array.h versioning.h dir.h testconflicts.o: cups.h ppd.h array.h versioning.h file.h string-private.h testconflicts.o: ../config.h testcups.o: string-private.h ../config.h cups.h ppd.h array.h versioning.h testcups.o: file.h -testfile.o: string-private.h ../config.h debug-private.h file.h versioning.h +testfile.o: string-private.h ../config.h debug-private.h ../cups/versioning.h +testfile.o: file.h versioning.h testhttp.o: string-private.h ../config.h http-private.h ../cups/http.h testhttp.o: md5-private.h ipp-private.h ../cups/ipp.h testi18n.o: string-private.h ../config.h language-private.h @@ -217,243 +241,269 @@ testipp.o: ../cups/ipp.h testoptions.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testoptions.o: array.h language.h string-private.h ../config.h -testoptions.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h -testoptions.o: pwg-private.h http-private.h ../cups/http.h md5-private.h -testoptions.o: ipp-private.h ../cups/ipp.h language-private.h -testoptions.o: ../cups/transcode.h thread-private.h +testoptions.o: debug-private.h ../cups/versioning.h ppd-private.h +testoptions.o: ../cups/ppd.h cups.h pwg-private.h http-private.h +testoptions.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +testoptions.o: language-private.h ../cups/transcode.h thread-private.h testlang.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testlang.o: array.h language.h string-private.h ../config.h debug-private.h -testlang.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testlang.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testlang.o: language-private.h ../cups/transcode.h thread-private.h +testlang.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testlang.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +testlang.o: ipp-private.h ../cups/ipp.h language-private.h +testlang.o: ../cups/transcode.h thread-private.h testppd.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testppd.o: array.h language.h string-private.h ../config.h debug-private.h -testppd.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testppd.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testppd.o: language-private.h ../cups/transcode.h thread-private.h +testppd.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testppd.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +testppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +testppd.o: thread-private.h testpwg.o: ppd-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testpwg.o: array.h language.h ../cups/ppd.h cups.h pwg-private.h testpwg.o: file-private.h cups-private.h string-private.h ../config.h -testpwg.o: debug-private.h http-private.h ../cups/http.h md5-private.h -testpwg.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h -testpwg.o: thread-private.h +testpwg.o: debug-private.h ../cups/versioning.h http-private.h ../cups/http.h +testpwg.o: md5-private.h ipp-private.h ../cups/ipp.h language-private.h +testpwg.o: ../cups/transcode.h thread-private.h testsnmp.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testsnmp.o: array.h language.h string-private.h ../config.h debug-private.h -testsnmp.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testsnmp.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testsnmp.o: language-private.h ../cups/transcode.h thread-private.h -testsnmp.o: snmp-private.h +testsnmp.o: ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testsnmp.o: pwg-private.h http-private.h ../cups/http.h md5-private.h +testsnmp.o: ipp-private.h ../cups/ipp.h language-private.h +testsnmp.o: ../cups/transcode.h thread-private.h snmp-private.h # DO NOT DELETE adminutil.32.o: adminutil.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h adminutil.32.o: adminutil.c array.h language.h string-private.h ../config.h debug-private.h -adminutil.32.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -adminutil.32.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -adminutil.32.o: adminutil.c language-private.h ../cups/transcode.h thread-private.h -adminutil.32.o: adminutil.c adminutil.h -array.32.o: array.c string-private.h ../config.h debug-private.h array-private.h array.h -array.32.o: array.c versioning.h +adminutil.32.o: adminutil.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +adminutil.32.o: adminutil.c pwg-private.h http-private.h ../cups/http.h md5-private.h +adminutil.32.o: adminutil.c ipp-private.h ../cups/ipp.h language-private.h +adminutil.32.o: adminutil.c ../cups/transcode.h thread-private.h adminutil.h +array.32.o: array.c string-private.h ../config.h debug-private.h ../cups/versioning.h +array.32.o: array.c array-private.h ../cups/array.h versioning.h attr.32.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.32.o: attr.c array.h language.h string-private.h ../config.h debug-private.h -attr.32.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -attr.32.o: attr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -attr.32.o: attr.c language-private.h ../cups/transcode.h thread-private.h +attr.32.o: attr.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +attr.32.o: attr.c http-private.h ../cups/http.h md5-private.h ipp-private.h +attr.32.o: attr.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h auth.32.o: auth.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h auth.32.o: auth.c array.h language.h string-private.h ../config.h debug-private.h -auth.32.o: auth.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -auth.32.o: auth.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -auth.32.o: auth.c language-private.h ../cups/transcode.h thread-private.h +auth.32.o: auth.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +auth.32.o: auth.c http-private.h ../cups/http.h md5-private.h ipp-private.h +auth.32.o: auth.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h backchannel.32.o: backchannel.c cups.h backend.32.o: backend.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h backend.32.o: backend.c array.h language.h string-private.h ../config.h debug-private.h -backend.32.o: backend.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -backend.32.o: backend.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -backend.32.o: backend.c language-private.h ../cups/transcode.h thread-private.h backend.h +backend.32.o: backend.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +backend.32.o: backend.c pwg-private.h http-private.h ../cups/http.h md5-private.h +backend.32.o: backend.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +backend.32.o: backend.c thread-private.h backend.h conflicts.32.o: conflicts.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h conflicts.32.o: conflicts.c array.h language.h string-private.h ../config.h debug-private.h -conflicts.32.o: conflicts.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -conflicts.32.o: conflicts.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -conflicts.32.o: conflicts.c language-private.h ../cups/transcode.h thread-private.h +conflicts.32.o: conflicts.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +conflicts.32.o: conflicts.c pwg-private.h http-private.h ../cups/http.h md5-private.h +conflicts.32.o: conflicts.c ipp-private.h ../cups/ipp.h language-private.h +conflicts.32.o: conflicts.c ../cups/transcode.h thread-private.h custom.32.o: custom.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h custom.32.o: custom.c array.h language.h string-private.h ../config.h debug-private.h -custom.32.o: custom.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -custom.32.o: custom.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -custom.32.o: custom.c language-private.h ../cups/transcode.h thread-private.h +custom.32.o: custom.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +custom.32.o: custom.c pwg-private.h http-private.h ../cups/http.h md5-private.h +custom.32.o: custom.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +custom.32.o: custom.c thread-private.h debug.32.o: debug.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h debug.32.o: debug.c array.h language.h string-private.h ../config.h debug-private.h -debug.32.o: debug.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -debug.32.o: debug.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -debug.32.o: debug.c language-private.h ../cups/transcode.h thread-private.h +debug.32.o: debug.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +debug.32.o: debug.c pwg-private.h http-private.h ../cups/http.h md5-private.h +debug.32.o: debug.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +debug.32.o: debug.c thread-private.h dest.32.o: dest.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h dest.32.o: dest.c array.h language.h string-private.h ../config.h debug-private.h -dest.32.o: dest.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -dest.32.o: dest.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -dest.32.o: dest.c language-private.h ../cups/transcode.h thread-private.h -dir.32.o: dir.c string-private.h ../config.h debug-private.h dir.h versioning.h +dest.32.o: dest.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +dest.32.o: dest.c http-private.h ../cups/http.h md5-private.h ipp-private.h +dest.32.o: dest.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h +dir.32.o: dir.c string-private.h ../config.h debug-private.h ../cups/versioning.h +dir.32.o: dir.c dir.h versioning.h emit.32.o: emit.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h emit.32.o: emit.c array.h language.h string-private.h ../config.h debug-private.h -emit.32.o: emit.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -emit.32.o: emit.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -emit.32.o: emit.c language-private.h ../cups/transcode.h thread-private.h +emit.32.o: emit.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +emit.32.o: emit.c http-private.h ../cups/http.h md5-private.h ipp-private.h +emit.32.o: emit.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h encode.32.o: encode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h encode.32.o: encode.c array.h language.h string-private.h ../config.h debug-private.h -encode.32.o: encode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -encode.32.o: encode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -encode.32.o: encode.c language-private.h ../cups/transcode.h thread-private.h +encode.32.o: encode.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +encode.32.o: encode.c pwg-private.h http-private.h ../cups/http.h md5-private.h +encode.32.o: encode.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +encode.32.o: encode.c thread-private.h file.32.o: file.c file-private.h cups-private.h ../cups/cups.h file.h versioning.h file.32.o: file.c ipp.h http.h array.h language.h string-private.h ../config.h -file.32.o: file.c debug-private.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h -file.32.o: file.c http-private.h ../cups/http.h md5-private.h ipp-private.h -file.32.o: file.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h +file.32.o: file.c debug-private.h ../cups/versioning.h ppd-private.h ../cups/ppd.h +file.32.o: file.c cups.h pwg-private.h http-private.h ../cups/http.h md5-private.h +file.32.o: file.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +file.32.o: file.c thread-private.h getdevices.32.o: getdevices.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h getdevices.32.o: getdevices.c array.h language.h string-private.h ../config.h debug-private.h -getdevices.32.o: getdevices.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -getdevices.32.o: getdevices.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -getdevices.32.o: getdevices.c language-private.h ../cups/transcode.h thread-private.h +getdevices.32.o: getdevices.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +getdevices.32.o: getdevices.c pwg-private.h http-private.h ../cups/http.h md5-private.h +getdevices.32.o: getdevices.c ipp-private.h ../cups/ipp.h language-private.h +getdevices.32.o: getdevices.c ../cups/transcode.h thread-private.h getifaddrs.32.o: getifaddrs.c http-private.h ../config.h ../cups/http.h md5-private.h getifaddrs.32.o: getifaddrs.c ipp-private.h ../cups/ipp.h getputfile.32.o: getputfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h getputfile.32.o: getputfile.c array.h language.h string-private.h ../config.h debug-private.h -getputfile.32.o: getputfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -getputfile.32.o: getputfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -getputfile.32.o: getputfile.c language-private.h ../cups/transcode.h thread-private.h +getputfile.32.o: getputfile.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +getputfile.32.o: getputfile.c pwg-private.h http-private.h ../cups/http.h md5-private.h +getputfile.32.o: getputfile.c ipp-private.h ../cups/ipp.h language-private.h +getputfile.32.o: getputfile.c ../cups/transcode.h thread-private.h globals.32.o: globals.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h globals.32.o: globals.c array.h language.h string-private.h ../config.h debug-private.h -globals.32.o: globals.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -globals.32.o: globals.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -globals.32.o: globals.c language-private.h ../cups/transcode.h thread-private.h +globals.32.o: globals.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +globals.32.o: globals.c pwg-private.h http-private.h ../cups/http.h md5-private.h +globals.32.o: globals.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +globals.32.o: globals.c thread-private.h http.32.o: http.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h http.32.o: http.c array.h language.h string-private.h ../config.h debug-private.h -http.32.o: http.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -http.32.o: http.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -http.32.o: http.c language-private.h ../cups/transcode.h thread-private.h +http.32.o: http.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +http.32.o: http.c http-private.h ../cups/http.h md5-private.h ipp-private.h +http.32.o: http.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h http-addr.32.o: http-addr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h http-addr.32.o: http-addr.c array.h language.h string-private.h ../config.h debug-private.h -http-addr.32.o: http-addr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -http-addr.32.o: http-addr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -http-addr.32.o: http-addr.c language-private.h ../cups/transcode.h thread-private.h +http-addr.32.o: http-addr.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +http-addr.32.o: http-addr.c pwg-private.h http-private.h ../cups/http.h md5-private.h +http-addr.32.o: http-addr.c ipp-private.h ../cups/ipp.h language-private.h +http-addr.32.o: http-addr.c ../cups/transcode.h thread-private.h http-addrlist.32.o: http-addrlist.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http-addrlist.32.o: http-addrlist.c http.h array.h language.h string-private.h ../config.h -http-addrlist.32.o: http-addrlist.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -http-addrlist.32.o: http-addrlist.c pwg-private.h http-private.h ../cups/http.h md5-private.h -http-addrlist.32.o: http-addrlist.c ipp-private.h ../cups/ipp.h language-private.h -http-addrlist.32.o: http-addrlist.c ../cups/transcode.h thread-private.h +http-addrlist.32.o: http-addrlist.c debug-private.h ../cups/versioning.h ppd-private.h +http-addrlist.32.o: http-addrlist.c ../cups/ppd.h cups.h pwg-private.h http-private.h +http-addrlist.32.o: http-addrlist.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +http-addrlist.32.o: http-addrlist.c language-private.h ../cups/transcode.h thread-private.h http-support.32.o: http-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http-support.32.o: http-support.c http.h array.h language.h string-private.h ../config.h -http-support.32.o: http-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -http-support.32.o: http-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h -http-support.32.o: http-support.c ipp-private.h ../cups/ipp.h language-private.h -http-support.32.o: http-support.c ../cups/transcode.h thread-private.h +http-support.32.o: http-support.c debug-private.h ../cups/versioning.h ppd-private.h +http-support.32.o: http-support.c ../cups/ppd.h cups.h pwg-private.h http-private.h +http-support.32.o: http-support.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +http-support.32.o: http-support.c language-private.h ../cups/transcode.h thread-private.h ipp.32.o: ipp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h array.h -ipp.32.o: ipp.c language.h string-private.h ../config.h debug-private.h ppd-private.h -ipp.32.o: ipp.c ../cups/ppd.h cups.h pwg-private.h http-private.h ../cups/http.h -ipp.32.o: ipp.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h -ipp.32.o: ipp.c ../cups/transcode.h thread-private.h +ipp.32.o: ipp.c language.h string-private.h ../config.h debug-private.h +ipp.32.o: ipp.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +ipp.32.o: ipp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ipp.32.o: ipp.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h ipp-support.32.o: ipp-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h ipp-support.32.o: ipp-support.c array.h language.h string-private.h ../config.h -ipp-support.32.o: ipp-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -ipp-support.32.o: ipp-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h -ipp-support.32.o: ipp-support.c ipp-private.h ../cups/ipp.h language-private.h -ipp-support.32.o: ipp-support.c ../cups/transcode.h thread-private.h +ipp-support.32.o: ipp-support.c debug-private.h ../cups/versioning.h ppd-private.h +ipp-support.32.o: ipp-support.c ../cups/ppd.h cups.h pwg-private.h http-private.h +ipp-support.32.o: ipp-support.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +ipp-support.32.o: ipp-support.c language-private.h ../cups/transcode.h thread-private.h langprintf.32.o: langprintf.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h langprintf.32.o: langprintf.c array.h language.h string-private.h ../config.h debug-private.h -langprintf.32.o: langprintf.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -langprintf.32.o: langprintf.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -langprintf.32.o: langprintf.c language-private.h ../cups/transcode.h thread-private.h +langprintf.32.o: langprintf.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +langprintf.32.o: langprintf.c pwg-private.h http-private.h ../cups/http.h md5-private.h +langprintf.32.o: langprintf.c ipp-private.h ../cups/ipp.h language-private.h +langprintf.32.o: langprintf.c ../cups/transcode.h thread-private.h language.32.o: language.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h language.32.o: language.c array.h language.h string-private.h ../config.h debug-private.h -language.32.o: language.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -language.32.o: language.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -language.32.o: language.c language-private.h ../cups/transcode.h thread-private.h +language.32.o: language.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +language.32.o: language.c pwg-private.h http-private.h ../cups/http.h md5-private.h +language.32.o: language.c ipp-private.h ../cups/ipp.h language-private.h +language.32.o: language.c ../cups/transcode.h thread-private.h localize.32.o: localize.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h localize.32.o: localize.c array.h language.h string-private.h ../config.h debug-private.h -localize.32.o: localize.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -localize.32.o: localize.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -localize.32.o: localize.c language-private.h ../cups/transcode.h thread-private.h +localize.32.o: localize.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +localize.32.o: localize.c pwg-private.h http-private.h ../cups/http.h md5-private.h +localize.32.o: localize.c ipp-private.h ../cups/ipp.h language-private.h +localize.32.o: localize.c ../cups/transcode.h thread-private.h mark.32.o: mark.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h mark.32.o: mark.c array.h language.h string-private.h ../config.h debug-private.h -mark.32.o: mark.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -mark.32.o: mark.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -mark.32.o: mark.c language-private.h ../cups/transcode.h thread-private.h +mark.32.o: mark.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +mark.32.o: mark.c http-private.h ../cups/http.h md5-private.h ipp-private.h +mark.32.o: mark.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h md5.32.o: md5.c md5-private.h string-private.h ../config.h md5passwd.32.o: md5passwd.c http-private.h ../config.h ../cups/http.h md5-private.h md5passwd.32.o: md5passwd.c ipp-private.h ../cups/ipp.h string-private.h notify.32.o: notify.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h notify.32.o: notify.c array.h language.h string-private.h ../config.h debug-private.h -notify.32.o: notify.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -notify.32.o: notify.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -notify.32.o: notify.c language-private.h ../cups/transcode.h thread-private.h +notify.32.o: notify.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +notify.32.o: notify.c pwg-private.h http-private.h ../cups/http.h md5-private.h +notify.32.o: notify.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +notify.32.o: notify.c thread-private.h options.32.o: options.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h options.32.o: options.c array.h language.h string-private.h ../config.h debug-private.h -options.32.o: options.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -options.32.o: options.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -options.32.o: options.c language-private.h ../cups/transcode.h thread-private.h -page.32.o: page.c string-private.h ../config.h debug-private.h ppd.h cups.h array.h -page.32.o: page.c versioning.h file.h +options.32.o: options.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +options.32.o: options.c pwg-private.h http-private.h ../cups/http.h md5-private.h +options.32.o: options.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +options.32.o: options.c thread-private.h +page.32.o: page.c string-private.h ../config.h debug-private.h ../cups/versioning.h +page.32.o: page.c ppd.h cups.h array.h versioning.h file.h ppd.32.o: ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h array.h -ppd.32.o: ppd.c language.h string-private.h ../config.h debug-private.h ppd-private.h -ppd.32.o: ppd.c ../cups/ppd.h cups.h pwg-private.h http-private.h ../cups/http.h -ppd.32.o: ppd.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h -ppd.32.o: ppd.c ../cups/transcode.h thread-private.h +ppd.32.o: ppd.c language.h string-private.h ../config.h debug-private.h +ppd.32.o: ppd.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +ppd.32.o: ppd.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ppd.32.o: ppd.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h ppd-cache.32.o: ppd-cache.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h ppd-cache.32.o: ppd-cache.c array.h language.h string-private.h ../config.h debug-private.h -ppd-cache.32.o: ppd-cache.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -ppd-cache.32.o: ppd-cache.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -ppd-cache.32.o: ppd-cache.c language-private.h ../cups/transcode.h thread-private.h +ppd-cache.32.o: ppd-cache.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +ppd-cache.32.o: ppd-cache.c pwg-private.h http-private.h ../cups/http.h md5-private.h +ppd-cache.32.o: ppd-cache.c ipp-private.h ../cups/ipp.h language-private.h +ppd-cache.32.o: ppd-cache.c ../cups/transcode.h thread-private.h pwg-media.32.o: pwg-media.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h pwg-media.32.o: pwg-media.c array.h language.h string-private.h ../config.h debug-private.h -pwg-media.32.o: pwg-media.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -pwg-media.32.o: pwg-media.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -pwg-media.32.o: pwg-media.c language-private.h ../cups/transcode.h thread-private.h +pwg-media.32.o: pwg-media.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +pwg-media.32.o: pwg-media.c pwg-private.h http-private.h ../cups/http.h md5-private.h +pwg-media.32.o: pwg-media.c ipp-private.h ../cups/ipp.h language-private.h +pwg-media.32.o: pwg-media.c ../cups/transcode.h thread-private.h request.32.o: request.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h request.32.o: request.c array.h language.h string-private.h ../config.h debug-private.h -request.32.o: request.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -request.32.o: request.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -request.32.o: request.c language-private.h ../cups/transcode.h thread-private.h +request.32.o: request.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +request.32.o: request.c pwg-private.h http-private.h ../cups/http.h md5-private.h +request.32.o: request.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +request.32.o: request.c thread-private.h sidechannel.32.o: sidechannel.c sidechannel.h versioning.h string-private.h ../config.h -sidechannel.32.o: sidechannel.c debug-private.h +sidechannel.32.o: sidechannel.c debug-private.h ../cups/versioning.h snmp.32.o: snmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h snmp.32.o: snmp.c array.h language.h string-private.h ../config.h debug-private.h -snmp.32.o: snmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -snmp.32.o: snmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -snmp.32.o: snmp.c language-private.h ../cups/transcode.h thread-private.h +snmp.32.o: snmp.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +snmp.32.o: snmp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +snmp.32.o: snmp.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h snmp.32.o: snmp.c snmp-private.h snprintf.32.o: snprintf.c string-private.h ../config.h -string.32.o: string.c string-private.h ../config.h debug-private.h thread-private.h -string.32.o: string.c array.h versioning.h +string.32.o: string.c string-private.h ../config.h debug-private.h ../cups/versioning.h +string.32.o: string.c thread-private.h array.h versioning.h tempfile.32.o: tempfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h tempfile.32.o: tempfile.c array.h language.h string-private.h ../config.h debug-private.h -tempfile.32.o: tempfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -tempfile.32.o: tempfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -tempfile.32.o: tempfile.c language-private.h ../cups/transcode.h thread-private.h +tempfile.32.o: tempfile.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +tempfile.32.o: tempfile.c pwg-private.h http-private.h ../cups/http.h md5-private.h +tempfile.32.o: tempfile.c ipp-private.h ../cups/ipp.h language-private.h +tempfile.32.o: tempfile.c ../cups/transcode.h thread-private.h thread.32.o: thread.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h thread.32.o: thread.c array.h language.h string-private.h ../config.h debug-private.h -thread.32.o: thread.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -thread.32.o: thread.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -thread.32.o: thread.c language-private.h ../cups/transcode.h thread-private.h +thread.32.o: thread.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +thread.32.o: thread.c pwg-private.h http-private.h ../cups/http.h md5-private.h +thread.32.o: thread.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +thread.32.o: thread.c thread-private.h transcode.32.o: transcode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h transcode.32.o: transcode.c array.h language.h string-private.h ../config.h debug-private.h -transcode.32.o: transcode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -transcode.32.o: transcode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -transcode.32.o: transcode.c language-private.h ../cups/transcode.h thread-private.h +transcode.32.o: transcode.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +transcode.32.o: transcode.c pwg-private.h http-private.h ../cups/http.h md5-private.h +transcode.32.o: transcode.c ipp-private.h ../cups/ipp.h language-private.h +transcode.32.o: transcode.c ../cups/transcode.h thread-private.h usersys.32.o: usersys.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h usersys.32.o: usersys.c array.h language.h string-private.h ../config.h debug-private.h -usersys.32.o: usersys.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -usersys.32.o: usersys.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -usersys.32.o: usersys.c language-private.h ../cups/transcode.h thread-private.h +usersys.32.o: usersys.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +usersys.32.o: usersys.c pwg-private.h http-private.h ../cups/http.h md5-private.h +usersys.32.o: usersys.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +usersys.32.o: usersys.c thread-private.h util.32.o: util.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h util.32.o: util.c array.h language.h string-private.h ../config.h debug-private.h -util.32.o: util.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -util.32.o: util.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -util.32.o: util.c language-private.h ../cups/transcode.h thread-private.h +util.32.o: util.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +util.32.o: util.c http-private.h ../cups/http.h md5-private.h ipp-private.h +util.32.o: util.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h testadmin.32.o: testadmin.c adminutil.h cups.h string-private.h ../config.h -testarray.32.o: testarray.c string-private.h ../config.h debug-private.h array.h -testarray.32.o: testarray.c versioning.h dir.h +testarray.32.o: testarray.c string-private.h ../config.h debug-private.h +testarray.32.o: testarray.c ../cups/versioning.h array.h versioning.h dir.h testconflicts.32.o: testconflicts.c cups.h ppd.h array.h versioning.h file.h string-private.h testconflicts.32.o: testconflicts.c ../config.h testcups.32.o: testcups.c string-private.h ../config.h cups.h ppd.h array.h versioning.h testcups.32.o: testcups.c file.h -testfile.32.o: testfile.c string-private.h ../config.h debug-private.h file.h versioning.h +testfile.32.o: testfile.c string-private.h ../config.h debug-private.h ../cups/versioning.h +testfile.32.o: testfile.c file.h versioning.h testhttp.32.o: testhttp.c string-private.h ../config.h http-private.h ../cups/http.h testhttp.32.o: testhttp.c md5-private.h ipp-private.h ../cups/ipp.h testi18n.32.o: testi18n.c string-private.h ../config.h language-private.h @@ -462,243 +512,269 @@ testipp.32.o: testipp.c ../cups/ipp.h testoptions.32.o: testoptions.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testoptions.32.o: testoptions.c array.h language.h string-private.h ../config.h -testoptions.32.o: testoptions.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -testoptions.32.o: testoptions.c pwg-private.h http-private.h ../cups/http.h md5-private.h -testoptions.32.o: testoptions.c ipp-private.h ../cups/ipp.h language-private.h -testoptions.32.o: testoptions.c ../cups/transcode.h thread-private.h +testoptions.32.o: testoptions.c debug-private.h ../cups/versioning.h ppd-private.h +testoptions.32.o: testoptions.c ../cups/ppd.h cups.h pwg-private.h http-private.h +testoptions.32.o: testoptions.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +testoptions.32.o: testoptions.c language-private.h ../cups/transcode.h thread-private.h testlang.32.o: testlang.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testlang.32.o: testlang.c array.h language.h string-private.h ../config.h debug-private.h -testlang.32.o: testlang.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testlang.32.o: testlang.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testlang.32.o: testlang.c language-private.h ../cups/transcode.h thread-private.h +testlang.32.o: testlang.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testlang.32.o: testlang.c pwg-private.h http-private.h ../cups/http.h md5-private.h +testlang.32.o: testlang.c ipp-private.h ../cups/ipp.h language-private.h +testlang.32.o: testlang.c ../cups/transcode.h thread-private.h testppd.32.o: testppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testppd.32.o: testppd.c array.h language.h string-private.h ../config.h debug-private.h -testppd.32.o: testppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testppd.32.o: testppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testppd.32.o: testppd.c language-private.h ../cups/transcode.h thread-private.h +testppd.32.o: testppd.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testppd.32.o: testppd.c pwg-private.h http-private.h ../cups/http.h md5-private.h +testppd.32.o: testppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +testppd.32.o: testppd.c thread-private.h testpwg.32.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testpwg.32.o: testpwg.c array.h language.h ../cups/ppd.h cups.h pwg-private.h testpwg.32.o: testpwg.c file-private.h cups-private.h string-private.h ../config.h -testpwg.32.o: testpwg.c debug-private.h http-private.h ../cups/http.h md5-private.h -testpwg.32.o: testpwg.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h -testpwg.32.o: testpwg.c thread-private.h +testpwg.32.o: testpwg.c debug-private.h ../cups/versioning.h http-private.h ../cups/http.h +testpwg.32.o: testpwg.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h +testpwg.32.o: testpwg.c ../cups/transcode.h thread-private.h testsnmp.32.o: testsnmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testsnmp.32.o: testsnmp.c array.h language.h string-private.h ../config.h debug-private.h -testsnmp.32.o: testsnmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testsnmp.32.o: testsnmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testsnmp.32.o: testsnmp.c language-private.h ../cups/transcode.h thread-private.h -testsnmp.32.o: testsnmp.c snmp-private.h +testsnmp.32.o: testsnmp.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testsnmp.32.o: testsnmp.c pwg-private.h http-private.h ../cups/http.h md5-private.h +testsnmp.32.o: testsnmp.c ipp-private.h ../cups/ipp.h language-private.h +testsnmp.32.o: testsnmp.c ../cups/transcode.h thread-private.h snmp-private.h # DO NOT DELETE adminutil.64.o: adminutil.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h adminutil.64.o: adminutil.c array.h language.h string-private.h ../config.h debug-private.h -adminutil.64.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -adminutil.64.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -adminutil.64.o: adminutil.c language-private.h ../cups/transcode.h thread-private.h -adminutil.64.o: adminutil.c adminutil.h -array.64.o: array.c string-private.h ../config.h debug-private.h array-private.h array.h -array.64.o: array.c versioning.h +adminutil.64.o: adminutil.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +adminutil.64.o: adminutil.c pwg-private.h http-private.h ../cups/http.h md5-private.h +adminutil.64.o: adminutil.c ipp-private.h ../cups/ipp.h language-private.h +adminutil.64.o: adminutil.c ../cups/transcode.h thread-private.h adminutil.h +array.64.o: array.c string-private.h ../config.h debug-private.h ../cups/versioning.h +array.64.o: array.c array-private.h ../cups/array.h versioning.h attr.64.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.64.o: attr.c array.h language.h string-private.h ../config.h debug-private.h -attr.64.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -attr.64.o: attr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -attr.64.o: attr.c language-private.h ../cups/transcode.h thread-private.h +attr.64.o: attr.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +attr.64.o: attr.c http-private.h ../cups/http.h md5-private.h ipp-private.h +attr.64.o: attr.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h auth.64.o: auth.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h auth.64.o: auth.c array.h language.h string-private.h ../config.h debug-private.h -auth.64.o: auth.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -auth.64.o: auth.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -auth.64.o: auth.c language-private.h ../cups/transcode.h thread-private.h +auth.64.o: auth.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +auth.64.o: auth.c http-private.h ../cups/http.h md5-private.h ipp-private.h +auth.64.o: auth.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h backchannel.64.o: backchannel.c cups.h backend.64.o: backend.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h backend.64.o: backend.c array.h language.h string-private.h ../config.h debug-private.h -backend.64.o: backend.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -backend.64.o: backend.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -backend.64.o: backend.c language-private.h ../cups/transcode.h thread-private.h backend.h +backend.64.o: backend.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +backend.64.o: backend.c pwg-private.h http-private.h ../cups/http.h md5-private.h +backend.64.o: backend.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +backend.64.o: backend.c thread-private.h backend.h conflicts.64.o: conflicts.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h conflicts.64.o: conflicts.c array.h language.h string-private.h ../config.h debug-private.h -conflicts.64.o: conflicts.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -conflicts.64.o: conflicts.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -conflicts.64.o: conflicts.c language-private.h ../cups/transcode.h thread-private.h +conflicts.64.o: conflicts.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +conflicts.64.o: conflicts.c pwg-private.h http-private.h ../cups/http.h md5-private.h +conflicts.64.o: conflicts.c ipp-private.h ../cups/ipp.h language-private.h +conflicts.64.o: conflicts.c ../cups/transcode.h thread-private.h custom.64.o: custom.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h custom.64.o: custom.c array.h language.h string-private.h ../config.h debug-private.h -custom.64.o: custom.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -custom.64.o: custom.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -custom.64.o: custom.c language-private.h ../cups/transcode.h thread-private.h +custom.64.o: custom.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +custom.64.o: custom.c pwg-private.h http-private.h ../cups/http.h md5-private.h +custom.64.o: custom.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +custom.64.o: custom.c thread-private.h debug.64.o: debug.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h debug.64.o: debug.c array.h language.h string-private.h ../config.h debug-private.h -debug.64.o: debug.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -debug.64.o: debug.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -debug.64.o: debug.c language-private.h ../cups/transcode.h thread-private.h +debug.64.o: debug.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +debug.64.o: debug.c pwg-private.h http-private.h ../cups/http.h md5-private.h +debug.64.o: debug.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +debug.64.o: debug.c thread-private.h dest.64.o: dest.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h dest.64.o: dest.c array.h language.h string-private.h ../config.h debug-private.h -dest.64.o: dest.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -dest.64.o: dest.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -dest.64.o: dest.c language-private.h ../cups/transcode.h thread-private.h -dir.64.o: dir.c string-private.h ../config.h debug-private.h dir.h versioning.h +dest.64.o: dest.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +dest.64.o: dest.c http-private.h ../cups/http.h md5-private.h ipp-private.h +dest.64.o: dest.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h +dir.64.o: dir.c string-private.h ../config.h debug-private.h ../cups/versioning.h +dir.64.o: dir.c dir.h versioning.h emit.64.o: emit.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h emit.64.o: emit.c array.h language.h string-private.h ../config.h debug-private.h -emit.64.o: emit.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -emit.64.o: emit.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -emit.64.o: emit.c language-private.h ../cups/transcode.h thread-private.h +emit.64.o: emit.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +emit.64.o: emit.c http-private.h ../cups/http.h md5-private.h ipp-private.h +emit.64.o: emit.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h encode.64.o: encode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h encode.64.o: encode.c array.h language.h string-private.h ../config.h debug-private.h -encode.64.o: encode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -encode.64.o: encode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -encode.64.o: encode.c language-private.h ../cups/transcode.h thread-private.h +encode.64.o: encode.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +encode.64.o: encode.c pwg-private.h http-private.h ../cups/http.h md5-private.h +encode.64.o: encode.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +encode.64.o: encode.c thread-private.h file.64.o: file.c file-private.h cups-private.h ../cups/cups.h file.h versioning.h file.64.o: file.c ipp.h http.h array.h language.h string-private.h ../config.h -file.64.o: file.c debug-private.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h -file.64.o: file.c http-private.h ../cups/http.h md5-private.h ipp-private.h -file.64.o: file.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h +file.64.o: file.c debug-private.h ../cups/versioning.h ppd-private.h ../cups/ppd.h +file.64.o: file.c cups.h pwg-private.h http-private.h ../cups/http.h md5-private.h +file.64.o: file.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +file.64.o: file.c thread-private.h getdevices.64.o: getdevices.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h getdevices.64.o: getdevices.c array.h language.h string-private.h ../config.h debug-private.h -getdevices.64.o: getdevices.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -getdevices.64.o: getdevices.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -getdevices.64.o: getdevices.c language-private.h ../cups/transcode.h thread-private.h +getdevices.64.o: getdevices.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +getdevices.64.o: getdevices.c pwg-private.h http-private.h ../cups/http.h md5-private.h +getdevices.64.o: getdevices.c ipp-private.h ../cups/ipp.h language-private.h +getdevices.64.o: getdevices.c ../cups/transcode.h thread-private.h getifaddrs.64.o: getifaddrs.c http-private.h ../config.h ../cups/http.h md5-private.h getifaddrs.64.o: getifaddrs.c ipp-private.h ../cups/ipp.h getputfile.64.o: getputfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h getputfile.64.o: getputfile.c array.h language.h string-private.h ../config.h debug-private.h -getputfile.64.o: getputfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -getputfile.64.o: getputfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -getputfile.64.o: getputfile.c language-private.h ../cups/transcode.h thread-private.h +getputfile.64.o: getputfile.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +getputfile.64.o: getputfile.c pwg-private.h http-private.h ../cups/http.h md5-private.h +getputfile.64.o: getputfile.c ipp-private.h ../cups/ipp.h language-private.h +getputfile.64.o: getputfile.c ../cups/transcode.h thread-private.h globals.64.o: globals.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h globals.64.o: globals.c array.h language.h string-private.h ../config.h debug-private.h -globals.64.o: globals.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -globals.64.o: globals.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -globals.64.o: globals.c language-private.h ../cups/transcode.h thread-private.h +globals.64.o: globals.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +globals.64.o: globals.c pwg-private.h http-private.h ../cups/http.h md5-private.h +globals.64.o: globals.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +globals.64.o: globals.c thread-private.h http.64.o: http.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h http.64.o: http.c array.h language.h string-private.h ../config.h debug-private.h -http.64.o: http.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -http.64.o: http.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -http.64.o: http.c language-private.h ../cups/transcode.h thread-private.h +http.64.o: http.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +http.64.o: http.c http-private.h ../cups/http.h md5-private.h ipp-private.h +http.64.o: http.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h http-addr.64.o: http-addr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h http-addr.64.o: http-addr.c array.h language.h string-private.h ../config.h debug-private.h -http-addr.64.o: http-addr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -http-addr.64.o: http-addr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -http-addr.64.o: http-addr.c language-private.h ../cups/transcode.h thread-private.h +http-addr.64.o: http-addr.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +http-addr.64.o: http-addr.c pwg-private.h http-private.h ../cups/http.h md5-private.h +http-addr.64.o: http-addr.c ipp-private.h ../cups/ipp.h language-private.h +http-addr.64.o: http-addr.c ../cups/transcode.h thread-private.h http-addrlist.64.o: http-addrlist.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http-addrlist.64.o: http-addrlist.c http.h array.h language.h string-private.h ../config.h -http-addrlist.64.o: http-addrlist.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -http-addrlist.64.o: http-addrlist.c pwg-private.h http-private.h ../cups/http.h md5-private.h -http-addrlist.64.o: http-addrlist.c ipp-private.h ../cups/ipp.h language-private.h -http-addrlist.64.o: http-addrlist.c ../cups/transcode.h thread-private.h +http-addrlist.64.o: http-addrlist.c debug-private.h ../cups/versioning.h ppd-private.h +http-addrlist.64.o: http-addrlist.c ../cups/ppd.h cups.h pwg-private.h http-private.h +http-addrlist.64.o: http-addrlist.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +http-addrlist.64.o: http-addrlist.c language-private.h ../cups/transcode.h thread-private.h http-support.64.o: http-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http-support.64.o: http-support.c http.h array.h language.h string-private.h ../config.h -http-support.64.o: http-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -http-support.64.o: http-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h -http-support.64.o: http-support.c ipp-private.h ../cups/ipp.h language-private.h -http-support.64.o: http-support.c ../cups/transcode.h thread-private.h +http-support.64.o: http-support.c debug-private.h ../cups/versioning.h ppd-private.h +http-support.64.o: http-support.c ../cups/ppd.h cups.h pwg-private.h http-private.h +http-support.64.o: http-support.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +http-support.64.o: http-support.c language-private.h ../cups/transcode.h thread-private.h ipp.64.o: ipp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h array.h -ipp.64.o: ipp.c language.h string-private.h ../config.h debug-private.h ppd-private.h -ipp.64.o: ipp.c ../cups/ppd.h cups.h pwg-private.h http-private.h ../cups/http.h -ipp.64.o: ipp.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h -ipp.64.o: ipp.c ../cups/transcode.h thread-private.h +ipp.64.o: ipp.c language.h string-private.h ../config.h debug-private.h +ipp.64.o: ipp.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +ipp.64.o: ipp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ipp.64.o: ipp.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h ipp-support.64.o: ipp-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h ipp-support.64.o: ipp-support.c array.h language.h string-private.h ../config.h -ipp-support.64.o: ipp-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -ipp-support.64.o: ipp-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h -ipp-support.64.o: ipp-support.c ipp-private.h ../cups/ipp.h language-private.h -ipp-support.64.o: ipp-support.c ../cups/transcode.h thread-private.h +ipp-support.64.o: ipp-support.c debug-private.h ../cups/versioning.h ppd-private.h +ipp-support.64.o: ipp-support.c ../cups/ppd.h cups.h pwg-private.h http-private.h +ipp-support.64.o: ipp-support.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +ipp-support.64.o: ipp-support.c language-private.h ../cups/transcode.h thread-private.h langprintf.64.o: langprintf.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h langprintf.64.o: langprintf.c array.h language.h string-private.h ../config.h debug-private.h -langprintf.64.o: langprintf.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -langprintf.64.o: langprintf.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -langprintf.64.o: langprintf.c language-private.h ../cups/transcode.h thread-private.h +langprintf.64.o: langprintf.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +langprintf.64.o: langprintf.c pwg-private.h http-private.h ../cups/http.h md5-private.h +langprintf.64.o: langprintf.c ipp-private.h ../cups/ipp.h language-private.h +langprintf.64.o: langprintf.c ../cups/transcode.h thread-private.h language.64.o: language.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h language.64.o: language.c array.h language.h string-private.h ../config.h debug-private.h -language.64.o: language.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -language.64.o: language.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -language.64.o: language.c language-private.h ../cups/transcode.h thread-private.h +language.64.o: language.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +language.64.o: language.c pwg-private.h http-private.h ../cups/http.h md5-private.h +language.64.o: language.c ipp-private.h ../cups/ipp.h language-private.h +language.64.o: language.c ../cups/transcode.h thread-private.h localize.64.o: localize.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h localize.64.o: localize.c array.h language.h string-private.h ../config.h debug-private.h -localize.64.o: localize.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -localize.64.o: localize.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -localize.64.o: localize.c language-private.h ../cups/transcode.h thread-private.h +localize.64.o: localize.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +localize.64.o: localize.c pwg-private.h http-private.h ../cups/http.h md5-private.h +localize.64.o: localize.c ipp-private.h ../cups/ipp.h language-private.h +localize.64.o: localize.c ../cups/transcode.h thread-private.h mark.64.o: mark.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h mark.64.o: mark.c array.h language.h string-private.h ../config.h debug-private.h -mark.64.o: mark.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -mark.64.o: mark.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -mark.64.o: mark.c language-private.h ../cups/transcode.h thread-private.h +mark.64.o: mark.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +mark.64.o: mark.c http-private.h ../cups/http.h md5-private.h ipp-private.h +mark.64.o: mark.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h md5.64.o: md5.c md5-private.h string-private.h ../config.h md5passwd.64.o: md5passwd.c http-private.h ../config.h ../cups/http.h md5-private.h md5passwd.64.o: md5passwd.c ipp-private.h ../cups/ipp.h string-private.h notify.64.o: notify.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h notify.64.o: notify.c array.h language.h string-private.h ../config.h debug-private.h -notify.64.o: notify.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -notify.64.o: notify.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -notify.64.o: notify.c language-private.h ../cups/transcode.h thread-private.h +notify.64.o: notify.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +notify.64.o: notify.c pwg-private.h http-private.h ../cups/http.h md5-private.h +notify.64.o: notify.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +notify.64.o: notify.c thread-private.h options.64.o: options.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h options.64.o: options.c array.h language.h string-private.h ../config.h debug-private.h -options.64.o: options.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -options.64.o: options.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -options.64.o: options.c language-private.h ../cups/transcode.h thread-private.h -page.64.o: page.c string-private.h ../config.h debug-private.h ppd.h cups.h array.h -page.64.o: page.c versioning.h file.h +options.64.o: options.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +options.64.o: options.c pwg-private.h http-private.h ../cups/http.h md5-private.h +options.64.o: options.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +options.64.o: options.c thread-private.h +page.64.o: page.c string-private.h ../config.h debug-private.h ../cups/versioning.h +page.64.o: page.c ppd.h cups.h array.h versioning.h file.h ppd.64.o: ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h array.h -ppd.64.o: ppd.c language.h string-private.h ../config.h debug-private.h ppd-private.h -ppd.64.o: ppd.c ../cups/ppd.h cups.h pwg-private.h http-private.h ../cups/http.h -ppd.64.o: ppd.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h -ppd.64.o: ppd.c ../cups/transcode.h thread-private.h +ppd.64.o: ppd.c language.h string-private.h ../config.h debug-private.h +ppd.64.o: ppd.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +ppd.64.o: ppd.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ppd.64.o: ppd.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h ppd-cache.64.o: ppd-cache.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h ppd-cache.64.o: ppd-cache.c array.h language.h string-private.h ../config.h debug-private.h -ppd-cache.64.o: ppd-cache.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -ppd-cache.64.o: ppd-cache.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -ppd-cache.64.o: ppd-cache.c language-private.h ../cups/transcode.h thread-private.h +ppd-cache.64.o: ppd-cache.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +ppd-cache.64.o: ppd-cache.c pwg-private.h http-private.h ../cups/http.h md5-private.h +ppd-cache.64.o: ppd-cache.c ipp-private.h ../cups/ipp.h language-private.h +ppd-cache.64.o: ppd-cache.c ../cups/transcode.h thread-private.h pwg-media.64.o: pwg-media.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h pwg-media.64.o: pwg-media.c array.h language.h string-private.h ../config.h debug-private.h -pwg-media.64.o: pwg-media.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -pwg-media.64.o: pwg-media.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -pwg-media.64.o: pwg-media.c language-private.h ../cups/transcode.h thread-private.h +pwg-media.64.o: pwg-media.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +pwg-media.64.o: pwg-media.c pwg-private.h http-private.h ../cups/http.h md5-private.h +pwg-media.64.o: pwg-media.c ipp-private.h ../cups/ipp.h language-private.h +pwg-media.64.o: pwg-media.c ../cups/transcode.h thread-private.h request.64.o: request.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h request.64.o: request.c array.h language.h string-private.h ../config.h debug-private.h -request.64.o: request.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -request.64.o: request.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -request.64.o: request.c language-private.h ../cups/transcode.h thread-private.h +request.64.o: request.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +request.64.o: request.c pwg-private.h http-private.h ../cups/http.h md5-private.h +request.64.o: request.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +request.64.o: request.c thread-private.h sidechannel.64.o: sidechannel.c sidechannel.h versioning.h string-private.h ../config.h -sidechannel.64.o: sidechannel.c debug-private.h +sidechannel.64.o: sidechannel.c debug-private.h ../cups/versioning.h snmp.64.o: snmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h snmp.64.o: snmp.c array.h language.h string-private.h ../config.h debug-private.h -snmp.64.o: snmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -snmp.64.o: snmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -snmp.64.o: snmp.c language-private.h ../cups/transcode.h thread-private.h +snmp.64.o: snmp.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +snmp.64.o: snmp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +snmp.64.o: snmp.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h snmp.64.o: snmp.c snmp-private.h snprintf.64.o: snprintf.c string-private.h ../config.h -string.64.o: string.c string-private.h ../config.h debug-private.h thread-private.h -string.64.o: string.c array.h versioning.h +string.64.o: string.c string-private.h ../config.h debug-private.h ../cups/versioning.h +string.64.o: string.c thread-private.h array.h versioning.h tempfile.64.o: tempfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h tempfile.64.o: tempfile.c array.h language.h string-private.h ../config.h debug-private.h -tempfile.64.o: tempfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -tempfile.64.o: tempfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -tempfile.64.o: tempfile.c language-private.h ../cups/transcode.h thread-private.h +tempfile.64.o: tempfile.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +tempfile.64.o: tempfile.c pwg-private.h http-private.h ../cups/http.h md5-private.h +tempfile.64.o: tempfile.c ipp-private.h ../cups/ipp.h language-private.h +tempfile.64.o: tempfile.c ../cups/transcode.h thread-private.h thread.64.o: thread.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h thread.64.o: thread.c array.h language.h string-private.h ../config.h debug-private.h -thread.64.o: thread.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -thread.64.o: thread.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -thread.64.o: thread.c language-private.h ../cups/transcode.h thread-private.h +thread.64.o: thread.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +thread.64.o: thread.c pwg-private.h http-private.h ../cups/http.h md5-private.h +thread.64.o: thread.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +thread.64.o: thread.c thread-private.h transcode.64.o: transcode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h transcode.64.o: transcode.c array.h language.h string-private.h ../config.h debug-private.h -transcode.64.o: transcode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -transcode.64.o: transcode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -transcode.64.o: transcode.c language-private.h ../cups/transcode.h thread-private.h +transcode.64.o: transcode.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +transcode.64.o: transcode.c pwg-private.h http-private.h ../cups/http.h md5-private.h +transcode.64.o: transcode.c ipp-private.h ../cups/ipp.h language-private.h +transcode.64.o: transcode.c ../cups/transcode.h thread-private.h usersys.64.o: usersys.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h usersys.64.o: usersys.c array.h language.h string-private.h ../config.h debug-private.h -usersys.64.o: usersys.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -usersys.64.o: usersys.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -usersys.64.o: usersys.c language-private.h ../cups/transcode.h thread-private.h +usersys.64.o: usersys.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +usersys.64.o: usersys.c pwg-private.h http-private.h ../cups/http.h md5-private.h +usersys.64.o: usersys.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +usersys.64.o: usersys.c thread-private.h util.64.o: util.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h util.64.o: util.c array.h language.h string-private.h ../config.h debug-private.h -util.64.o: util.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -util.64.o: util.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -util.64.o: util.c language-private.h ../cups/transcode.h thread-private.h +util.64.o: util.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h +util.64.o: util.c http-private.h ../cups/http.h md5-private.h ipp-private.h +util.64.o: util.c ../cups/ipp.h language-private.h ../cups/transcode.h thread-private.h testadmin.64.o: testadmin.c adminutil.h cups.h string-private.h ../config.h -testarray.64.o: testarray.c string-private.h ../config.h debug-private.h array.h -testarray.64.o: testarray.c versioning.h dir.h +testarray.64.o: testarray.c string-private.h ../config.h debug-private.h +testarray.64.o: testarray.c ../cups/versioning.h array.h versioning.h dir.h testconflicts.64.o: testconflicts.c cups.h ppd.h array.h versioning.h file.h string-private.h testconflicts.64.o: testconflicts.c ../config.h testcups.64.o: testcups.c string-private.h ../config.h cups.h ppd.h array.h versioning.h testcups.64.o: testcups.c file.h -testfile.64.o: testfile.c string-private.h ../config.h debug-private.h file.h versioning.h +testfile.64.o: testfile.c string-private.h ../config.h debug-private.h ../cups/versioning.h +testfile.64.o: testfile.c file.h versioning.h testhttp.64.o: testhttp.c string-private.h ../config.h http-private.h ../cups/http.h testhttp.64.o: testhttp.c md5-private.h ipp-private.h ../cups/ipp.h testi18n.64.o: testi18n.c string-private.h ../config.h language-private.h @@ -707,29 +783,31 @@ testipp.64.o: testipp.c ../cups/ipp.h testoptions.64.o: testoptions.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testoptions.64.o: testoptions.c array.h language.h string-private.h ../config.h -testoptions.64.o: testoptions.c debug-private.h ppd-private.h ../cups/ppd.h cups.h -testoptions.64.o: testoptions.c pwg-private.h http-private.h ../cups/http.h md5-private.h -testoptions.64.o: testoptions.c ipp-private.h ../cups/ipp.h language-private.h -testoptions.64.o: testoptions.c ../cups/transcode.h thread-private.h +testoptions.64.o: testoptions.c debug-private.h ../cups/versioning.h ppd-private.h +testoptions.64.o: testoptions.c ../cups/ppd.h cups.h pwg-private.h http-private.h +testoptions.64.o: testoptions.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h +testoptions.64.o: testoptions.c language-private.h ../cups/transcode.h thread-private.h testlang.64.o: testlang.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testlang.64.o: testlang.c array.h language.h string-private.h ../config.h debug-private.h -testlang.64.o: testlang.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testlang.64.o: testlang.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testlang.64.o: testlang.c language-private.h ../cups/transcode.h thread-private.h +testlang.64.o: testlang.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testlang.64.o: testlang.c pwg-private.h http-private.h ../cups/http.h md5-private.h +testlang.64.o: testlang.c ipp-private.h ../cups/ipp.h language-private.h +testlang.64.o: testlang.c ../cups/transcode.h thread-private.h testppd.64.o: testppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testppd.64.o: testppd.c array.h language.h string-private.h ../config.h debug-private.h -testppd.64.o: testppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testppd.64.o: testppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testppd.64.o: testppd.c language-private.h ../cups/transcode.h thread-private.h +testppd.64.o: testppd.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testppd.64.o: testppd.c pwg-private.h http-private.h ../cups/http.h md5-private.h +testppd.64.o: testppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +testppd.64.o: testppd.c thread-private.h testpwg.64.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testpwg.64.o: testpwg.c array.h language.h ../cups/ppd.h cups.h pwg-private.h testpwg.64.o: testpwg.c file-private.h cups-private.h string-private.h ../config.h -testpwg.64.o: testpwg.c debug-private.h http-private.h ../cups/http.h md5-private.h -testpwg.64.o: testpwg.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h -testpwg.64.o: testpwg.c thread-private.h +testpwg.64.o: testpwg.c debug-private.h ../cups/versioning.h http-private.h ../cups/http.h +testpwg.64.o: testpwg.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h +testpwg.64.o: testpwg.c ../cups/transcode.h thread-private.h testsnmp.64.o: testsnmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h testsnmp.64.o: testsnmp.c array.h language.h string-private.h ../config.h debug-private.h -testsnmp.64.o: testsnmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h -testsnmp.64.o: testsnmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h -testsnmp.64.o: testsnmp.c language-private.h ../cups/transcode.h thread-private.h -testsnmp.64.o: testsnmp.c snmp-private.h +testsnmp.64.o: testsnmp.c ../cups/versioning.h ppd-private.h ../cups/ppd.h cups.h +testsnmp.64.o: testsnmp.c pwg-private.h http-private.h ../cups/http.h md5-private.h +testsnmp.64.o: testsnmp.c ipp-private.h ../cups/ipp.h language-private.h +testsnmp.64.o: testsnmp.c ../cups/transcode.h thread-private.h snmp-private.h diff -Nru cups-1.5.2/cups/dest.c cups-1.5.3/cups/dest.c --- cups-1.5.2/cups/dest.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/cups/dest.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: dest.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: dest.c 10379 2012-03-23 22:16:22Z mike $" * * User-defined destination (and option) support for CUPS. * @@ -1225,7 +1225,7 @@ #endif /* WIN32 */ char filename[1024]; /* lpoptions file */ int num_temps; /* Number of temporary destinations */ - cups_dest_t *temps, /* Temporary destinations */ + cups_dest_t *temps = NULL, /* Temporary destinations */ *temp; /* Current temporary dest */ const char *val; /* Value of temporary option */ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ @@ -2165,5 +2165,5 @@ /* - * End of "$Id: dest.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: dest.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/cups/globals.c cups-1.5.3/cups/globals.c --- cups-1.5.2/cups/globals.c 2011-03-11 06:53:55.000000000 +0100 +++ cups-1.5.3/cups/globals.c 2012-04-23 23:52:02.000000000 +0200 @@ -1,5 +1,5 @@ /* - * "$Id: globals.c 9594 2011-03-11 05:53:55Z mike $" + * "$Id: globals.c 10436 2012-04-23 21:52:02Z mike $" * * Global variable access routines for CUPS. * @@ -43,8 +43,10 @@ static pthread_once_t cups_globals_key_once = PTHREAD_ONCE_INIT; /* One-time initialization object */ #endif /* HAVE_PTHREAD_H */ +#if defined(HAVE_PTHREAD_H) || defined(WIN32) static _cups_mutex_t cups_global_mutex = _CUPS_MUTEX_INITIALIZER; /* Global critical section */ +#endif /* HAVE_PTHREAD_H || WIN32 */ /* @@ -52,7 +54,9 @@ */ static _cups_globals_t *cups_globals_alloc(void); +#if defined(HAVE_PTHREAD_H) || defined(WIN32) static void cups_globals_free(_cups_globals_t *g); +#endif /* HAVE_PTHREAD_H || WIN32 */ #ifdef HAVE_PTHREAD_H static void cups_globals_init(void); #endif /* HAVE_PTHREAD_H */ @@ -298,6 +302,7 @@ * 'cups_globals_free()' - Free global data. */ +#if defined(HAVE_PTHREAD_H) || defined(WIN32) static void cups_globals_free(_cups_globals_t *cg) /* I - Pointer to global data */ { @@ -330,6 +335,7 @@ free(cg); } +#endif /* HAVE_PTHREAD_H || WIN32 */ #ifdef HAVE_PTHREAD_H @@ -350,5 +356,5 @@ /* - * End of "$Id: globals.c 9594 2011-03-11 05:53:55Z mike $". + * End of "$Id: globals.c 10436 2012-04-23 21:52:02Z mike $". */ diff -Nru cups-1.5.2/cups/http.c cups-1.5.3/cups/http.c --- cups-1.5.2/cups/http.c 2011-12-16 08:16:04.000000000 +0100 +++ cups-1.5.3/cups/http.c 2012-05-05 00:52:56.000000000 +0200 @@ -1,5 +1,5 @@ /* - * "$Id: http.c 10154 2011-12-16 07:16:04Z mike $" + * "$Id: http.c 10450 2012-05-04 22:52:56Z mike $" * * HTTP routines for CUPS. * @@ -2121,14 +2121,10 @@ { if (http->data_encoding == HTTP_ENCODE_CHUNKED) httpGets(len, sizeof(len), http); - - if (http->data_encoding != HTTP_ENCODE_CHUNKED) - { - if (http->state == HTTP_POST_RECV) - http->state ++; - else - http->state = HTTP_WAITING; - } + else if (http->state == HTTP_POST_RECV) + http->state ++; + else + http->state = HTTP_WAITING; } #ifdef DEBUG @@ -2292,6 +2288,23 @@ } /* + * Reset all state (except fields, which may be reused)... + */ + + http->state = HTTP_WAITING; + http->status = HTTP_CONTINUE; + http->version = HTTP_1_1; + http->keep_alive = HTTP_KEEPALIVE_OFF; + memset(&http->_hostaddr, 0, sizeof(http->_hostaddr)); + http->data_encoding = HTTP_ENCODE_LENGTH; + http->_data_remaining = 0; + http->used = 0; + http->expect = 0; + http->data_remaining = 0; + http->hostaddr = NULL; + http->wused = 0; + + /* * Connect to the server... */ @@ -2328,8 +2341,6 @@ http->hostaddr = &(addr->addr); http->error = 0; - http->status = HTTP_CONTINUE; - http->state = HTTP_WAITING; #ifdef HAVE_SSL if (http->encryption == HTTP_ENCRYPT_ALWAYS) @@ -3833,7 +3844,8 @@ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ int any_root; /* Allow any root */ - char *hostname; /* Hostname */ + char hostname[256], /* Hostname */ + *hostptr; /* Pointer into hostname */ # ifdef HAVE_LIBSSL SSL_CTX *context; /* Context for encryption */ @@ -3869,11 +3881,24 @@ */ if (httpAddrLocalhost(http->hostaddr)) + { any_root = 1; + strlcpy(hostname, "localhost", sizeof(hostname)); + } else + { + /* + * Otherwise use the system-wide setting and make sure the hostname we have + * does not end in a trailing dot. + */ + any_root = cg->any_root; - hostname = httpAddrLocalhost(http->hostaddr) ? "localhost" : http->hostname; + strlcpy(hostname, http->hostname, sizeof(hostname)); + if ((hostptr = hostname + strlen(hostname) - 1) >= hostname && + *hostptr == '.') + *hostptr = '\0'; + } # ifdef HAVE_LIBSSL (void)any_root; @@ -3888,7 +3913,9 @@ http->tls = SSL_new(context); SSL_set_bio(http->tls, bio, bio); +# ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME SSL_set_tlsext_host_name(http->tls, hostname); +# endif /* HAVE_SSL_SET_TLSEXT_HOST_NAME */ if (SSL_connect(http->tls) != 1) { @@ -4009,15 +4036,6 @@ cg->expired_root, (int)error)); } -# ifdef HAVE_SSLSETPROTOCOLVERSIONMAX - if (!error) - { - error = SSLSetProtocolVersionMax(http->tls, kTLSProtocol1); - DEBUG_printf(("4http_setup_ssl: SSLSetProtocolVersionMax(kTLSProtocol1), " - "error=%d", (int)error)); - } -# endif /* HAVE_SSLSETPROTOCOLVERSIONMAX */ - /* * In general, don't verify certificates since things like the common name * often do not match... @@ -4092,7 +4110,8 @@ break; case errSSLWouldBlock : - usleep(1000); + error = noErr; /* Force a retry */ + usleep(1000); /* in 1 millisecond */ break; # ifdef HAVE_SECCERTIFICATECOPYDATA @@ -4128,7 +4147,7 @@ { data = (CFDataRef)CFArrayGetValueAtIndex(dn_array, i); - if ((credential = malloc(sizeof(*credential)))) + if ((credential = malloc(sizeof(*credential))) != NULL) { credential->datalen = CFDataGetLength(data); if ((credential->data = malloc(credential->datalen))) @@ -4447,7 +4466,8 @@ pfd.events = POLLOUT; while ((nfds = poll(&pfd, 1, http->wait_value)) < 0 && - (errno == EINTR || errno == EAGAIN)); + (errno == EINTR || errno == EAGAIN)) + /* do nothing */; #else do @@ -4686,5 +4706,5 @@ /* - * End of "$Id: http.c 10154 2011-12-16 07:16:04Z mike $". + * End of "$Id: http.c 10450 2012-05-04 22:52:56Z mike $". */ diff -Nru cups-1.5.2/cups/http-support.c cups-1.5.3/cups/http-support.c --- cups-1.5.2/cups/http-support.c 2011-09-26 20:46:46.000000000 +0200 +++ cups-1.5.3/cups/http-support.c 2012-02-15 02:06:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: http-support.c 10017 2011-09-26 18:46:46Z mike $" + * "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $" * * HTTP support routines for CUPS. * @@ -757,10 +757,13 @@ tdate = gmtime(&t); - snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT", - http_days[tdate->tm_wday], tdate->tm_mday, - http_months[tdate->tm_mon], tdate->tm_year + 1900, - tdate->tm_hour, tdate->tm_min, tdate->tm_sec); + if (tdate) + snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT", + http_days[tdate->tm_wday], tdate->tm_mday, + http_months[tdate->tm_mon], tdate->tm_year + 1900, + tdate->tm_hour, tdate->tm_min, tdate->tm_sec); + else + s[0] = '\0'; return (s); } @@ -1915,5 +1918,5 @@ /* - * End of "$Id: http-support.c 10017 2011-09-26 18:46:46Z mike $". + * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $". */ diff -Nru cups-1.5.2/cups/ipp.c cups-1.5.3/cups/ipp.c --- cups-1.5.2/cups/ipp.c 2011-10-04 06:46:34.000000000 +0200 +++ cups-1.5.3/cups/ipp.c 2012-05-05 00:52:56.000000000 +0200 @@ -1,9 +1,9 @@ /* - * "$Id: ipp.c 10053 2011-10-04 04:46:34Z mike $" + * "$Id: ipp.c 10450 2012-05-04 22:52:56Z mike $" * * Internet Printing Protocol functions for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -1109,7 +1109,7 @@ DEBUG_printf(("ippReadIO(src=%p, cb=%p, blocking=%d, parent=%p, ipp=%p)", src, cb, blocking, parent, ipp)); - DEBUG_printf(("2ippReadIO: ipp->state=%d", ipp->state)); + DEBUG_printf(("2ippReadIO: ipp->state=%d", ipp ? ipp->state : IPP_ERROR)); if (!src || !ipp) return (IPP_ERROR); @@ -3092,9 +3092,8 @@ ipp_uchar_t *buffer, /* O - Buffer for data */ size_t length) /* I - Total length */ { - int tbytes, /* Total bytes read */ - bytes; /* Bytes read this pass */ - char len[32]; /* Length string */ + int tbytes, /* Total bytes read */ + bytes; /* Bytes read this pass */ DEBUG_printf(("7ipp_read_http(http=%p, buffer=%p, length=%d)", @@ -3114,91 +3113,36 @@ if (http->state == HTTP_WAITING) break; - if (http->used > 0 && http->data_encoding == HTTP_ENCODE_LENGTH) + if (http->used == 0 && !http->blocking) { /* - * Do "fast read" from HTTP buffer directly... + * Wait up to 10 seconds for more data on non-blocking sockets... */ - if (http->used > (int)(length - tbytes)) - bytes = (int)(length - tbytes); - else - bytes = http->used; - - if (bytes == 1) - buffer[0] = http->buffer[0]; - else - memcpy(buffer, http->buffer, bytes); - - http->used -= bytes; - http->data_remaining -= bytes; - - if (http->data_remaining <= INT_MAX) - http->_data_remaining = (int)http->data_remaining; - else - http->_data_remaining = INT_MAX; - - if (http->used > 0) - memmove(http->buffer, http->buffer + bytes, http->used); - - if (http->data_remaining == 0) - { - if (http->data_encoding == HTTP_ENCODE_CHUNKED) - { - /* - * Get the trailing CR LF after the chunk... - */ - - if (!httpGets(len, sizeof(len), http)) - return (-1); - } - - if (http->data_encoding != HTTP_ENCODE_CHUNKED) - { - if (http->state == HTTP_POST_RECV) - http->state ++; - else - http->state = HTTP_WAITING; - } - } - } - else - { - /* - * Wait a maximum of 1 second for data... - */ - - if (!http->blocking) + if (!httpWait(http, 10000)) { /* - * Wait up to 10 seconds for more data on non-blocking sockets... + * Signal no data... */ - if (!httpWait(http, 10000)) - { - /* - * Signal no data... - */ - - bytes = -1; - break; - } + bytes = -1; + break; } + } - if ((bytes = httpRead2(http, (char *)buffer, length - tbytes)) < 0) - { + if ((bytes = httpRead2(http, (char *)buffer, length - tbytes)) < 0) + { #ifdef WIN32 - break; + break; #else - if (errno != EAGAIN && errno != EINTR) - break; + if (errno != EAGAIN && errno != EINTR) + break; - bytes = 0; + bytes = 0; #endif /* WIN32 */ - } - else if (bytes == 0) - break; } + else if (bytes == 0) + break; } /* @@ -3272,5 +3216,5 @@ /* - * End of "$Id: ipp.c 10053 2011-10-04 04:46:34Z mike $". + * End of "$Id: ipp.c 10450 2012-05-04 22:52:56Z mike $". */ diff -Nru cups-1.5.2/cups/language.c cups-1.5.3/cups/language.c --- cups-1.5.2/cups/language.c 2011-11-01 07:06:15.000000000 +0100 +++ cups-1.5.3/cups/language.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: language.c 10095 2011-11-01 06:06:15Z mike $" + * "$Id: language.c 10379 2012-03-23 22:16:22Z mike $" * * I18N/language support for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -979,7 +979,23 @@ */ if (m) - cupsArrayAdd(a, m); + { + if (m->str && m->str[0]) + { + cupsArrayAdd(a, m); + } + else + { + /* + * Translation is empty, don't add it... (STR #4033) + */ + + free(m->id); + if (m->str) + free(m->str); + free(m); + } + } /* * Create a new message with the given msgid string... @@ -1009,6 +1025,11 @@ if ((temp = realloc(m->str ? m->str : m->id, length + strlen(ptr) + 1)) == NULL) { + if (m->str) + free(m->str); + free(m->id); + free(m); + cupsFileClose(fp); return (a); } @@ -1046,6 +1067,9 @@ if ((m->str = strdup(ptr)) == NULL) { + free(m->id); + free(m); + cupsFileClose(fp); return (a); } @@ -1057,7 +1081,23 @@ */ if (m) - cupsArrayAdd(a, m); + { + if (m->str && m->str[0]) + { + cupsArrayAdd(a, m); + } + else + { + /* + * Translation is empty, don't add it... (STR #4033) + */ + + free(m->id); + if (m->str) + free(m->str); + free(m); + } + } /* * Close the message catalog file and return the new array... @@ -1505,5 +1545,5 @@ /* - * End of "$Id: language.c 10095 2011-11-01 06:06:15Z mike $". + * End of "$Id: language.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/cups/libcups2.rc cups-1.5.3/cups/libcups2.rc --- cups-1.5.2/cups/libcups2.rc 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/cups/libcups2.rc 2012-02-13 18:13:21.000000000 +0100 @@ -0,0 +1,75 @@ +// Microsoft Visual C++ generated resource script. +// + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" +#include "WinVersRes.h" +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION MASTER_PROD_VERS + PRODUCTVERSION MASTER_PROD_VERS + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", MASTER_COMPANY_NAME + VALUE "FileDescription", "CUPS Library" + VALUE "FileVersion", MASTER_PROD_VERS_STR + VALUE "InternalName", "libcups2.dll" + VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "libcups2.dll" + VALUE "ProductName", MASTER_PROD_NAME + VALUE "ProductVersion", MASTER_PROD_VERS_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff -Nru cups-1.5.2/cups/localize.c cups-1.5.3/cups/localize.c --- cups-1.5.2/cups/localize.c 2011-05-20 08:23:46.000000000 +0200 +++ cups-1.5.3/cups/localize.c 2012-02-13 18:13:21.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: localize.c 9795 2011-05-20 06:23:46Z mike $" + * "$Id: localize.c 10270 2012-02-13 17:13:21Z mike $" * * PPD localization routines for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -310,9 +310,9 @@ !strncmp(reason, "shutdown", 8)) message = _("The printer is not connected."); else if (!strncmp(reason, "toner-low", 9)) - message = _("The printer is low on toner."); + message = _("The printer is running low on toner."); else if (!strncmp(reason, "toner-empty", 11)) - message = _("The printer is out of toner."); + message = _("The printer may be out of toner."); else if (!strncmp(reason, "cover-open", 10)) message = _("The printer's cover is open."); else if (!strncmp(reason, "interlock-open", 14)) @@ -332,7 +332,7 @@ else if (!strncmp(reason, "output-area-full", 16)) message = _("The output bin is full."); else if (!strncmp(reason, "marker-supply-low", 17)) - message = _("The printer is almost out of ink."); + message = _("The printer is running low on ink."); else if (!strncmp(reason, "marker-supply-empty", 19)) message = _("The printer is out of ink."); else if (!strncmp(reason, "marker-waste-almost-full", 24)) @@ -775,5 +775,5 @@ /* - * End of "$Id: localize.c 9795 2011-05-20 06:23:46Z mike $". + * End of "$Id: localize.c 10270 2012-02-13 17:13:21Z mike $". */ diff -Nru cups-1.5.2/cups/ppd-cache.c cups-1.5.3/cups/ppd-cache.c --- cups-1.5.2/cups/ppd-cache.c 2011-11-07 07:08:44.000000000 +0100 +++ cups-1.5.3/cups/ppd-cache.c 2012-03-07 18:16:42.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: ppd-cache.c 10112 2011-11-07 06:08:44Z mike $" + * "$Id: ppd-cache.c 10340 2012-03-07 17:16:42Z mike $" * * PPD cache implementation for CUPS. * - * Copyright 2010-2011 by Apple Inc. + * Copyright 2010-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -65,6 +65,9 @@ * Local functions... */ +static int pwg_compare_finishings(_pwg_finishings_t *a, + _pwg_finishings_t *b); +static void pwg_free_finishings(_pwg_finishings_t *f); static void pwg_ppdize_name(const char *ipp, char *name, size_t namesize); static void pwg_unppdize_name(const char *ppd, char *name, size_t namesize); @@ -86,6 +89,7 @@ _ppd_cache_t *pc; /* PWG mapping data */ _pwg_size_t *size; /* Current size */ _pwg_map_t *map; /* Current map */ + _pwg_finishings_t *finishings; /* Current finishings option */ int linenum, /* Current line number */ num_bins, /* Number of bins in file */ num_sizes, /* Number of sizes in file */ @@ -532,6 +536,23 @@ pc->sides_2sided_long = _cupsStrAlloc(value); else if (!_cups_strcasecmp(line, "Sides2SidedShort")) pc->sides_2sided_short = _cupsStrAlloc(value); + else if (!_cups_strcasecmp(line, "Finishings")) + { + if (!pc->finishings) + pc->finishings = + cupsArrayNew3((cups_array_func_t)pwg_compare_finishings, + NULL, NULL, 0, NULL, + (cups_afree_func_t)pwg_free_finishings); + + if ((finishings = calloc(1, sizeof(_pwg_finishings_t))) == NULL) + goto create_error; + + finishings->value = strtol(value, &valueptr, 10); + finishings->num_options = cupsParseOptions(valueptr, 0, + &(finishings->options)); + + cupsArrayAdd(pc->finishings, finishings); + } else { DEBUG_printf(("_ppdCacheCreateWithFile: Unknown %s on line %d.", line, @@ -633,6 +654,7 @@ new_known_pwg; /* New PWG name is well-known */ _pwg_size_t *new_size; /* New size to add, if any */ const char *filter; /* Current filter */ + _pwg_finishings_t *finishings; /* Current finishings value */ DEBUG_printf(("_ppdCacheCreateWithPPD(ppd=%p)", ppd)); @@ -727,12 +749,17 @@ } /* - * If we have a similar paper with non-zero margins then we only - * want to keep it if it has a larger imageable area length. + * If we have a similar paper with non-zero margins then we only want to + * keep it if it has a larger imageable area length. The NULL check is for + * dimensions that are <= 0... */ - new_width = _PWG_FROMPTS(ppd_size->width); - new_length = _PWG_FROMPTS(ppd_size->length); + if ((pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width), + _PWG_FROMPTS(ppd_size->length))) == NULL) + continue; + + new_width = pwg_media->width; + new_length = pwg_media->length; new_left = _PWG_FROMPTS(ppd_size->left); new_bottom = _PWG_FROMPTS(ppd_size->bottom); new_right = _PWG_FROMPTS(ppd_size->width - ppd_size->right); @@ -862,7 +889,7 @@ else if (!_cups_strncasecmp(choice->choice, "Multipurpose", 12) || !_cups_strcasecmp(choice->choice, "MP") || !_cups_strcasecmp(choice->choice, "MPTray")) - pwg_name = "alternate"; + pwg_name = "by-pass-tray"; else if (!_cups_strcasecmp(choice->choice, "LargeCapacity")) pwg_name = "large-capacity"; else if (!_cups_strncasecmp(choice->choice, "Lower", 5)) @@ -1299,6 +1326,32 @@ pc->product = _cupsStrAlloc(ppd->product); /* + * Copy finishings mapping data... + */ + + if ((ppd_attr = ppdFindAttr(ppd, "cupsIPPFinishings", NULL)) != NULL) + { + pc->finishings = cupsArrayNew3((cups_array_func_t)pwg_compare_finishings, + NULL, NULL, 0, NULL, + (cups_afree_func_t)pwg_free_finishings); + + do + { + if ((finishings = calloc(1, sizeof(_pwg_finishings_t))) == NULL) + goto create_error; + + finishings->value = atoi(ppd_attr->spec); + finishings->num_options = _ppdParseOptions(ppd_attr->value, 0, + &(finishings->options), + _PPD_PARSE_OPTIONS); + + cupsArrayAdd(pc->finishings, finishings); + } + while ((ppd_attr = ppdFindNextAttr(ppd, "cupsIPPFinishings", + NULL)) != NULL); + } + + /* * Return the cache data... */ @@ -1396,6 +1449,7 @@ _cupsStrFree(pc->product); cupsArrayDelete(pc->filters); cupsArrayDelete(pc->prefilters); + cupsArrayDelete(pc->finishings); free(pc); } @@ -1435,6 +1489,125 @@ /* + * '_ppdCacheGetFinishingOptions()' - Get PPD finishing options for the given + * IPP finishings value(s). + */ + +int /* O - New number of options */ +_ppdCacheGetFinishingOptions( + _ppd_cache_t *pc, /* I - PPD cache and mapping data */ + ipp_t *job, /* I - Job attributes or NULL */ + ipp_finish_t value, /* I - IPP finishings value of IPP_FINISHINGS_NONE */ + int num_options, /* I - Number of options */ + cups_option_t **options) /* IO - Options */ +{ + int i; /* Looping var */ + _pwg_finishings_t *f, /* PWG finishings options */ + key; /* Search key */ + ipp_attribute_t *attr; /* Finishings attribute */ + cups_option_t *option; /* Current finishings option */ + + + /* + * Range check input... + */ + + if (!pc || cupsArrayCount(pc->finishings) == 0 || !options || + (!job && value == IPP_FINISHINGS_NONE)) + return (num_options); + + /* + * Apply finishing options... + */ + + if (job && (attr = ippFindAttribute(job, "finishings", IPP_TAG_ENUM)) != NULL) + { + for (i = 0; i < attr->num_values; i ++) + { + key.value = attr->values[i].integer; + + if ((f = cupsArrayFind(pc->finishings, &key)) != NULL) + { + int j; /* Another looping var */ + + for (j = f->num_options, option = f->options; j > 0; j --, option ++) + num_options = cupsAddOption(option->name, option->value, + num_options, options); + } + } + } + else if (value != IPP_FINISHINGS_NONE) + { + key.value = value; + + if ((f = cupsArrayFind(pc->finishings, &key)) != NULL) + { + int j; /* Another looping var */ + + for (j = f->num_options, option = f->options; j > 0; j --, option ++) + num_options = cupsAddOption(option->name, option->value, + num_options, options); + } + } + + return (num_options); +} + + +/* + * '_ppdCacheGetFinishingValues()' - Get IPP finishings value(s) from the given + * PPD options. + */ + +int /* O - Number of finishings values */ +_ppdCacheGetFinishingValues( + _ppd_cache_t *pc, /* I - PPD cache and mapping data */ + int num_options, /* I - Number of options */ + cups_option_t *options, /* I - Options */ + int max_values, /* I - Maximum number of finishings values */ + int *values) /* O - Finishings values */ +{ + int i, /* Looping var */ + num_values = 0; /* Number of values */ + _pwg_finishings_t *f; /* Current finishings option */ + cups_option_t *option; /* Current option */ + const char *val; /* Value for option */ + + + /* + * Range check input... + */ + + if (!pc || !pc->finishings || num_options < 1 || max_values < 1 || !values) + return (0); + + /* + * Go through the finishings options and see what is set... + */ + + for (f = (_pwg_finishings_t *)cupsArrayFirst(pc->finishings); + f; + f = (_pwg_finishings_t *)cupsArrayNext(pc->finishings)) + { + for (i = f->num_options, option = f->options; i > 0; i --, option ++) + if ((val = cupsGetOption(option->name, num_options, options)) == NULL || + _cups_strcasecmp(option->value, val)) + break; + + if (i == 0) + { + values[num_values ++] = f->value; + + if (num_values >= max_values) + break; + } + } + + return (num_values); +} + + +/* * '_ppdCacheGetInputSlot()' - Get the PPD InputSlot associated with the job * attributes or a keyword string. */ @@ -1835,7 +2008,8 @@ _ppd_cache_t *pc, /* I - PPD cache and mapping data */ const char *page_size) /* I - PPD PageSize */ { - int i; + int i; /* Looping var */ + _pwg_media_t *media; /* Media */ _pwg_size_t *size; /* Current size */ @@ -1914,9 +2088,26 @@ */ for (i = pc->num_sizes, size = pc->sizes; i > 0; i --, size ++) - if (!_cups_strcasecmp(page_size, size->map.ppd)) + if (!_cups_strcasecmp(page_size, size->map.ppd) || + !_cups_strcasecmp(page_size, size->map.pwg)) return (size); + /* + * Look up standard sizes... + */ + + if ((media = _pwgMediaForPPD(page_size)) == NULL) + if ((media = _pwgMediaForLegacy(page_size)) == NULL) + media = _pwgMediaForPWG(page_size); + + if (media) + { + pc->custom_size.width = media->width; + pc->custom_size.length = media->length; + + return (&(pc->custom_size)); + } + return (NULL); } @@ -1989,13 +2180,14 @@ const char *filename, /* I - File to write */ ipp_t *attrs) /* I - Attributes to write, if any */ { - int i, j, k; /* Looping vars */ - cups_file_t *fp; /* Output file */ - _pwg_size_t *size; /* Current size */ - _pwg_map_t *map; /* Current map */ - cups_option_t *option; /* Current option */ - const char *value; /* Filter/pre-filter value */ - char newfile[1024]; /* New filename */ + int i, j, k; /* Looping vars */ + cups_file_t *fp; /* Output file */ + _pwg_size_t *size; /* Current size */ + _pwg_map_t *map; /* Current map */ + _pwg_finishings_t *f; /* Current finishing option */ + cups_option_t *option; /* Current option */ + const char *value; /* Filter/pre-filter value */ + char newfile[1024]; /* New filename */ /* @@ -2129,6 +2321,20 @@ cupsFilePrintf(fp, "SingleFile %s\n", pc->single_file ? "true" : "false"); /* + * Finishing options... + */ + + for (f = (_pwg_finishings_t *)cupsArrayFirst(pc->finishings); + f; + f = (_pwg_finishings_t *)cupsArrayNext(pc->finishings)) + { + cupsFilePrintf(fp, "Finishings %d", f->value); + for (i = f->num_options, option = f->options; i > 0; i --, option ++) + cupsFilePrintf(fp, " %s=%s", option->name, option->value); + cupsFilePutChar(fp, '\n'); + } + + /* * IPP attributes, if any... */ @@ -2311,6 +2517,32 @@ /* + * 'pwg_compare_finishings()' - Compare two finishings values. + */ + +static int /* O- Result of comparison */ +pwg_compare_finishings( + _pwg_finishings_t *a, /* I - First finishings value */ + _pwg_finishings_t *b) /* I - Second finishings value */ +{ + return (b->value - a->value); +} + + +/* + * 'pwg_free_finishings()' - Free a finishings value. + */ + +static void +pwg_free_finishings( + _pwg_finishings_t *f) /* I - Finishings value */ +{ + cupsFreeOptions(f->num_options, f->options); + free(f); +} + + +/* * 'pwg_ppdize_name()' - Convert an IPP keyword to a PPD keyword. */ @@ -2370,5 +2602,5 @@ /* - * End of "$Id: ppd-cache.c 10112 2011-11-07 06:08:44Z mike $". + * End of "$Id: ppd-cache.c 10340 2012-03-07 17:16:42Z mike $". */ diff -Nru cups-1.5.2/cups/ppd-private.h cups-1.5.3/cups/ppd-private.h --- cups-1.5.2/cups/ppd-private.h 2011-03-30 18:59:09.000000000 +0200 +++ cups-1.5.3/cups/ppd-private.h 2012-02-11 03:21:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: ppd-private.h 9662 2011-03-30 16:59:09Z mike $" + * "$Id: ppd-private.h 10244 2012-02-11 02:21:34Z mike $" * * Private PPD definitions for CUPS. * @@ -49,7 +49,7 @@ * Constants... */ -# define _PPD_CACHE_VERSION 1 /* Version number in cache file */ +# define _PPD_CACHE_VERSION 2 /* Version number in cache file */ /* @@ -86,7 +86,7 @@ _PWG_PRINT_COLOR_MODE_MAX } _pwg_print_color_mode_t; -typedef enum _pwg_print_quality_e /**** PWG print-quality indices ****/ +typedef enum _pwg_print_quality_e /**** PWG print-quality values ****/ { _PWG_PRINT_QUALITY_DRAFT = 0, /* print-quality=3 */ _PWG_PRINT_QUALITY_NORMAL, /* print-quality=4 */ @@ -94,6 +94,13 @@ _PWG_PRINT_QUALITY_MAX } _pwg_print_quality_t; +typedef struct _pwg_finishings_s /**** PWG finishings mapping data ****/ +{ + ipp_finish_t value; /* finishings value */ + int num_options; /* Number of options to apply */ + cups_option_t *options; /* Options to apply */ +} _pwg_finishings_t; + struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/ { int num_bins; /* Number of output bins */ @@ -125,6 +132,7 @@ cups_array_t *filters, /* cupsFilter/cupsFilter2 values */ *prefilters; /* cupsPreFilter values */ int single_file; /* cupsSingleFile value */ + cups_array_t *finishings; /* cupsIPPFinishings values */ }; @@ -138,6 +146,12 @@ extern void _ppdCacheDestroy(_ppd_cache_t *pc); extern const char *_ppdCacheGetBin(_ppd_cache_t *pc, const char *output_bin); +extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc, ipp_t *job, + ipp_finish_t value, int num_options, + cups_option_t **options); +extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc, int num_options, + cups_option_t *options, + int max_values, int *values); extern const char *_ppdCacheGetInputSlot(_ppd_cache_t *pc, ipp_t *job, const char *keyword); extern const char *_ppdCacheGetMediaType(_ppd_cache_t *pc, ipp_t *job, @@ -184,5 +198,5 @@ #endif /* !_CUPS_PPD_PRIVATE_H_ */ /* - * End of "$Id: ppd-private.h 9662 2011-03-30 16:59:09Z mike $". + * End of "$Id: ppd-private.h 10244 2012-02-11 02:21:34Z mike $". */ diff -Nru cups-1.5.2/cups/pwg-media.c cups-1.5.3/cups/pwg-media.c --- cups-1.5.2/cups/pwg-media.c 2011-10-14 17:51:23.000000000 +0200 +++ cups-1.5.3/cups/pwg-media.c 2012-03-07 18:16:42.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: pwg-media.c 10070 2011-10-14 15:51:23Z mike $" + * "$Id: pwg-media.c 10340 2012-03-07 17:16:42Z mike $" * * PWG media name API implementation for CUPS. * - * Copyright 2009-2011 by Apple Inc. + * Copyright 2009-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -117,7 +117,7 @@ /* Chinese Standard Sheet Media Inch Sizes */ _PWG_MEDIA_IN("roc_16k_7.75x10.75in", NULL, "roc16k", 7.75, 10.75), - _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, NULL, 10.75, 15.5), + _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, "roc8k", 10.75, 15.5), /* ISO Standard Sheet Media Sizes */ _PWG_MEDIA_MM("iso_a10_26x37mm", "iso-a10", "A10", 26, 37), @@ -128,7 +128,7 @@ _PWG_MEDIA_MM("iso_a5_148x210mm", "iso-a5", "A5", 148, 210), _PWG_MEDIA_MM("iso_a5-extra_174x235mm", NULL, "A5Extra", 174, 235), _PWG_MEDIA_MM("iso_a4_210x297mm", "iso-a4", "A4", 210, 297), - _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, NULL, 225, 297), + _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, "A4Tab", 225, 297), _PWG_MEDIA_MM("iso_a4-extra_235.5x322.3mm", NULL, "A4Extra", 235.5, 322.3), _PWG_MEDIA_MM("iso_a3_297x420mm", "iso-a3", "A3", 297, 420), _PWG_MEDIA_MM("iso_a4x3_297x630mm", "iso-a4x3", NULL, 297, 630), @@ -233,9 +233,9 @@ _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, NULL, 100, 150), _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230), _PWG_MEDIA_MM("om_postfix_114x229mm", NULL, NULL, 114, 229), - _PWG_MEDIA_MM("om_large-photo_200x300", NULL, NULL, 200, 300), + _PWG_MEDIA_MM("om_large-photo_200x300", NULL, "om_large-photo", 200, 300), _PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330), - _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, NULL, 215, 315), + _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, "FolioSP", 215, 315), _PWG_MEDIA_MM("om_invite_220x220mm", NULL, "EnvInvite", 220, 220) }; @@ -847,5 +847,5 @@ /* - * End of "$Id: pwg-media.c 10070 2011-10-14 15:51:23Z mike $". + * End of "$Id: pwg-media.c 10340 2012-03-07 17:16:42Z mike $". */ diff -Nru cups-1.5.2/cups/pwg-private.h cups-1.5.3/cups/pwg-private.h --- cups-1.5.2/cups/pwg-private.h 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/cups/pwg-private.h 2012-02-11 03:24:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: pwg-private.h 9230 2010-08-10 00:02:02Z mike $" + * "$Id: pwg-private.h 10245 2012-02-11 02:24:44Z mike $" * * Private PWG media API definitions for CUPS. * @@ -39,7 +39,7 @@ */ /* Convert from points to 2540ths */ -# define _PWG_FROMPTS(n) (int)((n) * 2540 / 72) +# define _PWG_FROMPTS(n) (int)(((n) * 2540 + 36) / 72) /* Convert from 2540ths to points */ # define _PWG_TOPTS(n) ((n) * 72.0 / 2540.0) @@ -98,5 +98,5 @@ #endif /* !_CUPS_PWG_PRIVATE_H_ */ /* - * End of "$Id: pwg-private.h 9230 2010-08-10 00:02:02Z mike $". + * End of "$Id: pwg-private.h 10245 2012-02-11 02:24:44Z mike $". */ diff -Nru cups-1.5.2/cups/testconflicts.c cups-1.5.3/cups/testconflicts.c --- cups-1.5.2/cups/testconflicts.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/cups/testconflicts.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: testconflicts.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: testconflicts.c 10379 2012-03-23 22:16:22Z mike $" * * PPD constraint test program for CUPS. * - * Copyright 2008-2011 by Apple Inc. + * Copyright 2008-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -91,7 +91,13 @@ if (option) { free(option); + option = NULL; + } + + if (choice) + { free(choice); + choice = NULL; } printf("\nNew Option(s): "); @@ -118,10 +124,15 @@ cupsFreeOptions(num_options, options); } + if (option) + free(option); + if (choice) + free(choice); + return (0); } /* - * End of "$Id: testconflicts.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: testconflicts.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/cups/thread.c cups-1.5.3/cups/thread.c --- cups-1.5.2/cups/thread.c 2011-05-10 00:53:31.000000000 +0200 +++ cups-1.5.3/cups/thread.c 2012-04-23 23:52:02.000000000 +0200 @@ -1,9 +1,9 @@ /* - * "$Id: thread.c 9755 2011-05-09 22:53:31Z mike $" + * "$Id: thread.c 10436 2012-04-23 21:52:02Z mike $" * * Threading primitives for CUPS. * - * Copyright 2009-2010 by Apple Inc. + * Copyright 2009-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -113,7 +113,7 @@ * '_cupsThreadCreate()' - Create a thread. */ -int /* O - 0 on failure, 1 on success */ +int /* O - 0 on failure, 1 on success */ _cupsThreadCreate( _cups_thread_func_t func, /* I - Entry point */ void *arg) /* I - Entry point context */ @@ -223,7 +223,7 @@ * '_cupsThreadCreate()' - Create a thread. */ -int /* O - 0 on failure, 1 on success */ +int /* O - 0 on failure, 1 on success */ _cupsThreadCreate( _cups_thread_func_t func, /* I - Entry point */ void *arg) /* I - Entry point context */ @@ -309,9 +309,28 @@ { (void)rwlock; } + + +/* + * '_cupsThreadCreate()' - Create a thread. + */ + +int /* O - 0 on failure, 1 on success */ +_cupsThreadCreate( + _cups_thread_func_t func, /* I - Entry point */ + void *arg) /* I - Entry point context */ +{ + fputs("DEBUG: CUPS was compiled without threading support, no thread " + "created.\n", stderr); + + (void)func; + (void)arg; + + return (0); +} #endif /* HAVE_PTHREAD_H */ /* - * End of "$Id: thread.c 9755 2011-05-09 22:53:31Z mike $". + * End of "$Id: thread.c 10436 2012-04-23 21:52:02Z mike $". */ diff -Nru cups-1.5.2/cups/thread-private.h cups-1.5.3/cups/thread-private.h --- cups-1.5.2/cups/thread-private.h 2011-05-10 00:53:31.000000000 +0200 +++ cups-1.5.3/cups/thread-private.h 2012-04-23 23:52:02.000000000 +0200 @@ -1,9 +1,9 @@ /* - * "$Id: thread-private.h 9755 2011-05-09 22:53:31Z mike $" + * "$Id: thread-private.h 10436 2012-04-23 21:52:02Z mike $" * * Private threading definitions for CUPS. * - * Copyright 2009-2010 by Apple Inc. + * Copyright 2009-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -49,7 +49,7 @@ typedef void *(__stdcall *_cups_thread_func_t)(void *arg); typedef struct _cups_mutex_s { - int m_init; /* Flag for on-demand initialization */ + int m_init; /* Flag for on-demand initialization */ CRITICAL_SECTION m_criticalSection; /* Win32 Critical Section */ } _cups_mutex_t; @@ -62,6 +62,7 @@ # define _cupsThreadSetData(k,p) TlsSetValue(k,p) # else +typedef void *(*_cups_thread_func_t)(void *arg); typedef char _cups_mutex_t; typedef char _cups_rwlock_t; typedef void *_cups_threadkey_t; @@ -93,5 +94,5 @@ #endif /* !_CUPS_THREAD_PRIVATE_H_ */ /* - * End of "$Id: thread-private.h 9755 2011-05-09 22:53:31Z mike $". + * End of "$Id: thread-private.h 10436 2012-04-23 21:52:02Z mike $". */ diff -Nru cups-1.5.2/cups/util.c cups-1.5.3/cups/util.c --- cups-1.5.2/cups/util.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/cups/util.c 2012-02-12 06:48:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: util.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: util.c 10262 2012-02-12 05:48:09Z mike $" * * Printing utilities for CUPS. * @@ -899,6 +899,7 @@ resource[HTTP_MAX_URI]; /* Resource name */ int port; /* Port number */ http_status_t status; /* HTTP status from server */ + char tempfile[1024] = ""; /* Temporary filename */ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ @@ -1090,7 +1091,7 @@ if (buffer[0]) fd = open(buffer, O_CREAT | O_TRUNC | O_WRONLY, 0600); else - fd = cupsTempFd(buffer, bufsize); + fd = cupsTempFd(tempfile, sizeof(tempfile)); if (fd < 0) { @@ -1125,13 +1126,23 @@ */ if (status == HTTP_OK) + { *modtime = httpGetDateTime(httpGetField(http2, HTTP_FIELD_DATE)); + + if (tempfile[0]) + strlcpy(buffer, tempfile, bufsize); + } else if (status != HTTP_NOT_MODIFIED) { _cupsSetHTTPError(status); - unlink(cg->ppd_filename); + if (buffer[0]) + unlink(buffer); + else if (tempfile[0]) + unlink(tempfile); } + else if (tempfile[0]) + unlink(tempfile); if (http2 != http) httpClose(http2); @@ -1796,5 +1807,5 @@ /* - * End of "$Id: util.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: util.c 10262 2012-02-12 05:48:09Z mike $". */ diff -Nru cups-1.5.2/debian/changelog cups-1.5.3/debian/changelog --- cups-1.5.2/debian/changelog 2012-04-09 17:24:49.000000000 +0200 +++ cups-1.5.3/debian/changelog 2012-05-23 15:40:24.000000000 +0200 @@ -1,3 +1,70 @@ +cups (1.5.3-0ubuntu1) precise-proposed; urgency=low + + [ Till Kamppeter ] + * New upstream release + - Numerous fixes on IPP (LP: #945028, LP: #973270, LP: #990734, + LP: #992468, LP: #992982, LP: #1000172, LP: #1000758) + - USB backend based on the maintained libusb 1.0.x with support for + bi-directional communication + - Fixes on SNMP-based supply level reporting + - PostScript prtinter auto-configuration reliable now + - Several fixes on PostScript, SSL, authenticated printing, and + networking issues + * debian/patches/ipp-fixes-1.5.3.patch, + debian/patches/fix-empty-translations.patch, + debian/patches/ppd-cache-fix-crash.patch, + debian/patches/commandtops-make-robust-against-broken-postscript.patch, + debian/patches/cups-polld-reconnect.patch, + debian/patches/usb-backend-libusb-1.0.patch, + debian/patches/usb-backend-backchannel-support.patch: Removed patches which + got included upstream. + * debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch, + debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch, + debian/patches/fix-status-reports-when-supply-levels-grow.patch, + debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch, + debian/patches/match-marker-colorants-which-use-non-standard-string.patch, + debian/patches/truncate-marker-supply-names-at-comma.patch: Removed supply + level report fixes. This got solved differently upstream. + * debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch: + Removed, problem solved differently upstream. + * debian/patches/cups-avahi.patch: Manually regenerated to adapt to upstream + changes. + * debian/patches/ppd-poll-with-client-conf.patch, + debian/patches/colord-support.patch, + debian/patches/airprint-support.patch, + debian/patches/no-conffile-timestamp.patch, + debian/patches/drop_unnecessary_dependencies.patch, + debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch, + debian/patches/show-compile-command-lines.patch: Refreshed using quilt. + * debian/patches/usb-backend-busy-loop-fix.patch: Correct loops to repeat + claiming interfaces on USB devices when they are busy. Before, hitting busy + state made the device opening function error out without comment + (LP: #987485). + * debian/patches/usb-backend-detach-usblp-earlier-crash-guards.patch: Protect + against crashes by checking error codes of libusb functions (LP: #997040) + and detach usblp kernel module in an earlier stage when opening a device + (LP: #987485, LP: #997040). + * debian/patches/usb-backend-initialize-usblp-attached-state.patch: Initialize + usblp_attached field in printer data structure to assure that detaching + and re-attaching the usblp kernel module is always done correctly + (LP: #902535, LP: #959676, LP: #960666, LP: #987485, + LP: #995111, LP: #997040, LP: #1000253, LP: #1001028). + * debian/patches/install-sh-remove-bashism.patch: Removed bashism. + * debian/local/blacklist-cups-usblp.conf, debian/cups.postinst, + debian/cups.install: Blacklist the "usblp" kernel module again. We have + now a full-featured USB backend based on the maintained libusb 1.0.x + and so we can acess printers always through the raw USB devices making + the module deprecated. Detaching the kernel module for each access causes + a lot of problems: LP: #902535, LP: #959676, LP: #960666, LP: #987485, + LP: #995111, LP: #997040, LP: #1000253, LP: #1001028. + + [ Martin Pitt ] + * debian/cups.{preinst,postinst,postrm}: Drop the removal of obsolete + /etc/modprobe.d/blacklist-cups-usblp.conf conffile, as this file is + reintroduced now. + + -- Till Kamppeter Wed, 23 May 2012 15:28:01 +0200 + cups (1.5.2-9ubuntu1) precise; urgency=low * Don't wait on udevtrigger before starting cups; the only reason this diff -Nru cups-1.5.2/debian/cups.install cups-1.5.3/debian/cups.install --- cups-1.5.2/debian/cups.install 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/cups.install 2012-05-23 15:34:43.000000000 +0200 @@ -50,3 +50,4 @@ usr/share/man/man8/cupsfilter.8.gz #usr/share/man/*/man8/cupsfilter.8.gz ../presubj usr/share/bug/cups/ +../local/blacklist-cups-usblp.conf etc/modprobe.d diff -Nru cups-1.5.2/debian/cups.postinst cups-1.5.3/debian/cups.postinst --- cups-1.5.2/debian/cups.postinst 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/cups.postinst 2012-05-23 15:33:07.000000000 +0200 @@ -22,8 +22,6 @@ # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. -dpkg-maintscript-helper rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.2-3 -- "$@" - # Debconf . /usr/share/debconf/confmodule @@ -171,6 +169,10 @@ ln -s $printcap_file /etc/printcap fi fi + + if dpkg --compare-versions "$2" lt "1.5.3"; then + rmmod usblp || : + fi fi #DEBHELPER# diff -Nru cups-1.5.2/debian/cups.postrm cups-1.5.3/debian/cups.postrm --- cups-1.5.2/debian/cups.postrm 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/cups.postrm 2012-05-23 15:31:41.000000000 +0200 @@ -21,8 +21,6 @@ #DEBHELPER# -dpkg-maintscript-helper rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.2-3 -- "$@" - case "$1" in purge) rm -rf /var/lib/cups diff -Nru cups-1.5.2/debian/cups.preinst cups-1.5.3/debian/cups.preinst --- cups-1.5.2/debian/cups.preinst 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/cups.preinst 2012-05-23 15:31:06.000000000 +0200 @@ -1,8 +1,6 @@ #! /bin/sh set -e -dpkg-maintscript-helper rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.2-3 -- "$@" - # On Ubuntu, replace the obsolete init script (replaced by an upstart job) if [ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ] && [ ! -L /etc/init.d/cups ]; then dpkg-maintscript-helper rm_conffile /etc/init.d/cups 1.4.4-5 -- "$@" diff -Nru cups-1.5.2/debian/local/blacklist-cups-usblp.conf cups-1.5.3/debian/local/blacklist-cups-usblp.conf --- cups-1.5.2/debian/local/blacklist-cups-usblp.conf 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/debian/local/blacklist-cups-usblp.conf 2012-05-23 15:35:30.000000000 +0200 @@ -0,0 +1,3 @@ +# cups talks to the raw USB devices, so we need to blacklist usblp to avoid +# grabbing them +blacklist usblp diff -Nru cups-1.5.2/debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch cups-1.5.3/debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch --- cups-1.5.2/debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -Description: Add waste tray status and cleaner unit end-of-life supply states -Author: Peter Hurley -Bug: http://www.cups.org/str.php?L4017 -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/cups/+bug/925086 - ---- a/backend/snmp-supplies.c -+++ b/backend/snmp-supplies.c -@@ -44,6 +44,8 @@ - #define CUPS_OPC_LIFE_OVER 32 - #define CUPS_TONER_LOW 64 - #define CUPS_TONER_EMPTY 128 -+#define CUPS_WASTE_FULL 256 -+#define CUPS_CLEANER_LIFE_OVER 512 - - - /* -@@ -189,7 +191,9 @@ - { CUPS_OPC_NEAR_EOL, "opc-near-eol-report" }, - { CUPS_OPC_LIFE_OVER, "opc-life-over-warning" }, - { CUPS_TONER_LOW, "toner-low-report" }, -- { CUPS_TONER_EMPTY, "toner-empty-warning" } -+ { CUPS_TONER_EMPTY, "toner-empty-warning" }, -+ { CUPS_WASTE_FULL, "waste-receptacle-full-warning" }, -+ { CUPS_CLEANER_LIFE_OVER, "cleaner-life-over-warning" } - }; - - -@@ -291,6 +295,9 @@ - break; - case CUPS_TC_wasteToner : - case CUPS_TC_wasteInk : -+ case CUPS_TC_wasteWax : -+ if (percent <= 1) -+ new_supply_state |= CUPS_WASTE_FULL; - break; - case CUPS_TC_ink : - case CUPS_TC_inkCartridge : -@@ -317,6 +324,10 @@ - else - new_supply_state |= CUPS_OPC_NEAR_EOL; - break; -+ case CUPS_TC_cleanerUnit: -+ if (percent <= 1) -+ new_supply_state |= CUPS_CLEANER_LIFE_OVER; -+ break; - } - } - } diff -Nru cups-1.5.2/debian/patches/airprint-support.patch cups-1.5.3/debian/patches/airprint-support.patch --- cups-1.5.2/debian/patches/airprint-support.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/airprint-support.patch 2012-05-23 15:26:27.000000000 +0200 @@ -15,7 +15,7 @@ cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c -@@ -2517,6 +2517,9 @@ +@@ -2522,6 +2522,9 @@ keyvalue[i ][0] = "pdl"; keyvalue[i++][1] = p->pdl ? p->pdl : "application/postscript"; diff -Nru cups-1.5.2/debian/patches/colord-support.patch cups-1.5.3/debian/patches/colord-support.patch --- cups-1.5.2/debian/patches/colord-support.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/colord-support.patch 2012-05-23 15:26:27.000000000 +0200 @@ -760,7 +760,7 @@ } /* -@@ -7035,11 +7041,17 @@ +@@ -7034,11 +7040,17 @@ snprintf(filename, sizeof(filename), "%s/%s.data", CacheDir, printer->name); unlink(filename); @@ -871,7 +871,7 @@ * Rename the printer... */ -@@ -2644,6 +2706,13 @@ +@@ -2676,6 +2738,13 @@ #endif /* __sgi */ /* diff -Nru cups-1.5.2/debian/patches/commandtops-make-robust-against-broken-postscript.patch cups-1.5.3/debian/patches/commandtops-make-robust-against-broken-postscript.patch --- cups-1.5.2/debian/patches/commandtops-make-robust-against-broken-postscript.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/commandtops-make-robust-against-broken-postscript.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,348 +0,0 @@ -Description: Make commandtops robust against broken PostScript in PPD file -Bug: http://www.cups.org/str.php?L4028 -Author: Till Kamppeter - ---- a/filter/commandtops.c -+++ b/filter/commandtops.c -@@ -1,9 +1,9 @@ - /* -- * "$Id: commandtops.c 9793 2011-05-20 03:49:49Z mike $" -+ * "$Id: commandtops.c 10373 2012-03-21 23:00:05Z mike $" - * - * PostScript command filter for CUPS. - * -- * Copyright 2008-2011 by Apple Inc. -+ * Copyright 2008-2012 by Apple Inc. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright -@@ -36,7 +36,7 @@ - * Local functions... - */ - --static void auto_configure(ppd_file_t *ppd, const char *user); -+static int auto_configure(ppd_file_t *ppd, const char *user); - static void begin_ps(ppd_file_t *ppd, const char *user); - static void end_ps(ppd_file_t *ppd); - static void print_self_test_page(ppd_file_t *ppd, const char *user); -@@ -51,6 +51,7 @@ - main(int argc, /* I - Number of command-line arguments */ - char *argv[]) /* I - Command-line arguments */ - { -+ int status = 0; /* Exit status */ - cups_file_t *fp; /* Command file */ - char line[1024], /* Line from file */ - *value; /* Value on line */ -@@ -113,16 +114,20 @@ - */ - - if (!_cups_strcasecmp(line, "AutoConfigure")) -- auto_configure(ppd, argv[2]); -+ status |= auto_configure(ppd, argv[2]); - else if (!_cups_strcasecmp(line, "PrintSelfTestPage")) - print_self_test_page(ppd, argv[2]); - else if (!_cups_strcasecmp(line, "ReportLevels")) - report_levels(ppd, argv[2]); - else -- fprintf(stderr, "ERROR: Invalid printer command \"%s\"!\n", line); -+ { -+ _cupsLangPrintFilter(stderr, "ERROR", -+ _("Invalid printer command \"%s\"."), line); -+ status = 1; -+ } - } - -- return (0); -+ return (status); - } - - -@@ -131,12 +136,14 @@ - * query commands and/or SNMP lookups. - */ - --static void -+static int /* O - Exit status */ - auto_configure(ppd_file_t *ppd, /* I - PPD file */ - const char *user) /* I - Printing user */ - { -+ int status = 0; /* Exit status */ - ppd_option_t *option; /* Current option in PPD */ - ppd_attr_t *attr; /* Query command attribute */ -+ const char *valptr; /* Pointer into attribute value */ - char buffer[1024], /* String buffer */ - *bufptr; /* Pointer into buffer */ - ssize_t bytes; /* Number of bytes read */ -@@ -154,7 +161,7 @@ - { - fputs("DEBUG: Unable to auto-configure PostScript Printer - no " - "bidirectional I/O available!\n", stderr); -- return; -+ return (1); - } - - /* -@@ -162,6 +169,25 @@ - */ - - begin_ps(ppd, user); -+ -+ /* -+ * (STR #4028) -+ * -+ * As a lot of PPDs contain bad PostScript query code, we need to prevent one -+ * bad query sequence from affecting all auto-configuration. The following -+ * error handler allows us to log PostScript errors to cupsd. -+ */ -+ -+ puts("/cups_handleerror {\n" -+ " $error /newerror false put\n" -+ " (:PostScript error in \") print cups_query_keyword print (\": ) " -+ "print\n" -+ " $error /errorname get 128 string cvs print\n" -+ " (; offending command:) print $error /command get 128 string cvs " -+ "print (\n) print flush\n" -+ "} bind def\n" -+ "errordict /timeout {} put\n" -+ "/cups_query_keyword (?Unknown) def\n"); - fflush(stdout); - - /* -@@ -202,7 +228,76 @@ - */ - - fprintf(stderr, "DEBUG: Querying %s...\n", option->keyword); -- fputs(attr->value, stdout); -+ -+ for (bufptr = buffer, valptr = attr->value; *valptr; valptr ++) -+ { -+ /* -+ * Log the query code, breaking at newlines... -+ */ -+ -+ if (*valptr == '\n') -+ { -+ *bufptr = '\0'; -+ fprintf(stderr, "DEBUG: %s\\n\n", buffer); -+ bufptr = buffer; -+ } -+ else if (*valptr < ' ') -+ { -+ if (bufptr >= (buffer + sizeof(buffer) - 4)) -+ { -+ *bufptr = '\0'; -+ fprintf(stderr, "DEBUG: %s\n", buffer); -+ bufptr = buffer; -+ } -+ -+ if (*valptr == '\r') -+ { -+ *bufptr++ = '\\'; -+ *bufptr++ = 'r'; -+ } -+ else if (*valptr == '\t') -+ { -+ *bufptr++ = '\\'; -+ *bufptr++ = 't'; -+ } -+ else -+ { -+ *bufptr++ = '\\'; -+ *bufptr++ = '0' + ((*valptr / 64) & 7); -+ *bufptr++ = '0' + ((*valptr / 8) & 7); -+ *bufptr++ = '0' + (*valptr & 7); -+ } -+ } -+ else -+ { -+ if (bufptr >= (buffer + sizeof(buffer) - 1)) -+ { -+ *bufptr = '\0'; -+ fprintf(stderr, "DEBUG: %s\n", buffer); -+ bufptr = buffer; -+ } -+ -+ *bufptr++ = *valptr; -+ } -+ } -+ -+ if (bufptr > buffer) -+ { -+ *bufptr = '\0'; -+ fprintf(stderr, "DEBUG: %s\n", buffer); -+ } -+ -+ printf("/cups_query_keyword (?%s) def\n", option->keyword); -+ /* Set keyword for error reporting */ -+ fputs("{ (", stdout); -+ for (valptr = attr->value; *valptr; valptr ++) -+ { -+ if (*valptr == '(' || *valptr == ')' || *valptr == '\\') -+ putchar('\\'); -+ putchar(*valptr); -+ } -+ fputs(") cvx exec } stopped { cups_handleerror } if clear\n", stdout); -+ /* Send query code */ - fflush(stdout); - - datalen = 0; -@@ -212,53 +307,119 @@ - * Read the response data... - */ - -- while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer) - 1, 90.0)) > 0) -+ bufptr = buffer; -+ buffer[0] = '\0'; -+ while ((bytes = cupsBackChannelRead(bufptr, -+ sizeof(buffer) - (bufptr - buffer) - 1, -+ 10.0)) > 0) - { - /* -- * Trim whitespace from both ends... -+ * No newline at the end? Go on reading ... -+ */ -+ -+ bufptr += bytes; -+ *bufptr = '\0'; -+ -+ if (bytes == 0 || -+ (bufptr > buffer && bufptr[-1] != '\r' && bufptr[-1] != '\n')) -+ continue; -+ -+ /* -+ * Trim whitespace and control characters from both ends... - */ - -- buffer[bytes] = '\0'; -+ bytes = bufptr - buffer; - -- for (bufptr = buffer + bytes - 1; bufptr >= buffer; bufptr --) -- if (isspace(*bufptr & 255)) -+ for (bufptr --; bufptr >= buffer; bufptr --) -+ if (isspace(*bufptr & 255) || iscntrl(*bufptr & 255)) - *bufptr = '\0'; - else - break; - -- for (bufptr = buffer; isspace(*bufptr & 255); bufptr ++); -+ for (bufptr = buffer; isspace(*bufptr & 255) || iscntrl(*bufptr & 255); -+ bufptr ++); - -- fprintf(stderr, "DEBUG: Got \"%s\" (%d bytes)\n", bufptr, (int)bytes); -+ if (bufptr > buffer) -+ { -+ _cups_strcpy(buffer, bufptr); -+ bufptr = buffer; -+ } -+ -+ fprintf(stderr, "DEBUG: Got %d bytes.\n", (int)bytes); - - /* - * Skip blank lines... - */ - -- if (!*bufptr) -+ if (!buffer[0]) - continue; - - /* -+ * Check the response... -+ */ -+ -+ if ((bufptr = strchr(buffer, ':')) != NULL) -+ { -+ /* -+ * PostScript code for this option in the PPD is broken; show the -+ * interpreter's error message that came back... -+ */ -+ -+ fprintf(stderr, "DEBUG%s\n", bufptr); -+ break; -+ } -+ -+ /* - * Verify the result is a valid option choice... - */ - -- if (!ppdFindChoice(option, bufptr)) -+ if (!ppdFindChoice(option, buffer)) -+ { -+ if (!strcasecmp(buffer, "Unknown")) -+ break; -+ -+ bufptr = buffer; -+ buffer[0] = '\0'; - continue; -+ } - - /* - * Write out the result and move on to the next option... - */ - -- fprintf(stderr, "DEBUG: Default%s=%s\n", option->keyword, bufptr); -- fprintf(stderr, "PPD: Default%s=%s\n", option->keyword, bufptr); -+ fprintf(stderr, "PPD: Default%s=%s\n", option->keyword, buffer); - break; - } -+ -+ /* -+ * Printer did not answer this option's query -+ */ -+ -+ if (bytes <= 0) -+ { -+ fprintf(stderr, -+ "DEBUG: No answer to query for option %s within 10 seconds.\n", -+ option->keyword); -+ status = 1; -+ } - } - - /* - * Finish the job... - */ - -+ fflush(stdout); - end_ps(ppd); -+ -+ /* -+ * Return... -+ */ -+ -+ if (status) -+ _cupsLangPrintFilter(stderr, "WARNING", -+ _("Unable to configure printer options.")); -+ -+ return (0); - } - - -@@ -280,6 +441,7 @@ - - puts("%!"); - puts("userdict dup(\\004)cvn{}put (\\004\\004)cvn{}put\n"); -+ - fflush(stdout); - } - -@@ -319,7 +481,12 @@ - * the product/interpreter information... - */ - -- puts("% You are using the wrong driver for your printer!\n" -+ puts("\r%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" -+ "%%%%%%%%%%%%%\n" -+ "\r%%%% If you can read this, you are using the wrong driver for your " -+ "printer. %%%%\n" -+ "\r%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" -+ "%%%%%%%%%%%%%\n" - "0 setgray\n" - "2 setlinewidth\n" - "initclip newpath clippath gsave stroke grestore pathbbox\n" -@@ -367,5 +534,5 @@ - - - /* -- * End of "$Id: commandtops.c 9793 2011-05-20 03:49:49Z mike $". -+ * End of "$Id: commandtops.c 10373 2012-03-21 23:00:05Z mike $". - */ diff -Nru cups-1.5.2/debian/patches/cups-avahi.patch cups-1.5.3/debian/patches/cups-avahi.patch --- cups-1.5.2/debian/patches/cups-avahi.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/cups-avahi.patch 2012-05-23 15:26:27.000000000 +0200 @@ -89,23 +89,24 @@ static void browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, -@@ -93,12 +131,6 @@ - const char *regtype, +@@ -95,13 +133,6 @@ const char *replyDomain, - void *context); + void *context) + __attribute__((nonnull(1,5,6,7,8))); -static int compare_devices(cups_device_t *a, cups_device_t *b); -static void exec_backend(char **argv); -static cups_device_t *get_device(cups_array_t *devices, - const char *serviceName, - const char *regtype, -- const char *replyDomain); +- const char *replyDomain) +- __attribute__((nonnull(1,2,3,4))); static void query_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, -@@ -107,9 +139,118 @@ - uint16_t rrclass, uint16_t rdlen, +@@ -111,10 +142,119 @@ const void *rdata, uint32_t ttl, - void *context); + void *context) + __attribute__((nonnull(1,5,9,11))); +#endif /* HAVE_DNSSD */ +#ifdef HAVE_AVAHI +static void avahi_client_callback (AvahiClient *client, @@ -132,7 +133,8 @@ + const char *regtype, + const char *replyDomain); static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); + static void unquote(char *dst, const char *src, size_t dstsize) + __attribute__((nonnull(1,2))); +#ifdef HAVE_AVAHI +static AvahiSimplePoll *simple_poll = NULL; @@ -221,7 +223,7 @@ /* * 'main()' - Browse for printers. -@@ -120,6 +261,13 @@ +@@ -125,6 +265,13 @@ char *argv[]) /* I - Command-line arguments */ { const char *name; /* Backend name */ @@ -235,7 +237,7 @@ DNSServiceRef main_ref, /* Main service reference */ fax_ipp_ref, /* IPP fax service reference */ ipp_ref, /* IPP service reference */ -@@ -133,12 +281,11 @@ +@@ -138,12 +285,11 @@ pdl_datastream_ref, /* AppSocket service reference */ printer_ref, /* LPD service reference */ riousbprint_ref; /* Remote IO service reference */ @@ -253,7 +255,7 @@ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; /* Actions for POSIX signals */ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -198,6 +345,49 @@ +@@ -203,6 +349,49 @@ * Browse for different kinds of printers... */ @@ -303,7 +305,7 @@ if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) { perror("ERROR: Unable to create service connection"); -@@ -258,6 +448,7 @@ +@@ -263,6 +452,7 @@ riousbprint_ref = main_ref; DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, "_riousbprint._tcp", NULL, browse_callback, devices); @@ -311,7 +313,7 @@ /* * Loop until we are killed... -@@ -265,6 +456,9 @@ +@@ -270,6 +460,9 @@ while (!job_canceled) { @@ -321,7 +323,7 @@ FD_ZERO(&input); FD_SET(fd, &input); -@@ -284,11 +478,35 @@ +@@ -289,11 +482,35 @@ } else { @@ -357,7 +359,7 @@ cups_device_t *best; /* Best matching device */ char device_uri[1024]; /* Device URI */ int count; /* Number of queries */ -@@ -302,6 +520,7 @@ +@@ -307,6 +524,7 @@ if (device->sent) sent ++; @@ -365,7 +367,7 @@ if (device->ref) count ++; -@@ -333,14 +552,23 @@ +@@ -338,14 +556,23 @@ count ++; } } @@ -390,7 +392,7 @@ if (!best) best = device; -@@ -401,6 +629,7 @@ +@@ -406,6 +633,7 @@ } @@ -398,7 +400,7 @@ /* * 'browse_callback()' - Browse devices. */ -@@ -489,6 +718,7 @@ +@@ -494,6 +722,7 @@ device->fullName); device->sent = 1; } @@ -406,7 +408,7 @@ /* -@@ -569,6 +799,41 @@ +@@ -574,6 +803,41 @@ /* @@ -448,7 +450,7 @@ * 'get_device()' - Create or update a device. */ -@@ -589,20 +854,7 @@ +@@ -594,20 +858,7 @@ */ key.name = (char *)serviceName; @@ -470,7 +472,7 @@ for (device = cupsArrayFind(devices, &key); device; -@@ -622,8 +874,14 @@ +@@ -627,8 +878,14 @@ free(device->domain); device->domain = strdup(replyDomain); @@ -485,7 +487,7 @@ free(device->fullName); device->fullName = strdup(fullName); } -@@ -643,6 +901,9 @@ +@@ -648,6 +905,9 @@ device->domain = strdup(replyDomain); device->type = key.type; device->priority = 50; @@ -495,7 +497,7 @@ cupsArrayAdd(devices, device); -@@ -650,13 +911,20 @@ +@@ -655,13 +915,20 @@ * Set the "full name" of this service, which is used for queries... */ @@ -516,7 +518,7 @@ /* * 'query_callback()' - Process query data. */ -@@ -680,7 +948,7 @@ +@@ -685,7 +952,7 @@ *ptr; /* Pointer into string */ cups_device_t dkey, /* Search key */ *device; /* Device */ @@ -525,7 +527,7 @@ fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -714,94 +982,233 @@ +@@ -719,94 +986,233 @@ if ((ptr = strstr(name, "._")) != NULL) *ptr = '\0'; @@ -645,7 +647,8 @@ + + avahi_service_resolver_free (resolver); +} -+ + +- for (device = cupsArrayFind(devices, &dkey); + +/* + * 'avahi_browse_callback()' - Avahi browse callback function. @@ -717,8 +720,7 @@ +} +#endif /* HAVE_AVAHI */ + - -- for (device = cupsArrayFind(devices, &dkey); ++ +/* + * 'find_device()' - Find a device from its name and domain. + */ @@ -780,9 +782,13 @@ - * length is 8 bits and the size of the key/value buffers is 256, we - * don't need to check for overflow... - */ -- ++ char *key; ++ char *value; + - datalen = *data++; -- ++ if (parse_txt_record_pair (txt)) ++ goto next; + - if (!datalen || (data + datalen) > dataend) - break; - @@ -791,9 +797,7 @@ - for (ptr = key; data < datanext && *data != '='; data ++) - *ptr++ = *data; - *ptr = '\0'; -+ char *key; -+ char *value; - +- - if (data < datanext && *data == '=') - { - data ++; @@ -801,9 +805,7 @@ - if (data < datanext) - memcpy(value, data, datanext - data); - value[datanext - data] = '\0'; -+ if (parse_txt_record_pair (txt)) -+ goto next; - +- - fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n", - key, value); - } @@ -821,7 +823,7 @@ { /* * Add USB device ID information... -@@ -856,6 +1263,10 @@ +@@ -861,6 +1267,10 @@ if (device->type == CUPS_DEVICE_PRINTER) device->sent = 1; } @@ -832,7 +834,7 @@ } if (device->device_id) -@@ -905,11 +1316,9 @@ +@@ -910,11 +1320,9 @@ } } @@ -871,7 +873,7 @@ case "$uname" in --- a/config.h.in +++ b/config.h.in -@@ -390,6 +390,13 @@ +@@ -397,6 +397,13 @@ /* @@ -1156,7 +1158,7 @@ + + /* - * End of "$Id: http-support.c 10017 2011-09-26 18:46:46Z mike $". + * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $". */ --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -2088,7 +2090,7 @@ cgiSetVariable("HAVE_LDAP", "1"); --- a/scheduler/client.c +++ b/scheduler/client.c -@@ -4989,7 +4989,7 @@ +@@ -5003,7 +5003,7 @@ !strncmp(host, "[::1]:", 6)); } @@ -2097,7 +2099,7 @@ /* * Check if the hostname is something.local (Bonjour); if so, allow it. */ -@@ -4998,7 +4998,7 @@ +@@ -5012,7 +5012,7 @@ (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) || !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8))) return (1); @@ -2401,7 +2403,7 @@ #ifdef HAVE_LDAP -@@ -2334,13 +2445,15 @@ +@@ -2339,13 +2450,15 @@ "Bad Back to My Mac domain in dynamic store!"); } # endif /* HAVE_COREFOUNDATION */ @@ -2418,7 +2420,7 @@ dnssdBuildTxtRecord( int *txt_len, /* O - TXT record length */ cupsd_printer_t *p, /* I - Printer information */ -@@ -2379,7 +2492,12 @@ +@@ -2384,7 +2497,12 @@ keyvalue[i ][0] = "ty"; keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; @@ -2432,7 +2434,7 @@ httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str), "http", NULL, admin_hostname, DNSSDPort, "/%s/%s", (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", -@@ -2462,7 +2580,12 @@ +@@ -2467,7 +2585,12 @@ * Then pack them into a proper txt record... */ @@ -2445,7 +2447,7 @@ } -@@ -2474,7 +2597,16 @@ +@@ -2479,7 +2602,16 @@ dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */ cupsd_printer_t *b)/* I - Second printer */ { @@ -2463,7 +2465,7 @@ } -@@ -2489,6 +2621,10 @@ +@@ -2494,6 +2626,10 @@ { cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name); @@ -2474,7 +2476,7 @@ /* * Closing the socket deregisters the service */ -@@ -2524,6 +2660,24 @@ +@@ -2529,6 +2665,24 @@ free(p->printer_txt); p->printer_txt = NULL; } @@ -2499,7 +2501,7 @@ /* * Remove the printer from the array of DNS-SD printers, then clear the -@@ -2533,8 +2687,10 @@ +@@ -2538,8 +2692,10 @@ cupsArrayRemove(DNSSDPrinters, p); cupsdClearString(&p->reg_name); } @@ -2510,7 +2512,7 @@ /* * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the * TXT record format. -@@ -2644,8 +2800,10 @@ +@@ -2649,8 +2805,10 @@ LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED; } } @@ -2521,7 +2523,7 @@ /* * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer * or update the broadcast contents. -@@ -2654,20 +2812,40 @@ +@@ -2659,20 +2817,40 @@ static void dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ { @@ -2565,7 +2567,7 @@ /* * If per-printer sharing was just disabled make sure we're not * registered before returning. -@@ -2686,12 +2864,36 @@ +@@ -2691,12 +2869,36 @@ if (p->info && strlen(p->info) > 0) { if (DNSSDComputerName) @@ -2604,7 +2606,7 @@ else strlcpy(name, p->name, sizeof(name)); -@@ -2712,6 +2914,7 @@ +@@ -2717,6 +2919,7 @@ * Register IPP and (optionally) LPD... */ @@ -2612,7 +2614,7 @@ ipp_len = 0; /* anti-compiler-warning-code */ ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0); -@@ -2884,6 +3087,209 @@ +@@ -2889,6 +3092,209 @@ if (printer_txt) free(printer_txt); @@ -2822,7 +2824,7 @@ } -@@ -2896,6 +3302,10 @@ +@@ -2901,6 +3307,10 @@ { cupsd_printer_t *p; /* Current printer */ @@ -2833,7 +2835,7 @@ /* * De-register the individual printers -@@ -2906,6 +3316,7 @@ +@@ -2911,6 +3321,7 @@ p = (cupsd_printer_t *)cupsArrayNext(Printers)) dnssdDeregisterPrinter(p); @@ -2841,7 +2843,7 @@ /* * Shutdown the rest of the service refs... */ -@@ -2926,14 +3337,17 @@ +@@ -2931,14 +3342,17 @@ DNSServiceRefDeallocate(DNSSDRef); DNSSDRef = NULL; @@ -2859,7 +2861,7 @@ /* * 'dnssdUpdate()' - Handle DNS-SD queries. */ -@@ -2955,6 +3369,153 @@ +@@ -2960,6 +3374,153 @@ #endif /* HAVE_DNSSD */ @@ -3089,7 +3091,7 @@ #endif /* HAVE_LDAP */ --- a/scheduler/ipp.c +++ b/scheduler/ipp.c -@@ -6090,7 +6090,7 @@ +@@ -6089,7 +6089,7 @@ ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time", ippTimeToDate(curtime)); @@ -3098,7 +3100,7 @@ if (!ra || cupsArrayFind(ra, "printer-dns-sd-name")) { if (printer->reg_name) -@@ -6100,7 +6100,7 @@ +@@ -6099,7 +6099,7 @@ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE, "printer-dns-sd-name", 0); } @@ -3121,7 +3123,7 @@ cupsArrayDelete(p->filetypes); -@@ -3765,7 +3765,7 @@ +@@ -3797,7 +3797,7 @@ attr->values[i].string.text = _cupsStrAlloc(mimetype); } @@ -3130,7 +3132,7 @@ { char pdl[1024]; /* Buffer to build pdl list */ mime_filter_t *filter; /* MIME filter looping var */ -@@ -3821,7 +3821,7 @@ +@@ -3853,7 +3853,7 @@ cupsdSetString(&p->pdl, pdl); } diff -Nru cups-1.5.2/debian/patches/cups-polld-reconnect.patch cups-1.5.3/debian/patches/cups-polld-reconnect.patch --- cups-1.5.2/debian/patches/cups-polld-reconnect.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/cups-polld-reconnect.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- a/scheduler/cups-polld.c -+++ b/scheduler/cups-polld.c -@@ -291,6 +291,7 @@ - fprintf(stderr, "ERROR: %s CUPS-Get-Printers failed: %s\n", prefix, - cupsLastErrorString()); - ippDelete(response); -+ restart_polling = 1; - return (-1); - } - diff -Nru cups-1.5.2/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch cups-1.5.3/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch --- cups-1.5.2/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ ---- a/cups/mark.c -+++ b/cups/mark.c -@@ -790,6 +790,11 @@ - - if (!_cups_strcasecmp(option, "AP_D_InputSlot")) - { -+ /* CUPS adds AP_D_InputSlot to all jobs, if not explicitly set with -+ empty argument, making the InputSlot option useless. So ignore it -+ if the argument is empty. */ -+ if (choice[0] == '\0') return; -+ - cupsArraySave(ppd->options); - - if ((o = ppdFindOption(ppd, "InputSlot")) != NULL) diff -Nru cups-1.5.2/debian/patches/drop_unnecessary_dependencies.patch cups-1.5.3/debian/patches/drop_unnecessary_dependencies.patch --- cups-1.5.2/debian/patches/drop_unnecessary_dependencies.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/drop_unnecessary_dependencies.patch 2012-05-23 15:26:27.000000000 +0200 @@ -4,7 +4,7 @@ --- a/Makedefs.in +++ b/Makedefs.in -@@ -147,7 +147,7 @@ +@@ -146,7 +146,7 @@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ DNSSD_BACKEND = @DNSSD_BACKEND@ DSOFLAGS = -L../cups @DSOFLAGS@ @@ -13,7 +13,7 @@ DNSSDLIBS = @DNSSDLIBS@ FONTS = @FONTS@ IMGLIBS = @IMGLIBS@ -@@ -157,9 +157,9 @@ +@@ -156,9 +156,9 @@ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) LEGACY_BACKENDS = @LEGACY_BACKENDS@ diff -Nru cups-1.5.2/debian/patches/fix-empty-translations.patch cups-1.5.3/debian/patches/fix-empty-translations.patch --- cups-1.5.2/debian/patches/fix-empty-translations.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/fix-empty-translations.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -Bug: http://www.cups.org/str.php?L4033 -Bug-Ubuntu: https://launchpad.net/bugs/953321 - -Index: cups-1.5.2/cups/language.c -=================================================================== ---- cups-1.5.2.orig/cups/language.c 2011-11-01 07:06:15.000000000 +0100 -+++ cups-1.5.2/cups/language.c 2012-03-13 10:10:38.616940739 +0100 -@@ -979,7 +979,22 @@ - */ - - if (m) -- cupsArrayAdd(a, m); -+ { -+ if (m->str[0]) -+ { -+ cupsArrayAdd(a, m); -+ } -+ else -+ { -+ /* -+ * Translation is empty, don't add it... (STR #4033) -+ */ -+ -+ free(m->id); -+ free(m->str); -+ free(m); -+ } -+ } - - /* - * Create a new message with the given msgid string... -@@ -1057,7 +1072,22 @@ - */ - - if (m) -- cupsArrayAdd(a, m); -+ { -+ if (m->str[0]) -+ { -+ cupsArrayAdd(a, m); -+ } -+ else -+ { -+ /* -+ * Translation is empty, don't add it... (STR #4033) -+ */ -+ -+ free(m->id); -+ free(m->str); -+ free(m); -+ } -+ } - - /* - * Close the message catalog file and return the new array... diff -Nru cups-1.5.2/debian/patches/fix-status-reports-when-supply-levels-grow.patch cups-1.5.3/debian/patches/fix-status-reports-when-supply-levels-grow.patch --- cups-1.5.2/debian/patches/fix-status-reports-when-supply-levels-grow.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/fix-status-reports-when-supply-levels-grow.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -Description: Fix status reports when supply levels grow -Author: Peter Hurley -Bug: http://www.cups.org/str.php?L4016 -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/cups/+bug/925086 - ---- a/backend/snmp-supplies.c -+++ b/backend/snmp-supplies.c -@@ -56,6 +56,7 @@ - color[8]; /* Color: "#RRGGBB" or "none" */ - int colorant, /* Colorant index */ - type, /* Supply type */ -+ class, /* Supply class (consumed/filled) */ - units, /* Supply units (capacity & level)*/ - max_capacity, /* Maximum capacity */ - level; /* Current level value */ -@@ -154,6 +155,13 @@ - (sizeof(prtMarkerSuppliesSupplyUnit) / - sizeof(prtMarkerSuppliesSupplyUnit[0])); - /* Offset to supply index */ -+static const int prtMarkerSuppliesClass[] = -+ { CUPS_OID_prtMarkerSuppliesClass, -1 }, -+ /* Type OID */ -+ prtMarkerSuppliesClassOffset = -+ (sizeof(prtMarkerSuppliesClass) / -+ sizeof(prtMarkerSuppliesClass[0])); -+ /* Offset to supply index */ - - static const backend_state_t const printer_states[] = - { -@@ -261,6 +269,15 @@ - - sprintf(ptr, "%d", percent); - -+ /* normalize percent (for status purposes) if supply is filled (rather -+ * than consumed) and don't evaluate status for supply types that are -+ * neither consumed nor filled -+ */ -+ if (supplies[i].class == CUPS_TC_receptacleThatIsFilled && percent >= 0) -+ percent = (percent < 100) ? 100 - percent : 0; -+ else if (supplies[i].class == CUPS_TC_other) -+ continue; -+ - if (percent >= 0 && percent <= 5) - { - switch (supplies[i].type) -@@ -955,6 +972,25 @@ - - supplies[i - 1].units = packet->object_value.integer; - } -+ else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesClass)) -+ { -+ /* -+ * Get marker class... -+ */ -+ -+ i = packet->object_name[prtMarkerSuppliesClassOffset]; -+ if (i < 1 || i > CUPS_MAX_SUPPLIES || -+ packet->object_type != CUPS_ASN1_INTEGER) -+ return; -+ -+ fprintf(stderr, "DEBUG2: prtMarkerSuppliesClass.1.%d = %d\n", i, -+ packet->object_value.integer); -+ -+ if (i > num_supplies) -+ num_supplies = i; -+ -+ supplies[i - 1].class = packet->object_value.integer; -+ } - } - - diff -Nru cups-1.5.2/debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch cups-1.5.3/debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch --- cups-1.5.2/debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -Description: Fix supply level computation for percent supply unit -Author: Peter Hurley -Bug: http://www.cups.org/str.php?L4016 -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/cups/+bug/925086 - ---- a/backend/backend-private.h -+++ b/backend/backend-private.h -@@ -259,6 +259,25 @@ - #define CUPS_TC_inserts 33 - #define CUPS_TC_covers 34 - -+/* Values defined in RFC 1759 -+ * http://tools.ietf.org/html/rfc1759#page-61 -+ * Additional values from Apple technical note TN2144 -+ * http://developer.apple.com/library/mac/#technotes/tn2144/_index.html -+ */ -+#define CUPS_TC_tenthousandthsofinches 3 -+#define CUPS_TC_micrometers 4 -+#define CUPS_TC_impressions 7 -+#define CUPS_TC_sheets 8 -+#define CUPS_TC_hours 11 -+#define CUPS_TC_thousandthsofounces 12 -+#define CUPS_TC_tenthsofgrams 13 -+#define CUPS_TC_hundredsoffluidounces 14 -+#define CUPS_TC_tenthsofmilliliters 15 -+#define CUPS_TC_feet 16 -+#define CUPS_TC_meters 17 -+#define CUPS_TC_items 18 -+#define CUPS_TC_percent 19 -+ - /* These come from RFC 3808 to define character sets we support */ - /* Also see http://www.iana.org/assignments/character-sets */ - #define CUPS_TC_csASCII 3 ---- a/backend/snmp-supplies.c -+++ b/backend/snmp-supplies.c -@@ -56,6 +56,7 @@ - color[8]; /* Color: "#RRGGBB" or "none" */ - int colorant, /* Colorant index */ - type, /* Supply type */ -+ units, /* Supply units (capacity & level)*/ - max_capacity, /* Maximum capacity */ - level; /* Current level value */ - } backend_supplies_t; -@@ -146,6 +147,13 @@ - (sizeof(prtMarkerSuppliesType) / - sizeof(prtMarkerSuppliesType[0])); - /* Offset to supply index */ -+static const int prtMarkerSuppliesSupplyUnit[] = -+ { CUPS_OID_prtMarkerSuppliesSupplyUnit, -1 }, -+ /* Type OID */ -+ prtMarkerSuppliesSupplyUnitOffset = -+ (sizeof(prtMarkerSuppliesSupplyUnit) / -+ sizeof(prtMarkerSuppliesSupplyUnit[0])); -+ /* Offset to supply index */ - - static const backend_state_t const printer_states[] = - { -@@ -230,7 +238,12 @@ - for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr)) - { - if (supplies[i].max_capacity > 0 && supplies[i].level >= 0) -- percent = 100 * supplies[i].level / supplies[i].max_capacity; -+ { -+ if (supplies[i].units == CUPS_TC_percent) -+ percent = supplies[i].level; -+ else -+ percent = 100 * supplies[i].level / supplies[i].max_capacity; -+ } - else - percent = 50; - -@@ -917,6 +930,25 @@ - - supplies[i - 1].type = packet->object_value.integer; - } -+ else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesSupplyUnit)) -+ { -+ /* -+ * Get marker supply units... -+ */ -+ -+ i = packet->object_name[prtMarkerSuppliesSupplyUnitOffset]; -+ if (i < 1 || i > CUPS_MAX_SUPPLIES || -+ packet->object_type != CUPS_ASN1_INTEGER) -+ return; -+ -+ fprintf(stderr, "DEBUG2: prtMarkerSuppliesSupplyUnit.1.%d = %d\n", i, -+ packet->object_value.integer); -+ -+ if (i > num_supplies) -+ num_supplies = i; -+ -+ supplies[i - 1].units = packet->object_value.integer; -+ } - } - - diff -Nru cups-1.5.2/debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch cups-1.5.3/debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch --- cups-1.5.2/debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -Description: Fix supply levels for enumerated prtMarkerSuppliesLevels -Author: Peter Hurley -Bug: http://www.cups.org/str.php?L4016 -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/cups/+bug/925086 - ---- a/backend/backend-private.h -+++ b/backend/backend-private.h -@@ -186,6 +186,8 @@ - #define CUPS_TC_printing 4 - #define CUPS_TC_warmup 5 - -+#define CUPS_TC_somesupply -3 -+ - /* These come from the hrPrinterDetectedErrorState OCTET-STRING */ - #define CUPS_TC_lowPaper 0x8000 - #define CUPS_TC_noPaper 0x4000 ---- a/backend/snmp-supplies.c -+++ b/backend/snmp-supplies.c -@@ -237,6 +237,13 @@ - - for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr)) - { -+ /* RFC 3805 specifies the following special values for -+ * prtMarkerSuppliesLevel: -+ * -1 other; sub-unit places no restrictions on this parameter -+ * -2 unknown -+ * -3 some supply or remaining space (depending on if supply is -+ * consumed or filled) -+ */ - if (supplies[i].max_capacity > 0 && supplies[i].level >= 0) - { - if (supplies[i].units == CUPS_TC_percent) -@@ -244,10 +251,17 @@ - else - percent = 100 * supplies[i].level / supplies[i].max_capacity; - } -+ else if (supplies[i].level == CUPS_TC_somesupply) -+ percent = 50; - else -- percent = 50; -+ percent = -1; - -- if (percent <= 5) -+ if (i) -+ *ptr++ = ','; -+ -+ sprintf(ptr, "%d", percent); -+ -+ if (percent >= 0 && percent <= 5) - { - switch (supplies[i].type) - { -@@ -288,14 +302,6 @@ - break; - } - } -- -- if (i) -- *ptr++ = ','; -- -- if (supplies[i].max_capacity > 0 && supplies[i].level >= 0) -- sprintf(ptr, "%d", percent); -- else -- strcpy(ptr, "-1"); - } - - fprintf(stderr, "ATTR: marker-levels=%s\n", value); diff -Nru cups-1.5.2/debian/patches/install-sh-remove-bashism.patch cups-1.5.3/debian/patches/install-sh-remove-bashism.patch --- cups-1.5.2/debian/patches/install-sh-remove-bashism.patch 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/debian/patches/install-sh-remove-bashism.patch 2012-05-23 15:26:27.000000000 +0200 @@ -0,0 +1,15 @@ +--- a/install-sh ++++ b/install-sh +@@ -61,10 +61,10 @@ + dst="" + dir_arg="" + +-function gzipcp { ++gzipcp () ( + # gzipcp from to + $gzipprog -9 <"$1" >"$2" +-} ++) + + while [ x"$1" != x ]; do + case $1 in diff -Nru cups-1.5.2/debian/patches/ipp-fixes-1.5.3.patch cups-1.5.3/debian/patches/ipp-fixes-1.5.3.patch --- cups-1.5.2/debian/patches/ipp-fixes-1.5.3.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/ipp-fixes-1.5.3.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,1379 +0,0 @@ ---- a/backend/ipp.c -+++ b/backend/ipp.c -@@ -3,7 +3,7 @@ - * - * IPP backend for CUPS. - * -- * Copyright 2007-2011 by Apple Inc. -+ * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the -@@ -63,6 +63,7 @@ - int port, /* Port number */ - version, /* IPP version */ - job_id; /* Job ID for submitted job */ -+ const char *job_name; /* Job name for submitted job */ - http_encryption_t encryption; /* Use encryption? */ - ipp_jstate_t job_state; /* Current job state */ - ipp_pstate_t printer_state; /* Current printer state */ -@@ -82,12 +83,16 @@ - { - "job-impressions-completed", - "job-media-sheets-completed", -+ "job-name", -+ "job-originating-user-name", - "job-state", - "job-state-reasons" - }; - static int job_canceled = 0; - /* Job cancelled? */ --static char *password = NULL; -+static char username[256] = "", -+ /* Username for device URI */ -+ *password = NULL; - /* Password for device URI */ - static int password_tries = 0; - /* Password tries */ -@@ -186,7 +191,6 @@ - const char *device_uri; /* Device URI */ - char scheme[255], /* Scheme in URI */ - hostname[1024], /* Hostname */ -- username[255], /* Username info */ - resource[1024], /* Resource info (printer name) */ - addrname[256], /* Address name */ - *optptr, /* Pointer to URI options */ -@@ -205,6 +209,7 @@ - int port; /* Port number (not used) */ - char portname[255]; /* Port name */ - char uri[HTTP_MAX_URI]; /* Updated URI without user/pass */ -+ char print_job_name[1024]; /* Update job-name for Print-Job */ - http_status_t http_status; /* Status of HTTP request */ - ipp_status_t ipp_status; /* Status of IPP request */ - http_t *http; /* HTTP connection */ -@@ -231,7 +236,9 @@ - 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 */ -- int validate_job; /* Does printer support Validate-Job? */ -+ int create_job = 0, /* Does printer support Create-Job? */ -+ send_document = 0, /* Does printer support Send-Document? */ -+ validate_job = 0; /* Does printer support Validate-Job? */ - int copies, /* Number of copies for job */ - copies_remaining; /* Number of copies remaining */ - const char *content_type, /* CONTENT_TYPE environment variable */ -@@ -604,7 +611,10 @@ - const char *ptr = getenv("AUTH_USERNAME"); - - if (ptr) -+ { -+ strlcpy(username, ptr, sizeof(username)); - cupsSetUser(ptr); -+ } - - password = getenv("AUTH_PASSWORD"); - } -@@ -789,7 +799,6 @@ - supported = NULL; - operations_sup = NULL; - doc_handling_sup = NULL; -- validate_job = 0; - - do - { -@@ -834,7 +843,9 @@ - fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n", - ippErrorString(ipp_status), cupsLastErrorString()); - -- if (ipp_status > IPP_OK_CONFLICT) -+ if (ipp_status <= IPP_OK_CONFLICT) -+ password_tries = 0; -+ else - { - fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n", - ippErrorString(ipp_status)); -@@ -891,16 +902,21 @@ - - return (CUPS_BACKEND_STOP); - } -- else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN) -+ else if (ipp_status == IPP_FORBIDDEN || -+ ipp_status == IPP_AUTHENTICATION_CANCELED) - { -- if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE), -- "Negotiate", 9)) -+ const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); -+ /* WWW-Authenticate field value */ -+ -+ if (!strncmp(www_auth, "Negotiate", 9)) - auth_info_required = "negotiate"; -+ else if (www_auth[0]) -+ auth_info_required = "username,password"; - - fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required); - return (CUPS_BACKEND_AUTH_REQUIRED); - } -- else -+ else if (ipp_status != IPP_NOT_AUTHORIZED) - { - _cupsLangPrintFilter(stderr, "ERROR", - _("Unable to get printer status.")); -@@ -1042,11 +1058,21 @@ - "cups-ipp-missing-get-printer-attributes"); - - for (i = 0; i < operations_sup->num_values; i ++) -+ { - if (operations_sup->values[i].integer == IPP_VALIDATE_JOB) -- { - validate_job = 1; -- break; -- } -+ else if (operations_sup->values[i].integer == IPP_CREATE_JOB) -+ create_job = 1; -+ else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT) -+ send_document = 1; -+ } -+ -+ if (!send_document) -+ { -+ fputs("DEBUG: Printer supports Create-Job but not Send-Document.\n", -+ stderr); -+ create_job = 0; -+ } - - if (!validate_job) - update_reasons(NULL, "+cups-ipp-conformance-failure-report," -@@ -1116,7 +1142,7 @@ - { - copies_remaining = 1; - -- if (argc < 7 && !send_options) -+ if (argc < 7 && !_cups_strncasecmp(final_content_type, "image/", 6)) - copies = 1; - } - else -@@ -1153,7 +1179,8 @@ - if (format_sup != NULL) - { - for (i = 0; i < format_sup->num_values; i ++) -- if (!_cups_strcasecmp(final_content_type, format_sup->values[i].string.text)) -+ if (!_cups_strcasecmp(final_content_type, -+ format_sup->values[i].string.text)) - { - document_format = final_content_type; - break; -@@ -1163,7 +1190,7 @@ - { - for (i = 0; i < format_sup->num_values; i ++) - if (!_cups_strcasecmp("application/octet-stream", -- format_sup->values[i].string.text)) -+ format_sup->values[i].string.text)) - { - document_format = "application/octet-stream"; - break; -@@ -1171,6 +1198,9 @@ - } - } - -+ fprintf(stderr, "DEBUG: final_content_type=\"%s\", document_format=\"%s\"\n", -+ final_content_type, document_format ? document_format : "(null)"); -+ - /* - * If the printer does not support HTTP/1.1 (which IPP requires), copy stdin - * to a temporary file so that we can do a HTTP/1.0 submission... -@@ -1188,8 +1218,17 @@ - - _cupsLangPrintFilter(stderr, "INFO", _("Copying print data.")); - -- compatsize = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, -- backendNetworkSideCB); -+ if ((compatsize = write(fd, buffer, bytes)) < 0) -+ { -+ perror("DEBUG: Unable to write temporary file"); -+ return (CUPS_BACKEND_FAILED); -+ } -+ -+ if ((bytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, -+ backendNetworkSideCB)) < 0) -+ return (CUPS_BACKEND_FAILED); -+ -+ compatsize += bytes; - - close(fd); - -@@ -1220,6 +1259,17 @@ - monitor.job_state = IPP_JOB_PENDING; - monitor.printer_state = IPP_PRINTER_IDLE; - -+ if (create_job) -+ { -+ monitor.job_name = argv[3]; -+ } -+ else -+ { -+ snprintf(print_job_name, sizeof(print_job_name), "%s - %s", argv[1], -+ argv[3]); -+ monitor.job_name = print_job_name; -+ } -+ - _cupsThreadCreate((_cups_thread_func_t)monitor_printer, &monitor); - - /* -@@ -1228,8 +1278,8 @@ - - while (!job_canceled && validate_job) - { -- request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], argv[3], -- num_options, options, compression, -+ request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], -+ monitor.job_name, num_options, options, compression, - copies_sup ? copies : 1, document_format, pc, - media_col_sup, doc_handling_sup); - -@@ -1248,26 +1298,16 @@ - _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy.")); - sleep(10); - } -- else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN || -+ else if (ipp_status == IPP_FORBIDDEN || - ipp_status == IPP_AUTHENTICATION_CANCELED) - { -- /* -- * Update auth-info-required as needed... -- */ -- -- fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n", -- httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE)); -- -- /* -- * Normal authentication goes through the password callback, which sets -- * auth_info_required to "username,password". Kerberos goes directly -- * through GSSAPI, so look for Negotiate in the WWW-Authenticate header -- * here and set auth_info_required as needed... -- */ -+ const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); -+ /* WWW-Authenticate field value */ - -- if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE), -- "Negotiate", 9)) -+ if (!strncmp(www_auth, "Negotiate", 9)) - auth_info_required = "negotiate"; -+ else if (www_auth[0]) -+ auth_info_required = "username,password"; - - goto cleanup; - } -@@ -1306,16 +1346,17 @@ - if (job_canceled) - break; - -- request = new_request(num_files > 1 ? IPP_CREATE_JOB : IPP_PRINT_JOB, -- version, uri, argv[2], argv[3], num_options, options, -- compression, copies_sup ? copies : 1, document_format, -- pc, media_col_sup, doc_handling_sup); -+ request = new_request((num_files > 1 || create_job) ? IPP_CREATE_JOB : -+ IPP_PRINT_JOB, -+ version, uri, argv[2], monitor.job_name, num_options, -+ options, compression, copies_sup ? copies : 1, -+ document_format, pc, media_col_sup, doc_handling_sup); - - /* - * Do the request... - */ - -- if (num_files > 1) -+ if (num_files > 1 || create_job) - response = cupsDoRequest(http, request, resource); - else - { -@@ -1333,7 +1374,13 @@ - if (http_status == HTTP_CONTINUE && request->state == IPP_DATA) - { - if (num_files == 1) -- fd = open(files[0], O_RDONLY); -+ { -+ if ((fd = open(files[0], O_RDONLY)) < 0) -+ { -+ _cupsLangPrintError("ERROR", _("Unable to open print file")); -+ return (CUPS_BACKEND_FAILED); -+ } -+ } - else - { - fd = 0; -@@ -1382,7 +1429,7 @@ - ipp_status = cupsLastError(); - - fprintf(stderr, "DEBUG: %s: %s (%s)\n", -- num_files > 1 ? "Create-Job" : "Print-Job", -+ (num_files > 1 || create_job) ? "Create-Job" : "Print-Job", - ippErrorString(ipp_status), cupsLastErrorString()); - - if (ipp_status > IPP_OK_CONFLICT) -@@ -1411,6 +1458,8 @@ - } - else if (ipp_status == IPP_ERROR_JOB_CANCELED) - goto cleanup; -+ else if (ipp_status == IPP_NOT_AUTHORIZED) -+ continue; - else - { - /* -@@ -1420,21 +1469,24 @@ - _cupsLangPrintFilter(stderr, "ERROR", - _("Print file was not accepted.")); - -- if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN) -+ if (ipp_status == IPP_FORBIDDEN || -+ ipp_status == IPP_AUTHENTICATION_CANCELED) - { -- fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n", -- httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE)); -+ const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); -+ /* WWW-Authenticate field value */ - -- /* -- * Normal authentication goes through the password callback, which sets -- * auth_info_required to "username,password". Kerberos goes directly -- * through GSSAPI, so look for Negotiate in the WWW-Authenticate header -- * here and set auth_info_required as needed... -+ if (!strncmp(www_auth, "Negotiate", 9)) -+ auth_info_required = "negotiate"; -+ else if (www_auth[0]) -+ auth_info_required = "username,password"; -+ } -+ else if (ipp_status == IPP_REQUEST_VALUE) -+ { -+ /* -+ * Print file is too large, abort this job... - */ - -- if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE), -- "Negotiate", 9)) -- auth_info_required = "negotiate"; -+ goto cleanup; - } - else - sleep(10); -@@ -1461,19 +1513,21 @@ - } - else - { -+ password_tries = 0; - monitor.job_id = job_id = job_id_attr->values[0].integer; - _cupsLangPrintFilter(stderr, "INFO", - _("Print file accepted - job ID %d."), job_id); - } - -+ fprintf(stderr, "DEBUG: job-id=%d\n", job_id); - ippDelete(response); - - if (job_canceled) - break; - -- if (job_id && num_files > 1) -+ if (job_id && (num_files > 1 || create_job)) - { -- for (i = 0; i < num_files; i ++) -+ for (i = 0; num_files == 0 || i < num_files; i ++) - { - /* - * Check for side-channel requests... -@@ -1499,16 +1553,35 @@ - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, - "requesting-user-name", NULL, argv[2]); - -- if ((i + 1) == num_files) -+ if ((i + 1) >= num_files) - ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1); - -- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, -- "document-format", NULL, content_type); -+ if (document_format) -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, -+ "document-format", NULL, document_format); - - fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1); - http_status = cupsSendRequest(http, request, resource, 0); -- if (http_status == HTTP_CONTINUE && request->state == IPP_DATA && -- (fd = open(files[i], O_RDONLY)) >= 0) -+ if (http_status == HTTP_CONTINUE && request->state == IPP_DATA) -+ { -+ if (num_files == 0) -+ { -+ fd = 0; -+ http_status = cupsWriteRequestData(http, buffer, bytes); -+ } -+ else -+ { -+ if ((fd = open(files[i], O_RDONLY)) < 0) -+ { -+ _cupsLangPrintError("ERROR", _("Unable to open print file")); -+ return (CUPS_BACKEND_FAILED); -+ } -+ } -+ } -+ else -+ fd = -1; -+ -+ if (fd >= 0) - { - while (!job_canceled && - (bytes = read(fd, buffer, sizeof(buffer))) > 0) -@@ -1525,7 +1598,8 @@ - } - } - -- close(fd); -+ if (fd > 0) -+ close(fd); - } - - ippDelete(cupsGetResponse(http, resource)); -@@ -1542,6 +1616,13 @@ - _("Unable to add document to print job.")); - break; - } -+ else -+ { -+ password_tries = 0; -+ -+ if (num_files == 0 || fd < 0) -+ break; -+ } - } - } - -@@ -1554,6 +1635,14 @@ - ipp_status == IPP_NOT_POSSIBLE || - ipp_status == IPP_PRINTER_BUSY) - continue; -+ else if (ipp_status == IPP_REQUEST_VALUE) -+ { -+ /* -+ * Print file is too large, abort this job... -+ */ -+ -+ goto cleanup; -+ } - else - copies_remaining --; - -@@ -1621,16 +1710,16 @@ - fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n", - ippErrorString(ipp_status), cupsLastErrorString()); - -- if (ipp_status > IPP_OK_CONFLICT) -+ if (ipp_status <= IPP_OK_CONFLICT) -+ password_tries = 0; -+ else - { - if (ipp_status != IPP_SERVICE_UNAVAILABLE && - ipp_status != IPP_NOT_POSSIBLE && - ipp_status != IPP_PRINTER_BUSY) - { - ippDelete(response); -- -- _cupsLangPrintFilter(stderr, "ERROR", -- _("Unable to get print job status.")); -+ ipp_status = IPP_OK; - break; - } - } -@@ -1777,6 +1866,11 @@ - else if (ipp_status == IPP_DOCUMENT_FORMAT || - ipp_status == IPP_CONFLICT) - return (CUPS_BACKEND_FAILED); -+ else if (ipp_status == IPP_REQUEST_VALUE) -+ { -+ _cupsLangPrintFilter(stderr, "ERROR", _("Print job too large.")); -+ return (CUPS_BACKEND_CANCEL); -+ } - else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED) - return (CUPS_BACKEND_RETRY_CURRENT); - else -@@ -1879,6 +1973,9 @@ - fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n", - ippErrorString(cupsLastError()), cupsLastErrorString()); - -+ if (cupsLastError() <= IPP_OK_CONFLICT) -+ password_tries = 0; -+ - /* - * Return the printer-state value... - */ -@@ -1972,6 +2069,11 @@ - ipp_attribute_t *attr; /* Attribute in response */ - int delay, /* Current delay */ - prev_delay; /* Previous delay */ -+ ipp_op_t job_op; /* Operation to use */ -+ int job_id; /* Job ID */ -+ const char *job_name; /* Job name */ -+ ipp_jstate_t job_state; /* Job state */ -+ const char *job_user; /* Job originating user name */ - - - /* -@@ -1981,6 +2083,8 @@ - http = _httpCreate(monitor->hostname, monitor->port, NULL, monitor->encryption, - AF_UNSPEC); - httpSetTimeout(http, 30.0, timeout_cb, NULL); -+ if (username[0]) -+ cupsSetUser(username); - cupsSetPasswordCB(password_cb); - - /* -@@ -2006,47 +2110,99 @@ - monitor->user, - monitor->version); - -- if (monitor->job_id > 0) -- { -- /* -- * Check the status of the job itself... -- */ -+ /* -+ * Check the status of the job itself... -+ */ - -- request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES); -- request->request.op.version[0] = monitor->version / 10; -- request->request.op.version[1] = monitor->version % 10; -+ job_op = monitor->job_id > 0 ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS; -+ request = ippNewRequest(job_op); -+ request->request.op.version[0] = monitor->version / 10; -+ request->request.op.version[1] = monitor->version % 10; - -- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", -- NULL, monitor->uri); -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", -+ NULL, monitor->uri); -+ if (job_op == IPP_GET_JOB_ATTRIBUTES) - ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", -- monitor->job_id); -+ monitor->job_id); - -- if (monitor->user && monitor->user[0]) -- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, -- "requesting-user-name", NULL, monitor->user); -+ if (monitor->user && monitor->user[0]) -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, -+ "requesting-user-name", NULL, monitor->user); - -- ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, -- "requested-attributes", -- (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); -+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, -+ "requested-attributes", -+ (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); - -- /* -- * Do the request... -- */ -+ /* -+ * Do the request... -+ */ - -- response = cupsDoRequest(http, request, monitor->resource); -+ response = cupsDoRequest(http, request, monitor->resource); - -- fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n", -- ippErrorString(cupsLastError()), cupsLastErrorString()); -+ fprintf(stderr, "DEBUG: %s: %s (%s)\n", ippOpString(job_op), -+ ippErrorString(cupsLastError()), cupsLastErrorString()); - -+ if (cupsLastError() <= IPP_OK_CONFLICT) -+ password_tries = 0; -+ -+ if (job_op == IPP_GET_JOB_ATTRIBUTES) -+ { - if ((attr = ippFindAttribute(response, "job-state", - IPP_TAG_ENUM)) != NULL) - monitor->job_state = (ipp_jstate_t)attr->values[0].integer; - else - monitor->job_state = IPP_JOB_COMPLETED; -+ } -+ else if (response) -+ { -+ for (attr = response->attrs; attr; attr = attr->next) -+ { -+ job_id = 0; -+ job_name = NULL; -+ job_state = IPP_JOB_PENDING; -+ job_user = NULL; -+ -+ while (attr && attr->group_tag != IPP_TAG_JOB) -+ attr = attr->next; -+ -+ if (!attr) -+ break; -+ -+ while (attr && attr->group_tag == IPP_TAG_JOB) -+ { -+ if (!strcmp(attr->name, "job-id") && -+ attr->value_tag == IPP_TAG_INTEGER) -+ job_id = attr->values[0].integer; -+ else if (!strcmp(attr->name, "job-name") && -+ (attr->value_tag == IPP_TAG_NAME || -+ attr->value_tag == IPP_TAG_NAMELANG)) -+ job_name = attr->values[0].string.text; -+ else if (!strcmp(attr->name, "job-state") && -+ attr->value_tag == IPP_TAG_ENUM) -+ job_state = attr->values[0].integer; -+ else if (!strcmp(attr->name, "job-originating-user-name") && -+ (attr->value_tag == IPP_TAG_NAME || -+ attr->value_tag == IPP_TAG_NAMELANG)) -+ job_user = attr->values[0].string.text; - -- ippDelete(response); -+ attr = attr->next; -+ } -+ -+ if (job_id > 0 && job_name && !strcmp(job_name, monitor->job_name) && -+ job_user && monitor->user && !strcmp(job_user, monitor->user)) -+ { -+ monitor->job_id = job_id; -+ monitor->job_state = job_state; -+ break; -+ } -+ -+ if (!attr) -+ break; -+ } - } - -+ ippDelete(response); -+ - /* - * Disconnect from the printer - we'll reconnect on the next poll... - */ -@@ -2064,6 +2220,15 @@ - } - - /* -+ * Cancel the job if necessary... -+ */ -+ -+ if (job_canceled && monitor->job_id > 0) -+ if (!httpReconnect(http)) -+ cancel_job(http, monitor->uri, monitor->job_id, monitor->resource, -+ monitor->user, monitor->version); -+ -+ /* - * Cleanup and return... - */ - -@@ -2088,7 +2253,7 @@ - cups_option_t *options, /* I - Options to send */ - const char *compression, /* I - compression value or NULL */ - int copies, /* I - copies value or 0 */ -- const char *format, /* I - documet-format value or NULL */ -+ const char *format, /* I - document-format value or NULL */ - _ppd_cache_t *pc, /* I - PPD cache and mapping data */ - ipp_attribute_t *media_col_sup, /* I - media-col-supported values */ - ipp_attribute_t *doc_handling_sup) /* I - multiple-document-handling-supported values */ -@@ -2163,6 +2328,9 @@ - { - if (pc) - { -+ int num_finishings = 0, /* Number of finishing values */ -+ finishings[10]; /* Finishing enum values */ -+ - /* - * Send standard IPP attributes... - */ -@@ -2284,6 +2452,7 @@ - } - - if (doc_handling_sup && -+ (!format || _cups_strncasecmp(format, "image/", 6)) && - (keyword = cupsGetOption("collate", num_options, options)) != NULL) - { - if (!_cups_strcasecmp(keyword, "true")) -@@ -2299,6 +2468,43 @@ - break; - } - } -+ -+ /* -+ * Map finishing options... -+ */ -+ -+ num_finishings = _ppdCacheGetFinishingValues(pc, num_options, options, -+ (int)(sizeof(finishings) / -+ sizeof(finishings[0])), -+ finishings); -+ if (num_finishings > 0) -+ ippAddIntegers(request, IPP_TAG_JOB, IPP_TAG_ENUM, "finishings", -+ num_finishings, finishings); -+ -+ /* -+ * Map FaxOut options... -+ */ -+ -+ if ((keyword = cupsGetOption("phone", num_options, options)) != NULL) -+ { -+ ipp_t *destination; /* destination collection */ -+ char tel_uri[1024]; /* tel: URI */ -+ -+ destination = ippNew(); -+ -+ httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", -+ NULL, NULL, 0, keyword); -+ ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", -+ NULL, tel_uri); -+ -+ if ((keyword = cupsGetOption("faxPrefix", num_options, -+ options)) != NULL && *keyword) -+ ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, -+ "pre-dial-string", NULL, keyword); -+ -+ ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination); -+ ippDelete(destination); -+ } - } - else - { -@@ -2324,6 +2530,9 @@ - static const char * /* O - Password */ - password_cb(const char *prompt) /* I - Prompt (not used) */ - { -+ fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\"), password=%p, " -+ "password_tries=%d\n", prompt, password, password_tries); -+ - (void)prompt; - - /* -@@ -2386,17 +2595,23 @@ - case IPP_TAG_TEXT : - case IPP_TAG_NAME : - case IPP_TAG_KEYWORD : -+ *valptr++ = '\''; - *valptr++ = '\"'; - for (attrptr = attr->values[i].string.text; - *attrptr && valptr < (value + sizeof(value) - 10); - attrptr ++) - { -- if (*attrptr == '\\' || *attrptr == '\"') -+ if (*attrptr == '\\' || *attrptr == '\"' || *attrptr == '\'') -+ { -+ *valptr++ = '\\'; - *valptr++ = '\\'; -+ *valptr++ = '\\'; -+ } - - *valptr++ = *attrptr; - } - *valptr++ = '\"'; -+ *valptr++ = '\''; - break; - - default : ---- a/cups/auth.c -+++ b/cups/auth.c -@@ -124,7 +124,8 @@ - const char *method, /* I - Request method ("GET", "POST", "PUT") */ - const char *resource) /* I - Resource path */ - { -- const char *password; /* Password string */ -+ const char *password, /* Password string */ -+ *www_auth; /* WWW-Authenticate header */ - char prompt[1024], /* Prompt for user */ - realm[HTTP_MAX_VALUE], /* realm="xyz" string */ - nonce[HTTP_MAX_VALUE]; /* nonce="xyz" string */ -@@ -179,9 +180,11 @@ - * Nope, see if we should retry the current username:password... - */ - -+ www_auth = http->fields[HTTP_FIELD_WWW_AUTHENTICATE]; -+ - if ((http->digest_tries > 1 || !http->userpass[0]) && -- (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) || -- !strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6))) -+ (!_cups_strncasecmp(www_auth, "Basic", 5) || -+ !_cups_strncasecmp(www_auth, "Digest", 6))) - { - /* - * Nope - get a new password from the user... -@@ -197,8 +200,7 @@ - cupsUser(), - http->hostname[0] == '/' ? "localhost" : http->hostname); - -- http->digest_tries = _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], -- "Digest", 5) != 0; -+ http->digest_tries = _cups_strncasecmp(www_auth, "Digest", 6) != 0; - http->userpass[0] = '\0'; - - if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL) -@@ -227,7 +229,7 @@ - */ - - #ifdef HAVE_GSSAPI -- if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9)) -+ if (!_cups_strncasecmp(www_auth, "Negotiate", 9)) - { - /* - * Kerberos authentication... -@@ -241,7 +243,7 @@ - } - else - #endif /* HAVE_GSSAPI */ -- if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5)) -+ if (!_cups_strncasecmp(www_auth, "Basic", 5)) - { - /* - * Basic authentication... -@@ -254,7 +256,7 @@ - (int)strlen(http->userpass)); - httpSetAuthString(http, "Basic", encode); - } -- else if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6)) -+ else if (!_cups_strncasecmp(www_auth, "Digest", 6)) - { - /* - * Digest authentication... -@@ -277,7 +279,7 @@ - else - { - DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"", -- http->fields[HTTP_FIELD_WWW_AUTHENTICATE])); -+ www_auth)); - http->status = HTTP_AUTHORIZATION_CANCELED; - return (-1); - } ---- a/cups/http-support.c -+++ b/cups/http-support.c -@@ -757,10 +757,13 @@ - - - tdate = gmtime(&t); -- snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT", -- http_days[tdate->tm_wday], tdate->tm_mday, -- http_months[tdate->tm_mon], tdate->tm_year + 1900, -- tdate->tm_hour, tdate->tm_min, tdate->tm_sec); -+ if (tdate) -+ snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT", -+ http_days[tdate->tm_wday], tdate->tm_mday, -+ http_months[tdate->tm_mon], tdate->tm_year + 1900, -+ tdate->tm_hour, tdate->tm_min, tdate->tm_sec); -+ else -+ s[0] = '\0'; - - return (s); - } ---- a/cups/http.c -+++ b/cups/http.c -@@ -3833,7 +3833,8 @@ - _cups_globals_t *cg = _cupsGlobals(); - /* Pointer to library globals */ - int any_root; /* Allow any root */ -- char *hostname; /* Hostname */ -+ char hostname[256], /* Hostname */ -+ *hostptr; /* Pointer into hostname */ - - # ifdef HAVE_LIBSSL - SSL_CTX *context; /* Context for encryption */ -@@ -3869,11 +3870,24 @@ - */ - - if (httpAddrLocalhost(http->hostaddr)) -+ { - any_root = 1; -+ strlcpy(hostname, "localhost", sizeof(hostname)); -+ } - else -+ { -+ /* -+ * Otherwise use the system-wide setting and make sure the hostname we have -+ * does not end in a trailing dot. -+ */ -+ - any_root = cg->any_root; - -- hostname = httpAddrLocalhost(http->hostaddr) ? "localhost" : http->hostname; -+ strlcpy(hostname, http->hostname, sizeof(hostname)); -+ if ((hostptr = hostname + strlen(hostname) - 1) >= hostname && -+ *hostptr == '.') -+ *hostptr = '\0'; -+ } - - # ifdef HAVE_LIBSSL - (void)any_root; -@@ -4009,15 +4023,6 @@ - cg->expired_root, (int)error)); - } - --# ifdef HAVE_SSLSETPROTOCOLVERSIONMAX -- if (!error) -- { -- error = SSLSetProtocolVersionMax(http->tls, kTLSProtocol1); -- DEBUG_printf(("4http_setup_ssl: SSLSetProtocolVersionMax(kTLSProtocol1), " -- "error=%d", (int)error)); -- } --# endif /* HAVE_SSLSETPROTOCOLVERSIONMAX */ -- - /* - * In general, don't verify certificates since things like the common name - * often do not match... ---- a/cups/ppd-cache.c -+++ b/cups/ppd-cache.c -@@ -3,7 +3,7 @@ - * - * PPD cache implementation for CUPS. - * -- * Copyright 2010-2011 by Apple Inc. -+ * Copyright 2010-2012 by Apple Inc. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright -@@ -65,6 +65,9 @@ - * Local functions... - */ - -+static int pwg_compare_finishings(_pwg_finishings_t *a, -+ _pwg_finishings_t *b); -+static void pwg_free_finishings(_pwg_finishings_t *f); - static void pwg_ppdize_name(const char *ipp, char *name, size_t namesize); - static void pwg_unppdize_name(const char *ppd, char *name, size_t namesize); - -@@ -86,6 +89,7 @@ - _ppd_cache_t *pc; /* PWG mapping data */ - _pwg_size_t *size; /* Current size */ - _pwg_map_t *map; /* Current map */ -+ _pwg_finishings_t *finishings; /* Current finishings option */ - int linenum, /* Current line number */ - num_bins, /* Number of bins in file */ - num_sizes, /* Number of sizes in file */ -@@ -532,6 +536,23 @@ - pc->sides_2sided_long = _cupsStrAlloc(value); - else if (!_cups_strcasecmp(line, "Sides2SidedShort")) - pc->sides_2sided_short = _cupsStrAlloc(value); -+ else if (!_cups_strcasecmp(line, "Finishings")) -+ { -+ if (!pc->finishings) -+ pc->finishings = -+ cupsArrayNew3((cups_array_func_t)pwg_compare_finishings, -+ NULL, NULL, 0, NULL, -+ (cups_afree_func_t)pwg_free_finishings); -+ -+ if ((finishings = calloc(1, sizeof(_pwg_finishings_t))) == NULL) -+ goto create_error; -+ -+ finishings->value = strtol(value, &valueptr, 10); -+ finishings->num_options = cupsParseOptions(valueptr, 0, -+ &(finishings->options)); -+ -+ cupsArrayAdd(pc->finishings, finishings); -+ } - else - { - DEBUG_printf(("_ppdCacheCreateWithFile: Unknown %s on line %d.", line, -@@ -633,6 +654,7 @@ - new_known_pwg; /* New PWG name is well-known */ - _pwg_size_t *new_size; /* New size to add, if any */ - const char *filter; /* Current filter */ -+ _pwg_finishings_t *finishings; /* Current finishings value */ - - - DEBUG_printf(("_ppdCacheCreateWithPPD(ppd=%p)", ppd)); -@@ -731,8 +753,10 @@ - * want to keep it if it has a larger imageable area length. - */ - -- new_width = _PWG_FROMPTS(ppd_size->width); -- new_length = _PWG_FROMPTS(ppd_size->length); -+ pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width), -+ _PWG_FROMPTS(ppd_size->length)); -+ new_width = pwg_media->width; -+ new_length = pwg_media->length; - new_left = _PWG_FROMPTS(ppd_size->left); - new_bottom = _PWG_FROMPTS(ppd_size->bottom); - new_right = _PWG_FROMPTS(ppd_size->width - ppd_size->right); -@@ -862,7 +886,7 @@ - else if (!_cups_strncasecmp(choice->choice, "Multipurpose", 12) || - !_cups_strcasecmp(choice->choice, "MP") || - !_cups_strcasecmp(choice->choice, "MPTray")) -- pwg_name = "alternate"; -+ pwg_name = "by-pass-tray"; - else if (!_cups_strcasecmp(choice->choice, "LargeCapacity")) - pwg_name = "large-capacity"; - else if (!_cups_strncasecmp(choice->choice, "Lower", 5)) -@@ -1299,6 +1323,32 @@ - pc->product = _cupsStrAlloc(ppd->product); - - /* -+ * Copy finishings mapping data... -+ */ -+ -+ if ((ppd_attr = ppdFindAttr(ppd, "cupsIPPFinishings", NULL)) != NULL) -+ { -+ pc->finishings = cupsArrayNew3((cups_array_func_t)pwg_compare_finishings, -+ NULL, NULL, 0, NULL, -+ (cups_afree_func_t)pwg_free_finishings); -+ -+ do -+ { -+ if ((finishings = calloc(1, sizeof(_pwg_finishings_t))) == NULL) -+ goto create_error; -+ -+ finishings->value = atoi(ppd_attr->spec); -+ finishings->num_options = _ppdParseOptions(ppd_attr->value, 0, -+ &(finishings->options), -+ _PPD_PARSE_OPTIONS); -+ -+ cupsArrayAdd(pc->finishings, finishings); -+ } -+ while ((ppd_attr = ppdFindNextAttr(ppd, "cupsIPPFinishings", -+ NULL)) != NULL); -+ } -+ -+ /* - * Return the cache data... - */ - -@@ -1396,6 +1446,7 @@ - _cupsStrFree(pc->product); - cupsArrayDelete(pc->filters); - cupsArrayDelete(pc->prefilters); -+ cupsArrayDelete(pc->finishings); - - free(pc); - } -@@ -1435,6 +1486,125 @@ - - - /* -+ * '_ppdCacheGetFinishingOptions()' - Get PPD finishing options for the given -+ * IPP finishings value(s). -+ */ -+ -+int /* O - New number of options */ -+_ppdCacheGetFinishingOptions( -+ _ppd_cache_t *pc, /* I - PPD cache and mapping data */ -+ ipp_t *job, /* I - Job attributes or NULL */ -+ ipp_finish_t value, /* I - IPP finishings value of IPP_FINISHINGS_NONE */ -+ int num_options, /* I - Number of options */ -+ cups_option_t **options) /* IO - Options */ -+{ -+ int i; /* Looping var */ -+ _pwg_finishings_t *f, /* PWG finishings options */ -+ key; /* Search key */ -+ ipp_attribute_t *attr; /* Finishings attribute */ -+ cups_option_t *option; /* Current finishings option */ -+ -+ -+ /* -+ * Range check input... -+ */ -+ -+ if (!pc || cupsArrayCount(pc->finishings) == 0 || !options || -+ (!job && value == IPP_FINISHINGS_NONE)) -+ return (num_options); -+ -+ /* -+ * Apply finishing options... -+ */ -+ -+ if (job && (attr = ippFindAttribute(job, "finishings", IPP_TAG_ENUM)) != NULL) -+ { -+ for (i = 0; i < attr->num_values; i ++) -+ { -+ key.value = attr->values[i].integer; -+ -+ if ((f = cupsArrayFind(pc->finishings, &key)) != NULL) -+ { -+ int j; /* Another looping var */ -+ -+ for (j = f->num_options, option = f->options; j > 0; j --, option ++) -+ num_options = cupsAddOption(option->name, option->value, -+ num_options, options); -+ } -+ } -+ } -+ else if (value != IPP_FINISHINGS_NONE) -+ { -+ key.value = value; -+ -+ if ((f = cupsArrayFind(pc->finishings, &key)) != NULL) -+ { -+ int j; /* Another looping var */ -+ -+ for (j = f->num_options, option = f->options; j > 0; j --, option ++) -+ num_options = cupsAddOption(option->name, option->value, -+ num_options, options); -+ } -+ } -+ -+ return (num_options); -+} -+ -+ -+/* -+ * '_ppdCacheGetFinishingValues()' - Get IPP finishings value(s) from the given -+ * PPD options. -+ */ -+ -+int /* O - Number of finishings values */ -+_ppdCacheGetFinishingValues( -+ _ppd_cache_t *pc, /* I - PPD cache and mapping data */ -+ int num_options, /* I - Number of options */ -+ cups_option_t *options, /* I - Options */ -+ int max_values, /* I - Maximum number of finishings values */ -+ int *values) /* O - Finishings values */ -+{ -+ int i, /* Looping var */ -+ num_values = 0; /* Number of values */ -+ _pwg_finishings_t *f; /* Current finishings option */ -+ cups_option_t *option; /* Current option */ -+ const char *val; /* Value for option */ -+ -+ -+ /* -+ * Range check input... -+ */ -+ -+ if (!pc || !pc->finishings || num_options < 1 || max_values < 1 || !values) -+ return (0); -+ -+ /* -+ * Go through the finishings options and see what is set... -+ */ -+ -+ for (f = (_pwg_finishings_t *)cupsArrayFirst(pc->finishings); -+ f; -+ f = (_pwg_finishings_t *)cupsArrayNext(pc->finishings)) -+ { -+ for (i = f->num_options, option = f->options; i > 0; i --, option ++) -+ if ((val = cupsGetOption(option->name, num_options, options)) == NULL || -+ _cups_strcasecmp(option->value, val)) -+ break; -+ -+ if (i == 0) -+ { -+ values[num_values ++] = f->value; -+ -+ if (num_values >= max_values) -+ break; -+ } -+ } -+ -+ return (num_values); -+} -+ -+ -+/* - * '_ppdCacheGetInputSlot()' - Get the PPD InputSlot associated with the job - * attributes or a keyword string. - */ -@@ -1835,7 +2005,8 @@ - _ppd_cache_t *pc, /* I - PPD cache and mapping data */ - const char *page_size) /* I - PPD PageSize */ - { -- int i; -+ int i; /* Looping var */ -+ _pwg_media_t *media; /* Media */ - _pwg_size_t *size; /* Current size */ - - -@@ -1914,9 +2085,26 @@ - */ - - for (i = pc->num_sizes, size = pc->sizes; i > 0; i --, size ++) -- if (!_cups_strcasecmp(page_size, size->map.ppd)) -+ if (!_cups_strcasecmp(page_size, size->map.ppd) || -+ !_cups_strcasecmp(page_size, size->map.pwg)) - return (size); - -+ /* -+ * Look up standard sizes... -+ */ -+ -+ if ((media = _pwgMediaForPPD(page_size)) == NULL) -+ if ((media = _pwgMediaForLegacy(page_size)) == NULL) -+ media = _pwgMediaForPWG(page_size); -+ -+ if (media) -+ { -+ pc->custom_size.width = media->width; -+ pc->custom_size.length = media->length; -+ -+ return (&(pc->custom_size)); -+ } -+ - return (NULL); - } - -@@ -1989,13 +2177,14 @@ - const char *filename, /* I - File to write */ - ipp_t *attrs) /* I - Attributes to write, if any */ - { -- int i, j, k; /* Looping vars */ -- cups_file_t *fp; /* Output file */ -- _pwg_size_t *size; /* Current size */ -- _pwg_map_t *map; /* Current map */ -- cups_option_t *option; /* Current option */ -- const char *value; /* Filter/pre-filter value */ -- char newfile[1024]; /* New filename */ -+ int i, j, k; /* Looping vars */ -+ cups_file_t *fp; /* Output file */ -+ _pwg_size_t *size; /* Current size */ -+ _pwg_map_t *map; /* Current map */ -+ _pwg_finishings_t *f; /* Current finishing option */ -+ cups_option_t *option; /* Current option */ -+ const char *value; /* Filter/pre-filter value */ -+ char newfile[1024]; /* New filename */ - - - /* -@@ -2129,6 +2318,20 @@ - cupsFilePrintf(fp, "SingleFile %s\n", pc->single_file ? "true" : "false"); - - /* -+ * Finishing options... -+ */ -+ -+ for (f = (_pwg_finishings_t *)cupsArrayFirst(pc->finishings); -+ f; -+ f = (_pwg_finishings_t *)cupsArrayNext(pc->finishings)) -+ { -+ cupsFilePrintf(fp, "Finishings %d", f->value); -+ for (i = f->num_options, option = f->options; i > 0; i --, option ++) -+ cupsFilePrintf(fp, " %s=%s", option->name, option->value); -+ cupsFilePutChar(fp, '\n'); -+ } -+ -+ /* - * IPP attributes, if any... - */ - -@@ -2310,6 +2513,32 @@ - } - - -+/* -+ * 'pwg_compare_finishings()' - Compare two finishings values. -+ */ -+ -+static int /* O- Result of comparison */ -+pwg_compare_finishings( -+ _pwg_finishings_t *a, /* I - First finishings value */ -+ _pwg_finishings_t *b) /* I - Second finishings value */ -+{ -+ return (b->value - a->value); -+} -+ -+ -+/* -+ * 'pwg_free_finishings()' - Free a finishings value. -+ */ -+ -+static void -+pwg_free_finishings( -+ _pwg_finishings_t *f) /* I - Finishings value */ -+{ -+ cupsFreeOptions(f->num_options, f->options); -+ free(f); -+} -+ -+ - /* - * 'pwg_ppdize_name()' - Convert an IPP keyword to a PPD keyword. - */ ---- a/cups/ppd-private.h -+++ b/cups/ppd-private.h -@@ -49,7 +49,7 @@ - * Constants... - */ - --# define _PPD_CACHE_VERSION 1 /* Version number in cache file */ -+# define _PPD_CACHE_VERSION 2 /* Version number in cache file */ - - - /* -@@ -86,7 +86,7 @@ - _PWG_PRINT_COLOR_MODE_MAX - } _pwg_print_color_mode_t; - --typedef enum _pwg_print_quality_e /**** PWG print-quality indices ****/ -+typedef enum _pwg_print_quality_e /**** PWG print-quality values ****/ - { - _PWG_PRINT_QUALITY_DRAFT = 0, /* print-quality=3 */ - _PWG_PRINT_QUALITY_NORMAL, /* print-quality=4 */ -@@ -94,6 +94,13 @@ - _PWG_PRINT_QUALITY_MAX - } _pwg_print_quality_t; - -+typedef struct _pwg_finishings_s /**** PWG finishings mapping data ****/ -+{ -+ ipp_finish_t value; /* finishings value */ -+ int num_options; /* Number of options to apply */ -+ cups_option_t *options; /* Options to apply */ -+} _pwg_finishings_t; -+ - struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/ - { - int num_bins; /* Number of output bins */ -@@ -125,6 +132,7 @@ - cups_array_t *filters, /* cupsFilter/cupsFilter2 values */ - *prefilters; /* cupsPreFilter values */ - int single_file; /* cupsSingleFile value */ -+ cups_array_t *finishings; /* cupsIPPFinishings values */ - }; - - -@@ -138,6 +146,12 @@ - extern void _ppdCacheDestroy(_ppd_cache_t *pc); - extern const char *_ppdCacheGetBin(_ppd_cache_t *pc, - const char *output_bin); -+extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc, ipp_t *job, -+ ipp_finish_t value, int num_options, -+ cups_option_t **options); -+extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc, int num_options, -+ cups_option_t *options, -+ int max_values, int *values); - extern const char *_ppdCacheGetInputSlot(_ppd_cache_t *pc, ipp_t *job, - const char *keyword); - extern const char *_ppdCacheGetMediaType(_ppd_cache_t *pc, ipp_t *job, ---- a/cups/pwg-media.c -+++ b/cups/pwg-media.c -@@ -117,7 +117,7 @@ - - /* Chinese Standard Sheet Media Inch Sizes */ - _PWG_MEDIA_IN("roc_16k_7.75x10.75in", NULL, "roc16k", 7.75, 10.75), -- _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, NULL, 10.75, 15.5), -+ _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, "roc8k", 10.75, 15.5), - - /* ISO Standard Sheet Media Sizes */ - _PWG_MEDIA_MM("iso_a10_26x37mm", "iso-a10", "A10", 26, 37), -@@ -128,7 +128,7 @@ - _PWG_MEDIA_MM("iso_a5_148x210mm", "iso-a5", "A5", 148, 210), - _PWG_MEDIA_MM("iso_a5-extra_174x235mm", NULL, "A5Extra", 174, 235), - _PWG_MEDIA_MM("iso_a4_210x297mm", "iso-a4", "A4", 210, 297), -- _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, NULL, 225, 297), -+ _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, "A4Tab", 225, 297), - _PWG_MEDIA_MM("iso_a4-extra_235.5x322.3mm", NULL, "A4Extra", 235.5, 322.3), - _PWG_MEDIA_MM("iso_a3_297x420mm", "iso-a3", "A3", 297, 420), - _PWG_MEDIA_MM("iso_a4x3_297x630mm", "iso-a4x3", NULL, 297, 630), -@@ -233,9 +233,9 @@ - _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, NULL, 100, 150), - _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230), - _PWG_MEDIA_MM("om_postfix_114x229mm", NULL, NULL, 114, 229), -- _PWG_MEDIA_MM("om_large-photo_200x300", NULL, NULL, 200, 300), -+ _PWG_MEDIA_MM("om_large-photo_200x300", NULL, "om_large-photo", 200, 300), - _PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330), -- _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, NULL, 215, 315), -+ _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, "FolioSP", 215, 315), - _PWG_MEDIA_MM("om_invite_220x220mm", NULL, "EnvInvite", 220, 220) - }; - ---- a/cups/pwg-private.h -+++ b/cups/pwg-private.h -@@ -39,7 +39,7 @@ - */ - - /* Convert from points to 2540ths */ --# define _PWG_FROMPTS(n) (int)((n) * 2540 / 72) -+# define _PWG_FROMPTS(n) (int)(((n) * 2540 + 36) / 72) - /* Convert from 2540ths to points */ - # define _PWG_TOPTS(n) ((n) * 72.0 / 2540.0) - diff -Nru cups-1.5.2/debian/patches/match-marker-colorants-which-use-non-standard-string.patch cups-1.5.3/debian/patches/match-marker-colorants-which-use-non-standard-string.patch --- cups-1.5.2/debian/patches/match-marker-colorants-which-use-non-standard-string.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/match-marker-colorants-which-use-non-standard-string.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Description: Match marker colorants which use non standard string -Author: Peter Hurley -Bug: http://www.cups.org/str.php?L4019 -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/cups/+bug/925086 - ---- a/backend/snmp-supplies.c -+++ b/backend/snmp-supplies.c -@@ -790,7 +790,7 @@ - if (supplies[j].colorant == i) - { - for (k = 0; k < (int)(sizeof(colors) / sizeof(colors[0])); k ++) -- if (!strcmp(colors[k][0], (char *)packet->object_value.string.bytes)) -+ if (!strcasecmp(colors[k][0], (char *)packet->object_value.string.bytes)) - { - strcpy(supplies[j].color, colors[k][1]); - break; diff -Nru cups-1.5.2/debian/patches/no-conffile-timestamp.patch cups-1.5.3/debian/patches/no-conffile-timestamp.patch --- cups-1.5.2/debian/patches/no-conffile-timestamp.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/no-conffile-timestamp.patch 2012-05-23 15:26:27.000000000 +0200 @@ -27,7 +27,7 @@ * Write each local printer known to the system... --- a/scheduler/job.c +++ b/scheduler/job.c -@@ -2013,7 +2013,7 @@ +@@ -2033,7 +2033,7 @@ strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate); cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n"); @@ -49,7 +49,7 @@ /* --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c -@@ -1104,7 +1104,7 @@ +@@ -1108,7 +1108,7 @@ strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate); cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n"); diff -Nru cups-1.5.2/debian/patches/ppd-cache-fix-crash.patch cups-1.5.3/debian/patches/ppd-cache-fix-crash.patch --- cups-1.5.2/debian/patches/ppd-cache-fix-crash.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/ppd-cache-fix-crash.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ ---- a/cups/ppd-cache.c -+++ b/cups/ppd-cache.c -@@ -749,12 +749,15 @@ - } - - /* -- * If we have a similar paper with non-zero margins then we only -- * want to keep it if it has a larger imageable area length. -+ * If we have a similar paper with non-zero margins then we only want to -+ * keep it if it has a larger imageable area length. The NULL check is for -+ * dimensions that are <= 0... - */ - -- pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width), -- _PWG_FROMPTS(ppd_size->length)); -+ if ((pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width), -+ _PWG_FROMPTS(ppd_size->length))) == NULL) -+ continue; -+ - new_width = pwg_media->width; - new_length = pwg_media->length; - new_left = _PWG_FROMPTS(ppd_size->left); diff -Nru cups-1.5.2/debian/patches/ppd-poll-with-client-conf.patch cups-1.5.3/debian/patches/ppd-poll-with-client-conf.patch --- cups-1.5.2/debian/patches/ppd-poll-with-client-conf.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/ppd-poll-with-client-conf.patch 2012-05-23 15:26:27.000000000 +0200 @@ -3,7 +3,7 @@ --- a/cups/util.c +++ b/cups/util.c -@@ -1077,11 +1077,13 @@ +@@ -1078,11 +1078,13 @@ http2 = http; else if ((http2 = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL) diff -Nru cups-1.5.2/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch cups-1.5.3/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch --- cups-1.5.2/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch 2012-05-23 15:26:27.000000000 +0200 @@ -2,7 +2,7 @@ --- a/scheduler/ipp.c +++ b/scheduler/ipp.c -@@ -9640,6 +9640,11 @@ +@@ -9639,6 +9639,11 @@ ipp_attribute_t *attr, /* Current attribute */ *attr2, /* Job attribute */ *prev2; /* Previous job attribute */ @@ -14,7 +14,7 @@ /* -@@ -9701,6 +9706,85 @@ +@@ -9700,6 +9705,85 @@ } /* diff -Nru cups-1.5.2/debian/patches/series cups-1.5.3/debian/patches/series --- cups-1.5.2/debian/patches/series 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/series 2012-05-23 15:38:08.000000000 +0200 @@ -1,11 +1,9 @@ # patches accepted and committed upstream: -ipp-fixes-1.5.3.patch -fix-empty-translations.patch -ppd-cache-fix-crash.patch -commandtops-make-robust-against-broken-postscript.patch -cups-polld-reconnect.patch # patches sent upstream +usb-backend-busy-loop-fix.patch +usb-backend-detach-usblp-earlier-crash-guards.patch +usb-backend-initialize-usblp-attached-state.patch pidfile.patch ppd-poll-with-client-conf.patch # no answer yet, po4a might not be appropriate @@ -13,16 +11,9 @@ rootbackends-worldreadable.patch cups-avahi.patch colord-support.patch -usb-backend-libusb-1.0.patch -usb-backend-backchannel-support.patch -fix-supply-level-computation-for-percent-supply-unit.patch -fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch -fix-status-reports-when-supply-levels-grow.patch -add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch -match-marker-colorants-which-use-non-standard-string.patch -truncate-marker-supply-names-at-comma.patch # patches which should go upstream +install-sh-remove-bashism.patch airprint-support.patch removecvstag.patch no-conffile-timestamp.patch @@ -33,7 +24,6 @@ cups-deviced-allow-device-ids-with-newline.patch cups-snmp-oids-device-id-hp-ricoh.patch configure-default-browse-protocols.patch -do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch # Debian patches logfiles_adm_readable.patch diff -Nru cups-1.5.2/debian/patches/show-compile-command-lines.patch cups-1.5.3/debian/patches/show-compile-command-lines.patch --- cups-1.5.2/debian/patches/show-compile-command-lines.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/show-compile-command-lines.patch 2012-05-23 15:26:27.000000000 +0200 @@ -2,7 +2,7 @@ --- a/Makedefs.in +++ b/Makedefs.in -@@ -275,7 +275,6 @@ +@@ -274,7 +274,6 @@ # Rules... # diff -Nru cups-1.5.2/debian/patches/truncate-marker-supply-names-at-comma.patch cups-1.5.3/debian/patches/truncate-marker-supply-names-at-comma.patch --- cups-1.5.2/debian/patches/truncate-marker-supply-names-at-comma.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/truncate-marker-supply-names-at-comma.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Description: Truncate marker supply names at comma -Author: Peter Hurley -Bug: http://www.cups.org/str.php?L4020 -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/cups/+bug/926457 - ---- a/backend/snmp-supplies.c -+++ b/backend/snmp-supplies.c -@@ -715,7 +715,7 @@ - *ptr++ = ','; - - *ptr++ = '\"'; -- for (name_ptr = supplies[i].name; *name_ptr;) -+ for (name_ptr = supplies[i].name; *name_ptr && *name_ptr != ',';) - { - if (*name_ptr == '\\' || *name_ptr == '\"') - *ptr++ = '\\'; diff -Nru cups-1.5.2/debian/patches/usb-backend-backchannel-support.patch cups-1.5.3/debian/patches/usb-backend-backchannel-support.patch --- cups-1.5.2/debian/patches/usb-backend-backchannel-support.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/usb-backend-backchannel-support.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,1090 +0,0 @@ -Description: Backchannel/bi-directional support for the libusb-based USB backend -Bug: http://www.cups.org/str.php?L2890 -Author: Till Kamppeter - ---- a/backend/usb-libusb.c -+++ b/backend/usb-libusb.c -@@ -13,16 +13,20 @@ - * - * Contents: - * -- * list_devices() - List the available printers. -- * print_device() - Print a file to a USB device. -- * close_device() - Close the connection to the USB printer. -- * find_device() - Find or enumerate USB printers. -- * get_device_id() - Get the IEEE-1284 device ID for the printer. -- * list_cb() - List USB printers for discovery. -- * make_device_uri() - Create a device URI for a USB printer. -- * open_device() - Open a connection to the USB printer. -- * print_cb() - Find a USB printer for printing. -- * side_cb() - Handle side-channel requests. -+ * list_devices() - List the available printers. -+ * print_device() - Print a file to a USB device. -+ * read_thread() - Thread to read the backchannel data on. -+ * sidechannel_thread() - Handle side-channel requests. -+ * close_device() - Close the connection to the USB printer. -+ * find_device() - Find or enumerate USB printers. -+ * get_device_id() - Get the IEEE-1284 device ID for the printer. -+ * list_cb() - List USB printers for discovery. -+ * make_device_uri() - Create a device URI for a USB printer. -+ * open_device() - Open a connection to the USB printer. -+ * print_cb() - Find a USB printer for printing. -+ * soft_reset() - Send a soft reset to the device. -+ * next_line() - Find the next line in a buffer. -+ * parse_pserror() - Scan the backchannel data for postscript errors. - */ - - /* -@@ -30,10 +34,32 @@ - */ - - #include --#include - #include -+#include -+#include -+#include -+#include -+#include -+#include - --libusb_device **list; /* List of connected USB devices */ -+#define PARSE_PS_ERRORS 1 -+ -+/* -+ * DEBUG_WRITES, if defined, causes the backend to write data to the printer in -+ * 512 byte increments, up to 8192 bytes, to make debugging with a USB bus -+ * analyzer easier. -+ */ -+ -+#define DEBUG_WRITES 0 -+ -+/* -+ * WAIT_EOF_DELAY is number of seconds we'll wait for responses from -+ * the printer after we've finished sending all the data -+ */ -+#define WAIT_EOF 0 -+#define WAIT_EOF_DELAY 7 -+#define WAIT_SIDE_DELAY 3 -+#define DEFAULT_TIMEOUT 5000L - - /* - * Local types... -@@ -47,6 +73,7 @@ - altset, /* Alternate setting */ - write_endp, /* Write endpoint */ - read_endp, /* Read endpoint */ -+ protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */ - usblp_attached; /* Is the "usblp" kernel module - attached? */ - struct libusb_device_handle *handle; /* Open handle to device */ -@@ -55,11 +82,49 @@ - typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *, - const void *); - -+typedef struct globals_s -+{ -+ usb_printer_t *printer; /* Printer */ -+ -+ pthread_mutex_t read_thread_mutex; -+ pthread_cond_t read_thread_cond; -+ int read_thread_stop; -+ int read_thread_done; -+ -+ pthread_mutex_t readwrite_lock_mutex; -+ pthread_cond_t readwrite_lock_cond; -+ int readwrite_lock; -+ -+ int print_fd; /* File descriptor to print */ -+ ssize_t print_bytes; /* Print bytes read */ -+#if DEBUG_WRITES -+ ssize_t debug_bytes; /* Current bytes to read */ -+#endif /* DEBUG_WRITES */ -+ -+ int wait_eof; -+ int drain_output; /* Drain all pending output */ -+ int bidi_flag; /* 0=unidirectional, 1=bidirectional */ -+ -+ pthread_mutex_t sidechannel_thread_mutex; -+ pthread_cond_t sidechannel_thread_cond; -+ int sidechannel_thread_stop; -+ int sidechannel_thread_done; -+} globals_t; -+ -+ -+/* -+ * Globals... -+ */ -+ -+globals_t g = { 0 }; /* Globals */ -+libusb_device **list; /* List of connected USB devices */ - - /* - * Local functions... - */ - -+static void *read_thread(void *reference); -+static void *sidechannel_thread(void *reference); - static int close_device(usb_printer_t *printer); - static usb_printer_t *find_device(usb_cb_t cb, const void *data); - static int get_device_id(usb_printer_t *printer, char *buffer, -@@ -72,7 +137,11 @@ - static int open_device(usb_printer_t *printer, int verbose); - static int print_cb(usb_printer_t *printer, const char *device_uri, - const char *device_id, const void *data); --static ssize_t side_cb(usb_printer_t *printer, int print_fd); -+static void soft_reset(void); -+#ifdef PARSE_PS_ERRORS -+static const char *next_line (const char *buffer); -+static void parse_pserror (char *sockBuffer, int len); -+#endif /* PARSE_PS_ERRORS */ - - - /* -@@ -101,28 +170,47 @@ - int argc, /* I - Number of command-line arguments (6 or 7) */ - char *argv[]) /* I - Command-line arguments */ - { -- usb_printer_t *printer; /* Printer */ -- int bytes, /* Bytes to read/write */ -- transferred, /* Bytes read/written */ -- tbytes; /* Total bytes written */ -- unsigned char buffer[512]; /* Print data buffer */ -+ int bytes; /* Bytes written */ -+ ssize_t total_bytes; /* Total bytes written */ - struct sigaction action; /* Actions for POSIX signals */ -- struct pollfd pfds[2]; /* Poll descriptors */ -+ int status = CUPS_BACKEND_OK, /* Function results */ -+ iostatus; /* Current IO status */ -+ pthread_t read_thread_id, /* Read thread */ -+ sidechannel_thread_id; /* Side-channel thread */ -+ int have_sidechannel = 0; /* Was the side-channel thread started? */ -+ struct stat sidechannel_info; /* Side-channel file descriptor info */ -+ unsigned char print_buffer[8192], /* Print data buffer */ -+ *print_ptr; /* Pointer into print data buffer */ -+ fd_set input_set; /* Input set for select() */ -+ int nfds; /* Number of file descriptors */ -+ struct timeval *timeout, /* Timeout pointer */ -+ tv; /* Time value */ -+ struct timespec cond_timeout; /* pthread condition timeout */ - - - fputs("DEBUG: print_device\n", stderr); - - /* -+ * See if the side-channel descriptor is valid... -+ */ -+ -+ have_sidechannel = !fstat(CUPS_SC_FD, &sidechannel_info) && -+ S_ISSOCK(sidechannel_info.st_mode); -+ -+ g.wait_eof = WAIT_EOF; -+ -+ /* - * Connect to the printer... - */ - -- while ((printer = find_device(print_cb, uri)) == NULL) -+ while ((g.printer = find_device(print_cb, uri)) == NULL) - { - _cupsLangPrintFilter(stderr, "INFO", - _("Waiting for printer to become available.")); - sleep(5); - } - -+ g.print_fd = print_fd; - - /* - * If we are printing data from a print driver on stdin, ignore SIGTERM -@@ -131,7 +219,7 @@ - * is no way to cancel a raw print job... - */ - -- if (!print_fd) -+ if (print_fd) - { - memset(&action, 0, sizeof(action)); - -@@ -140,72 +228,373 @@ - sigaction(SIGTERM, &action, NULL); - } - -- tbytes = 0; -+ /* -+ * Start the side channel thread if the descriptor is valid... -+ */ -+ -+ pthread_mutex_init(&g.readwrite_lock_mutex, NULL); -+ pthread_cond_init(&g.readwrite_lock_cond, NULL); -+ g.readwrite_lock = 1; -+ -+ if (have_sidechannel) -+ { -+ g.sidechannel_thread_stop = 0; -+ g.sidechannel_thread_done = 0; -+ -+ pthread_cond_init(&g.sidechannel_thread_cond, NULL); -+ pthread_mutex_init(&g.sidechannel_thread_mutex, NULL); -+ -+ if (pthread_create(&sidechannel_thread_id, NULL, sidechannel_thread, NULL)) -+ { -+ fprintf(stderr, "DEBUG: Fatal USB error.\n"); -+ _cupsLangPrintFilter(stderr, "ERROR", -+ _("There was an unrecoverable USB error.")); -+ fputs("DEBUG: Couldn't create side-channel thread\n", stderr); -+ close_device(g.printer); -+ return (CUPS_BACKEND_STOP); -+ } -+ } -+ -+ /* -+ * Get the read thread going... -+ */ -+ -+ g.read_thread_stop = 0; -+ g.read_thread_done = 0; -+ -+ pthread_cond_init(&g.read_thread_cond, NULL); -+ pthread_mutex_init(&g.read_thread_mutex, NULL); -+ -+ if (pthread_create(&read_thread_id, NULL, read_thread, NULL)) -+ { -+ fprintf(stderr, "DEBUG: Fatal USB error.\n"); -+ _cupsLangPrintFilter(stderr, "ERROR", -+ _("There was an unrecoverable USB error.")); -+ fputs("DEBUG: Couldn't create read thread\n", stderr); -+ close_device(g.printer); -+ return (CUPS_BACKEND_STOP); -+ } -+ -+ /* -+ * The main thread sends the print file... -+ */ - -- pfds[0].fd = print_fd; -- pfds[0].events = POLLIN; -- pfds[1].fd = CUPS_SC_FD; -- pfds[1].events = POLLIN; -+ g.drain_output = 0; -+ g.print_bytes = 0; -+ total_bytes = 0; -+ print_ptr = print_buffer; - -- while (copies > 0 && tbytes >= 0) -+ while (status == CUPS_BACKEND_OK && copies-- > 0) - { -- copies --; -+ _cupsLangPrintFilter(stderr, "INFO", _("Sending data to printer.")); - -- if (print_fd != 0) -+ if (print_fd != STDIN_FILENO) - { - fputs("PAGE: 1 1\n", stderr); - lseek(print_fd, 0, SEEK_SET); - } - -- /* -- * TODO: Add back-channel support, along with better write error handling. -- */ -- -- while (poll(pfds, 2, -1) > 0) -+ while (status == CUPS_BACKEND_OK) - { -+ FD_ZERO(&input_set); -+ -+ if (!g.print_bytes) -+ FD_SET(print_fd, &input_set); -+ -+ /* -+ * Calculate select timeout... -+ * If we have data waiting to send timeout is 100ms. -+ * else if we're draining print_fd timeout is 0. -+ * else we're waiting forever... -+ */ -+ -+ if (g.print_bytes) -+ { -+ tv.tv_sec = 0; -+ tv.tv_usec = 100000; /* 100ms */ -+ timeout = &tv; -+ } -+ else if (g.drain_output) -+ { -+ tv.tv_sec = 0; -+ tv.tv_usec = 0; -+ timeout = &tv; -+ } -+ else -+ timeout = NULL; -+ -+ /* -+ * I/O is unlocked around select... -+ */ -+ -+ pthread_mutex_lock(&g.readwrite_lock_mutex); -+ g.readwrite_lock = 0; -+ pthread_cond_signal(&g.readwrite_lock_cond); -+ pthread_mutex_unlock(&g.readwrite_lock_mutex); -+ -+ nfds = select(print_fd + 1, &input_set, NULL, NULL, timeout); -+ -+ /* -+ * Reacquire the lock... -+ */ -+ -+ pthread_mutex_lock(&g.readwrite_lock_mutex); -+ while (g.readwrite_lock) -+ pthread_cond_wait(&g.readwrite_lock_cond, &g.readwrite_lock_mutex); -+ g.readwrite_lock = 1; -+ pthread_mutex_unlock(&g.readwrite_lock_mutex); -+ -+ if (nfds < 0) -+ { -+ if (errno == EINTR && total_bytes == 0) -+ { -+ fputs("DEBUG: Received an interrupt before any bytes were " -+ "written, aborting\n", stderr); -+ close_device(g.printer); -+ return (CUPS_BACKEND_OK); -+ } -+ else if (errno != EAGAIN && errno != EINTR) -+ { -+ _cupsLangPrintFilter(stderr, "ERROR", -+ _("Unable to read print data.")); -+ perror("DEBUG: select"); -+ close_device(g.printer); -+ return (CUPS_BACKEND_FAILED); -+ } -+ } -+ -+ /* -+ * If drain output has finished send a response... -+ */ -+ -+ if (g.drain_output && !nfds && !g.print_bytes) -+ { -+ /* Send a response... */ -+ cupsSideChannelWrite(CUPS_SC_CMD_DRAIN_OUTPUT, CUPS_SC_STATUS_OK, NULL, 0, 1.0); -+ g.drain_output = 0; -+ } -+ - /* -- * CUPS STR #3318: USB process hangs on end-of-file, making further -- * printing impossible -- * -- * From a strict interpretation of POSIX poll(), POLLHUP should never be -- * set without POLLIN, since POLLIN is the event you request. That said, -- * it appears that some versions of Linux break this. -+ * Check if we have print data ready... - */ - -- if (pfds[0].revents & (POLLIN | POLLHUP)) -+ if (FD_ISSET(print_fd, &input_set)) - { -- if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) -+#if DEBUG_WRITES -+ g.debug_bytes += 512; -+ if (g.debug_bytes > sizeof(print_buffer)) -+ g.debug_bytes = 512; -+ -+ g.print_bytes = read(print_fd, print_buffer, g.debug_bytes); -+ -+#else -+ g.print_bytes = read(print_fd, print_buffer, sizeof(print_buffer)); -+#endif /* DEBUG_WRITES */ -+ -+ if (g.print_bytes < 0) - { -- if (libusb_bulk_transfer(printer->handle, printer->write_endp, buffer, -- bytes, &transferred, 3600000) < 0) -+ /* -+ * Read error - bail if we don't see EAGAIN or EINTR... -+ */ -+ -+ if (errno != EAGAIN && errno != EINTR) - { - _cupsLangPrintFilter(stderr, "ERROR", -- _("Unable to send data to printer.")); -- tbytes = -1; -- break; -+ _("Unable to read print data.")); -+ perror("DEBUG: read"); -+ close_device(g.printer); -+ return (CUPS_BACKEND_FAILED); - } - -- tbytes += bytes; -+ g.print_bytes = 0; - } -- else if (bytes == 0 || (bytes < 0 && errno != EAGAIN && errno != EINTR)) -+ else if (g.print_bytes == 0) -+ { -+ /* -+ * End of file, break out of the loop... -+ */ -+ - break; -+ } -+ -+ print_ptr = print_buffer; -+ -+ fprintf(stderr, "DEBUG: Read %d bytes of print data...\n", -+ (int)g.print_bytes); - } - -- if (pfds[1].revents & (POLLIN | POLLHUP)) -+ if (g.print_bytes) - { -- if ((bytes = side_cb(printer, print_fd)) < 0) -- pfds[1].events = 0; /* Filter has gone away... */ -- else -- tbytes += bytes; -+ iostatus = libusb_bulk_transfer(g.printer->handle, -+ g.printer->write_endp, -+ print_buffer, g.print_bytes, -+ &bytes, 60000); -+ /* -+ * Ignore timeout errors, but retain the number of bytes written to -+ * avoid sending duplicate data ()... -+ */ -+ -+ if (iostatus == LIBUSB_ERROR_TIMEOUT) -+ { -+ fputs("DEBUG: Got USB transaction timeout during write\n", stderr); -+ iostatus = 0; -+ } -+ -+ /* -+ * If we've stalled, retry the write... -+ */ -+ -+ else if (iostatus == LIBUSB_ERROR_PIPE) -+ { -+ fputs("DEBUG: Got USB pipe stalled during write\n", stderr); -+ -+ iostatus = libusb_bulk_transfer(g.printer->handle, -+ g.printer->write_endp, -+ print_buffer, g.print_bytes, -+ &bytes, 60000); -+ } -+ -+ /* -+ * Retry a write after an aborted write since we probably just got -+ * SIGTERM ... -+ */ -+ -+ else if (iostatus == LIBUSB_ERROR_INTERRUPTED) -+ { -+ fputs("DEBUG: Got USB return aborted during write\n", stderr); -+ -+#if DEBUG_WRITES -+ sleep(5); -+#endif /* DEBUG_WRITES */ -+ -+ iostatus = libusb_bulk_transfer(g.printer->handle, -+ g.printer->write_endp, -+ print_buffer, g.print_bytes, -+ &bytes, 60000); -+ } -+ -+ if (iostatus) -+ { -+ /* -+ * Write error - bail if we don't see an error we can retry... -+ */ -+ -+ _cupsLangPrintFilter(stderr, "ERROR", -+ _("Unable to send data to printer.")); -+ fprintf(stderr, "DEBUG: libusb write operation returned %x\n", -+ iostatus); -+ -+ status = CUPS_BACKEND_FAILED; -+ break; -+ } -+ else if (bytes > 0) -+ { -+ fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes); -+ -+ g.print_bytes -= bytes; -+ print_ptr += bytes; -+ total_bytes += bytes; -+ } - } -+ -+ if (print_fd != 0 && status == CUPS_BACKEND_OK) -+ fprintf(stderr, "DEBUG: Sending print file, %lld bytes...\n", -+ (long long int)total_bytes); - } - } - -+ fprintf(stderr, "DEBUG: Sent %lld bytes...\n", (long long int)total_bytes); -+ - /* -- * Close our connection and return... -+ * Signal the side channel thread to exit... - */ - -- close_device(printer); -+ if (have_sidechannel) -+ { -+ close(CUPS_SC_FD); -+ pthread_mutex_lock(&g.readwrite_lock_mutex); -+ g.readwrite_lock = 0; -+ pthread_cond_signal(&g.readwrite_lock_cond); -+ pthread_mutex_unlock(&g.readwrite_lock_mutex); -+ -+ g.sidechannel_thread_stop = 1; -+ pthread_mutex_lock(&g.sidechannel_thread_mutex); -+ -+ if (!g.sidechannel_thread_done) -+ { -+ gettimeofday(&tv, NULL); -+ cond_timeout.tv_sec = tv.tv_sec + WAIT_SIDE_DELAY; -+ cond_timeout.tv_nsec = tv.tv_usec * 1000; -+ -+ while (!g.sidechannel_thread_done) -+ { -+ if (pthread_cond_timedwait(&g.sidechannel_thread_cond, -+ &g.sidechannel_thread_mutex, -+ &cond_timeout) != 0) -+ break; -+ } -+ } -+ -+ pthread_mutex_unlock(&g.sidechannel_thread_mutex); -+ } -+ -+ /* -+ * Signal the read thread to exit then wait 7 seconds for it to complete... -+ */ -+ -+ g.read_thread_stop = 1; -+ -+ pthread_mutex_lock(&g.read_thread_mutex); -+ -+ if (!g.read_thread_done) -+ { -+ fputs("DEBUG: Waiting for read thread to exit...\n", stderr); -+ -+ gettimeofday(&tv, NULL); -+ cond_timeout.tv_sec = tv.tv_sec + WAIT_EOF_DELAY; -+ cond_timeout.tv_nsec = tv.tv_usec * 1000; -+ -+ while (!g.read_thread_done) -+ { -+ if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, -+ &cond_timeout) != 0) -+ break; -+ } -+ -+ /* -+ * If it didn't exit abort the pending read and wait an additional second... -+ */ -+ -+ if (!g.read_thread_done) -+ { -+ fputs("DEBUG: Read thread still active, aborting the pending read...\n", -+ stderr); -+ -+ g.wait_eof = 0; -+ -+ gettimeofday(&tv, NULL); -+ cond_timeout.tv_sec = tv.tv_sec + 1; -+ cond_timeout.tv_nsec = tv.tv_usec * 1000; -+ -+ while (!g.read_thread_done) -+ { -+ if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, -+ &cond_timeout) != 0) -+ break; -+ } -+ } -+ } -+ -+ pthread_mutex_unlock(&g.read_thread_mutex); -+ -+ if (print_fd != STDIN_FILENO) -+ close(print_fd); -+ -+ /* -+ * Close the connection and input file and general clean up... -+ */ -+ -+ close_device(g.printer); - - /* - * Clean up .... -@@ -214,7 +603,234 @@ - libusb_free_device_list(list, 1); - libusb_exit(NULL); - -- return (CUPS_BACKEND_OK); -+ return status; -+} -+ -+ -+/* -+ * 'read_thread()' - Thread to read the backchannel data on. -+ */ -+ -+static void *read_thread(void *reference) -+{ -+ unsigned char readbuffer[512]; -+ int rbytes; -+ int readstatus; -+ struct timeval now, -+ delay, -+ end, -+ timeleft; -+ -+ -+ (void)reference; -+ -+ /* -+ * Read frequency: Once every 250 milliSeconds -+ */ -+ delay.tv_sec = 0; -+ delay.tv_usec = 250000; -+ -+ do -+ { -+ /* -+ * Remember when we started so we can throttle the loop after the read -+ * call... -+ */ -+ gettimeofday(&now, NULL); -+ -+ /* -+ * Calculate what 250 milliSeconds are in absolute time... -+ */ -+ timeradd(&now, &delay, &end); -+ -+ rbytes = sizeof(readbuffer); -+ readstatus = libusb_bulk_transfer(g.printer->handle, -+ g.printer->read_endp, -+ readbuffer, rbytes, -+ &rbytes, 60000); -+ if (readstatus == LIBUSB_SUCCESS && rbytes > 0) -+ { -+ fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", -+ (int)rbytes); -+ cupsBackChannelWrite((const char *)readbuffer, rbytes, 1.0); -+ -+#ifdef PARSE_PS_ERRORS -+ parse_pserror((char *)readbuffer, rbytes); -+#endif -+ -+ /* cntrl-d is echoed by the printer. -+ * NOTES: -+ * Xerox Phaser 6250D doesn't echo the cntrl-d. -+ * Xerox Phaser 6250D doesn't always send the product query. -+ */ -+ if (g.wait_eof && readbuffer[rbytes-1] == 0x4) -+ break; -+ } -+ else if (readstatus == LIBUSB_ERROR_TIMEOUT) -+ fputs("DEBUG: Got USB transaction timeout during read\n", stderr); -+ else if (readstatus == LIBUSB_ERROR_PIPE) -+ fputs("DEBUG: Got USB pipe stalled during read\n", stderr); -+ else if (readstatus == LIBUSB_ERROR_INTERRUPTED) -+ fputs("DEBUG: Got USB return aborted during read\n", stderr); -+ -+ /* -+ * Make sure this loop executes no more than once every 250 miliseconds... -+ */ -+ -+ if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) && (g.wait_eof || !g.read_thread_stop)) -+ { -+ gettimeofday(&now, NULL); -+ if (timercmp(&now, &end, <)) -+ { -+ timersub(&end, &now, &timeleft); -+ usleep(1000000 * timeleft.tv_sec + timeleft.tv_usec); -+ } -+ } -+ } while (g.wait_eof || !g.read_thread_stop); /* Abort from main thread tests error here */ -+ -+ /* -+ * Let the main thread know that we have completed the read thread... -+ */ -+ -+ pthread_mutex_lock(&g.read_thread_mutex); -+ g.read_thread_done = 1; -+ pthread_cond_signal(&g.read_thread_cond); -+ pthread_mutex_unlock(&g.read_thread_mutex); -+ -+ return NULL; -+} -+ -+ -+/* -+ * 'sidechannel_thread()' - Handle side-channel requests. -+ */ -+ -+static void* -+sidechannel_thread(void *reference) -+{ -+ cups_sc_command_t command; /* Request command */ -+ cups_sc_status_t status; /* Request/response status */ -+ char data[2048]; /* Request/response data */ -+ int datalen; /* Request/response data size */ -+ -+ -+ (void)reference; -+ -+ do -+ { -+ datalen = sizeof(data); -+ -+ if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) -+ { -+ if (status == CUPS_SC_STATUS_TIMEOUT) -+ continue; -+ else -+ break; -+ } -+ -+ switch (command) -+ { -+ case CUPS_SC_CMD_SOFT_RESET: /* Do a soft reset */ -+ fputs("DEBUG: CUPS_SC_CMD_SOFT_RESET received from driver...\n", -+ stderr); -+ -+ soft_reset(); -+ cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, NULL, 0, 1.0); -+ fputs("DEBUG: Returning status CUPS_STATUS_OK with no bytes...\n", -+ stderr); -+ break; -+ -+ case CUPS_SC_CMD_DRAIN_OUTPUT: /* Drain all pending output */ -+ fputs("DEBUG: CUPS_SC_CMD_DRAIN_OUTPUT received from driver...\n", -+ stderr); -+ -+ g.drain_output = 1; -+ break; -+ -+ case CUPS_SC_CMD_GET_BIDI: /* Is the connection bidirectional? */ -+ fputs("DEBUG: CUPS_SC_CMD_GET_BIDI received from driver...\n", -+ stderr); -+ -+ data[0] = (g.printer->protocol >= 2 ? 1 : 0); -+ cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0); -+ -+ fprintf(stderr, -+ "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n", -+ data[0]); -+ break; -+ -+ case CUPS_SC_CMD_GET_DEVICE_ID: /* Return IEEE-1284 device ID */ -+ fputs("DEBUG: CUPS_SC_CMD_GET_DEVICE_ID received from driver...\n", -+ stderr); -+ -+ datalen = sizeof(data); -+ if (get_device_id(g.printer, data, sizeof(data))) -+ { -+ status = CUPS_SC_STATUS_IO_ERROR; -+ datalen = 0; -+ } -+ else -+ { -+ status = CUPS_SC_STATUS_OK; -+ datalen = strlen(data); -+ } -+ cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, datalen, 1.0); -+ -+ if (datalen < sizeof(data)) -+ data[datalen] = '\0'; -+ else -+ data[sizeof(data) - 1] = '\0'; -+ -+ fprintf(stderr, -+ "DEBUG: Returning CUPS_SC_STATUS_OK with %d bytes (%s)...\n", -+ datalen, data); -+ break; -+ -+ case CUPS_SC_CMD_GET_STATE: /* Return device state */ -+ fputs("DEBUG: CUPS_SC_CMD_GET_STATE received from driver...\n", -+ stderr); -+ -+ data[0] = CUPS_SC_STATE_ONLINE; -+ cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0); -+ -+ fprintf(stderr, -+ "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n", -+ data[0]); -+ break; -+ -+ case CUPS_SC_CMD_GET_CONNECTED: /* Return whether device is -+ connected */ -+ fputs("DEBUG: CUPS_SC_CMD_GET_CONNECTED received from driver...\n", -+ stderr); -+ -+ data[0] = (g.printer->handle ? 1 : 0); -+ cupsSideChannelWrite(command, CUPS_SC_STATUS_OK, data, 1, 1.0); -+ -+ fprintf(stderr, -+ "DEBUG: Returned CUPS_SC_STATUS_OK with 1 byte (%02X)...\n", -+ data[0]); -+ break; -+ -+ default: -+ fprintf(stderr, "DEBUG: Unknown side-channel command (%d) received " -+ "from driver...\n", command); -+ -+ cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED, -+ NULL, 0, 1.0); -+ -+ fputs("DEBUG: Returned CUPS_SC_STATUS_NOT_IMPLEMENTED with no bytes...\n", -+ stderr); -+ break; -+ } -+ } -+ while (!g.sidechannel_thread_stop); -+ -+ pthread_mutex_lock(&g.sidechannel_thread_mutex); -+ g.sidechannel_thread_done = 1; -+ pthread_cond_signal(&g.sidechannel_thread_cond); -+ pthread_mutex_unlock(&g.sidechannel_thread_mutex); -+ -+ return NULL; - } - - -@@ -392,10 +1008,11 @@ - - if (protocol > 0) - { -- printer.device = device; -- printer.conf = conf; -- printer.iface = iface; -- printer.handle = NULL; -+ printer.device = device; -+ printer.conf = conf; -+ printer.iface = iface; -+ printer.protocol = protocol; -+ printer.handle = NULL; - - if (!open_device(&printer, data != NULL)) - { -@@ -953,93 +1570,149 @@ - - - /* -- * 'side_cb()' - Handle side-channel requests. -+ * 'soft_reset()' - Send a soft reset to the device. - */ - --static ssize_t /* O - Number of bytes written */ --side_cb(usb_printer_t *printer, /* I - Printer */ -- int print_fd) /* I - File to print */ -+static void soft_reset(void) - { -- int bytes, /* Bytes read/written */ -- transferred, -- tbytes; /* Total bytes written */ -- unsigned char buffer[512]; /* Print data buffer */ -- struct pollfd pfd; /* Poll descriptor */ -- cups_sc_command_t command; /* Request command */ -- cups_sc_status_t status; /* Request/response status */ -- char data[2048]; /* Request/response data */ -- int datalen; /* Request/response data size */ -+ fd_set input_set; /* Input set for select() */ -+ struct timeval tv; /* Time value */ -+ char buffer[2048]; /* Buffer */ -+ struct timespec cond_timeout; /* pthread condition timeout */ - -+ /* -+ * Send an abort once a second until the I/O lock is released by the main thread... -+ */ - -- tbytes = 0; -- datalen = sizeof(data); -+ pthread_mutex_lock(&g.readwrite_lock_mutex); -+ while (g.readwrite_lock) -+ { -+ gettimeofday(&tv, NULL); -+ cond_timeout.tv_sec = tv.tv_sec + 1; -+ cond_timeout.tv_nsec = tv.tv_usec * 1000; - -- if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) -- return (-1); -+ while (g.readwrite_lock) -+ { -+ if (pthread_cond_timedwait(&g.readwrite_lock_cond, -+ &g.readwrite_lock_mutex, -+ &cond_timeout) != 0) -+ break; -+ } -+ } - -- switch (command) -- { -- case CUPS_SC_CMD_DRAIN_OUTPUT : -- pfd.fd = print_fd; -- pfd.events = POLLIN; -+ g.readwrite_lock = 1; -+ pthread_mutex_unlock(&g.readwrite_lock_mutex); - -- while (poll(&pfd, 1, 1000) > 0) -- { -- if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) -- { -- while (libusb_bulk_transfer(printer->handle, printer->write_endp, -- buffer, -- bytes, &transferred, 5000) < 0) -- { -- _cupsLangPrintFilter(stderr, "ERROR", -- _("Unable to send data to printer.")); -- tbytes = -1; -- break; -- } -+ /* -+ * Flush bytes waiting on print_fd... -+ */ - -- tbytes += bytes; -- } -- else if (bytes < 0 && errno != EAGAIN && errno != EINTR) -- break; -- } -+ g.print_bytes = 0; - -- if (tbytes < 0) -- status = CUPS_SC_STATUS_IO_ERROR; -- else -- status = CUPS_SC_STATUS_OK; -- -- datalen = 0; -- break; -- -- case CUPS_SC_CMD_GET_BIDI : -- status = CUPS_SC_STATUS_OK; -- data[0] = 0; /* TODO: Change to 1 when read supported */ -- datalen = 1; -- break; -+ FD_ZERO(&input_set); -+ FD_SET(g.print_fd, &input_set); - -- case CUPS_SC_CMD_GET_DEVICE_ID : -- if (get_device_id(printer, data, sizeof(data))) -- { -- status = CUPS_SC_STATUS_IO_ERROR; -- datalen = 0; -- } -- else -- { -- status = CUPS_SC_STATUS_OK; -- datalen = strlen(data); -- } -- break; -+ tv.tv_sec = 0; -+ tv.tv_usec = 0; - -- default : -- status = CUPS_SC_STATUS_NOT_IMPLEMENTED; -- datalen = 0; -- break; -- } -+ while (select(g.print_fd+1, &input_set, NULL, NULL, &tv) > 0) -+ if (read(g.print_fd, buffer, sizeof(buffer)) <= 0) -+ break; - -- cupsSideChannelWrite(command, status, data, datalen, 1.0); -+ /* -+ * Send the reset... -+ */ - -- return (tbytes); -+ libusb_reset_device (g.printer->handle); -+ -+ /* -+ * Release the I/O lock... -+ */ -+ -+ pthread_mutex_lock(&g.readwrite_lock_mutex); -+ g.readwrite_lock = 0; -+ pthread_cond_signal(&g.readwrite_lock_cond); -+ pthread_mutex_unlock(&g.readwrite_lock_mutex); -+} -+ -+ -+#ifdef PARSE_PS_ERRORS -+/* -+ * 'next_line()' - Find the next line in a buffer. -+ */ -+ -+static const char *next_line (const char *buffer) -+{ -+ const char *cptr, *lptr = NULL; -+ -+ for (cptr = buffer; *cptr && lptr == NULL; cptr++) -+ if (*cptr == '\n' || *cptr == '\r') -+ lptr = cptr; -+ return lptr; -+} -+ -+ -+/* -+ * 'parse_pserror()' - Scan the backchannel data for postscript errors. -+ */ -+ -+static void parse_pserror(char *sockBuffer, -+ int len) -+{ -+ static char gErrorBuffer[1024] = ""; -+ static char *gErrorBufferPtr = gErrorBuffer; -+ static char *gErrorBufferEndPtr = gErrorBuffer + sizeof(gErrorBuffer); -+ -+ char *pCommentBegin, *pCommentEnd, *pLineEnd; -+ char *logLevel; -+ char logstr[1024]; -+ int logstrlen; -+ -+ if (gErrorBufferPtr + len > gErrorBufferEndPtr - 1) -+ gErrorBufferPtr = gErrorBuffer; -+ if (len > sizeof(gErrorBuffer) - 1) -+ len = sizeof(gErrorBuffer) - 1; -+ -+ memcpy(gErrorBufferPtr, (const void *)sockBuffer, len); -+ gErrorBufferPtr += len; -+ *(gErrorBufferPtr + 1) = '\0'; -+ -+ pLineEnd = (char *)next_line((const char *)gErrorBuffer); -+ while (pLineEnd != NULL) -+ { -+ *pLineEnd++ = '\0'; -+ -+ pCommentBegin = strstr(gErrorBuffer,"%%["); -+ pCommentEnd = strstr(gErrorBuffer, "]%%"); -+ if (pCommentBegin != gErrorBuffer && pCommentEnd != NULL) -+ { -+ pCommentEnd += 3; /* Skip past "]%%" */ -+ *pCommentEnd = '\0'; /* There's always room for the nul */ -+ -+ if (_cups_strncasecmp(pCommentBegin, "%%[ Error:", 10) == 0) -+ logLevel = "DEBUG"; -+ else if (_cups_strncasecmp(pCommentBegin, "%%[ Flushing", 12) == 0) -+ logLevel = "DEBUG"; -+ else -+ logLevel = "INFO"; -+ -+ if ((logstrlen = snprintf(logstr, sizeof(logstr), "%s: %s\n", logLevel, pCommentBegin)) >= sizeof(logstr)) -+ { -+ /* If the string was truncated make sure it has a linefeed before the -+ nul */ -+ logstrlen = sizeof(logstr) - 1; -+ logstr[logstrlen - 1] = '\n'; -+ } -+ write(STDERR_FILENO, logstr, logstrlen); -+ } -+ -+ /* move everything over... */ -+ strcpy(gErrorBuffer, pLineEnd); -+ gErrorBufferPtr = gErrorBuffer; -+ pLineEnd = (char *)next_line((const char *)gErrorBuffer); -+ } - } -+#endif /* PARSE_PS_ERRORS */ - - - /* diff -Nru cups-1.5.2/debian/patches/usb-backend-busy-loop-fix.patch cups-1.5.3/debian/patches/usb-backend-busy-loop-fix.patch --- cups-1.5.2/debian/patches/usb-backend-busy-loop-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/debian/patches/usb-backend-busy-loop-fix.patch 2012-05-23 15:26:27.000000000 +0200 @@ -0,0 +1,33 @@ +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -1163,11 +1163,13 @@ + while ((errcode = libusb_claim_interface(printer->handle, number1)) < 0) + { + if (errcode != LIBUSB_ERROR_BUSY) ++ { + fprintf(stderr, + "DEBUG: Failed to claim interface %d for %04x:%04x: %s\n", + number1, devdesc.idVendor, devdesc.idProduct, strerror(errno)); + +- goto error; ++ goto error; ++ } + } + + /* +@@ -1187,12 +1189,14 @@ + < 0) + { + if (errcode != LIBUSB_ERROR_BUSY) ++ { + fprintf(stderr, + "DEBUG: Failed to set alternate interface %d for %04x:%04x: " + "%s\n", + number2, devdesc.idVendor, devdesc.idProduct, strerror(errno)); + +- goto error; ++ goto error; ++ } + } + } + diff -Nru cups-1.5.2/debian/patches/usb-backend-detach-usblp-earlier-crash-guards.patch cups-1.5.3/debian/patches/usb-backend-detach-usblp-earlier-crash-guards.patch --- cups-1.5.2/debian/patches/usb-backend-detach-usblp-earlier-crash-guards.patch 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/debian/patches/usb-backend-detach-usblp-earlier-crash-guards.patch 2012-05-23 15:26:27.000000000 +0200 @@ -0,0 +1,163 @@ +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -600,31 +600,39 @@ + * to the device... + */ + ++ int errcode; /* Return value of libusb function */ + int number; /* Interface number */ + +- libusb_get_device_descriptor (printer->device, &devdesc); +- libusb_get_config_descriptor (printer->device, printer->conf, &confptr); +- number = confptr->interface[printer->iface]. +- altsetting[printer->altset].bInterfaceNumber; +- libusb_release_interface(printer->handle, number); +- if (number != 0) +- libusb_release_interface(printer->handle, 0); ++ errcode = ++ libusb_get_config_descriptor (printer->device, printer->conf, &confptr); ++ if (errcode >= 0) ++ { ++ number = confptr->interface[printer->iface]. ++ altsetting[printer->altset].bInterfaceNumber; ++ libusb_release_interface(printer->handle, number); ++ if (number != 0) ++ libusb_release_interface(printer->handle, 0); + +- /* +- * Re-attach "usblp" kernel module if it was attached before using this +- * device +- */ ++ /* ++ * Re-attach "usblp" kernel module if it was attached before using this ++ * device ++ */ ++ if (printer->usblp_attached == 1) ++ if (libusb_attach_kernel_driver(printer->handle, printer->iface) < 0) ++ { ++ errcode = libusb_get_device_descriptor (printer->device, &devdesc); ++ if (errcode < 0) ++ fprintf(stderr, ++ "DEBUG: Failed to re-attach \"usblp\" kernel module\n"); ++ else ++ fprintf(stderr, ++ "DEBUG: Failed to re-attach \"usblp\" kernel module to " ++ "%04x:%04x\n", devdesc.idVendor, devdesc.idProduct); ++ } + +- if (printer->usblp_attached == 1) +- { +- if (libusb_attach_kernel_driver(printer->handle, printer->iface) < 0) +- fprintf(stderr, +- "DEBUG: Failed to re-attach \"usblp\" kernel module to " +- "%04x:%04x\n", devdesc.idVendor, devdesc.idProduct); ++ libusb_free_config_descriptor(confptr); + } + +- libusb_free_config_descriptor(confptr); +- + /* + * Close the interface and return... + */ +@@ -694,7 +702,8 @@ + * a printer... + */ + +- libusb_get_device_descriptor (device, &devdesc); ++ if (libusb_get_device_descriptor (device, &devdesc) < 0) ++ continue; + + if (!devdesc.bNumConfigurations || !devdesc.idVendor || + !devdesc.idProduct) +@@ -1092,6 +1101,40 @@ + if (verbose) + fputs("STATE: +connecting-to-device\n", stderr); + ++ if ((errcode = libusb_get_device_descriptor (printer->device, &devdesc)) < 0) ++ { ++ fprintf(stderr, "DEBUG: Failed to get device descriptor, code: %d\n", ++ errcode); ++ goto error; ++ } ++ ++ /* ++ * Get the "usblp" kernel module out of the way. This backend only ++ * works without the module attached. ++ */ ++ ++ errcode = libusb_kernel_driver_active(printer->handle, printer->iface); ++ if (errcode == 0) ++ printer->usblp_attached = 0; ++ else if (errcode == 1) ++ { ++ printer->usblp_attached = 1; ++ if ((errcode = ++ libusb_detach_kernel_driver(printer->handle, printer->iface)) < 0) ++ { ++ fprintf(stderr, "DEBUG: Failed to detach \"usblp\" module from %04x:%04x\n", ++ devdesc.idVendor, devdesc.idProduct); ++ goto error; ++ } ++ } ++ else ++ { ++ printer->usblp_attached = 0; ++ fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n", ++ devdesc.idVendor, devdesc.idProduct); ++ goto error; ++ } ++ + /* + * Set the desired configuration, but only if it needs changing. Some + * printers (e.g., Samsung) don't like libusb_set_configuration. It will +@@ -1106,8 +1149,14 @@ + 0, 0, (unsigned char *)¤t, 1, 5000) < 0) + current = 0; /* Assume not configured */ + +- libusb_get_device_descriptor (printer->device, &devdesc); +- libusb_get_config_descriptor (printer->device, printer->conf, &confptr); ++ if ((errcode = ++ libusb_get_config_descriptor (printer->device, printer->conf, &confptr)) ++ < 0) ++ { ++ fprintf(stderr, "DEBUG: Failed to get config descriptor for %04x:%04x\n", ++ devdesc.idVendor, devdesc.idProduct); ++ goto error; ++ } + number1 = confptr->bConfigurationValue; + + if (number1 != current) +@@ -1127,33 +1176,6 @@ + } + + /* +- * Get the "usblp" kernel module out of the way. This backend only +- * works without the module attached. +- */ +- +- errcode = libusb_kernel_driver_active(printer->handle, printer->iface); +- if (errcode == 0) +- printer->usblp_attached = 0; +- else if (errcode == 1) +- { +- printer->usblp_attached = 1; +- if ((errcode = +- libusb_detach_kernel_driver(printer->handle, printer->iface)) < 0) +- { +- fprintf(stderr, "DEBUG: Failed to detach \"usblp\" module from %04x:%04x\n", +- devdesc.idVendor, devdesc.idProduct); +- goto error; +- } +- } +- else +- { +- printer->usblp_attached = 0; +- fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n", +- devdesc.idVendor, devdesc.idProduct); +- goto error; +- } +- +- /* + * Claim interfaces as needed... + */ + diff -Nru cups-1.5.2/debian/patches/usb-backend-initialize-usblp-attached-state.patch cups-1.5.3/debian/patches/usb-backend-initialize-usblp-attached-state.patch --- cups-1.5.2/debian/patches/usb-backend-initialize-usblp-attached-state.patch 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/debian/patches/usb-backend-initialize-usblp-attached-state.patch 2012-05-23 15:26:27.000000000 +0200 @@ -0,0 +1,11 @@ +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -1098,6 +1098,8 @@ + if (libusb_open(printer->device, &printer->handle) < 0) + return (-1); + ++ printer->usblp_attached = 0; ++ + if (verbose) + fputs("STATE: +connecting-to-device\n", stderr); + diff -Nru cups-1.5.2/debian/patches/usb-backend-libusb-1.0.patch cups-1.5.3/debian/patches/usb-backend-libusb-1.0.patch --- cups-1.5.2/debian/patches/usb-backend-libusb-1.0.patch 2012-04-05 02:09:23.000000000 +0200 +++ cups-1.5.3/debian/patches/usb-backend-libusb-1.0.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,623 +0,0 @@ -Description: Migration of the libusb-based "usb" backend to libusb 1.0.x -Bug: http://www.cups.org/str.php?L3477 -Author: Till Kamppeter - ---- a/Makedefs.in -+++ b/Makedefs.in -@@ -93,6 +93,8 @@ - LIBGSSAPI = @LIBGSSAPI@ - LIBTIFF = @LIBTIFF@ - LIBUSB = @LIBUSB@ -+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ -+LIBUSB_LIBS = @LIBUSB_LIBS@ - LIBWRAP = @LIBWRAP@ - LIBZ = @LIBZ@ - -@@ -129,7 +131,7 @@ - # - - ALL_CFLAGS = -I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \ -- @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS) -+ $(LIBUSB_CFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS) - ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \ - @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS) - ARCHFLAGS = @ARCHFLAGS@ ---- a/backend/Makefile -+++ b/backend/Makefile -@@ -268,7 +268,7 @@ - - usb: usb.o ../cups/$(LIBCUPS) libbackend.a - echo Linking $@... -- $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ -+ $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB_LIBS) \ - $(BACKLIBS) $(LIBS) - usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c - ---- a/backend/usb-libusb.c -+++ b/backend/usb-libusb.c -@@ -29,10 +29,11 @@ - * Include necessary headers... - */ - --#include -+#include - #include - #include - -+libusb_device **list; /* List of connected USB devices */ - - /* - * Local types... -@@ -40,13 +41,15 @@ - - typedef struct usb_printer_s /**** USB Printer Data ****/ - { -- struct usb_device *device; /* Device info */ -+ struct libusb_device *device; /* Device info */ - int conf, /* Configuration */ - iface, /* Interface */ - altset, /* Alternate setting */ - write_endp, /* Write endpoint */ -- read_endp; /* Read endpoint */ -- struct usb_dev_handle *handle; /* Open handle to device */ -+ read_endp, /* Read endpoint */ -+ usblp_attached; /* Is the "usblp" kernel module -+ attached? */ -+ struct libusb_device_handle *handle; /* Open handle to device */ - } usb_printer_t; - - typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *, -@@ -99,9 +102,10 @@ - char *argv[]) /* I - Command-line arguments */ - { - usb_printer_t *printer; /* Printer */ -- ssize_t bytes, /* Bytes read/written */ -+ int bytes, /* Bytes to read/write */ -+ transferred, /* Bytes read/written */ - tbytes; /* Total bytes written */ -- char buffer[512]; /* Print data buffer */ -+ unsigned char buffer[512]; /* Print data buffer */ - struct sigaction action; /* Actions for POSIX signals */ - struct pollfd pfds[2]; /* Poll descriptors */ - -@@ -172,8 +176,8 @@ - { - if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) - { -- if (usb_bulk_write(printer->handle, printer->write_endp, buffer, -- bytes, 3600000) < 0) -+ if (libusb_bulk_transfer(printer->handle, printer->write_endp, buffer, -+ bytes, &transferred, 3600000) < 0) - { - _cupsLangPrintFilter(stderr, "ERROR", - _("Unable to send data to printer.")); -@@ -203,6 +207,13 @@ - - close_device(printer); - -+ /* -+ * Clean up .... -+ */ -+ -+ libusb_free_device_list(list, 1); -+ libusb_exit(NULL); -+ - return (CUPS_BACKEND_OK); - } - -@@ -214,6 +225,11 @@ - static int /* I - 0 on success, -1 on failure */ - close_device(usb_printer_t *printer) /* I - Printer */ - { -+ struct libusb_device_descriptor devdesc; -+ /* Current device descriptor */ -+ struct libusb_config_descriptor *confptr; -+ /* Pointer to current configuration */ -+ - if (printer->handle) - { - /* -@@ -221,19 +237,30 @@ - * to the device... - */ - -- int number = printer->device->config[printer->conf]. -- interface[printer->iface]. -- altsetting[printer->altset].bInterfaceNumber; -- usb_release_interface(printer->handle, number); -- -+ libusb_get_device_descriptor (printer->device, &devdesc); -+ libusb_get_config_descriptor (printer->device, printer->conf, &confptr); -+ int number = confptr->interface[printer->iface]. -+ altsetting[printer->altset].bInterfaceNumber; -+ libusb_release_interface(printer->handle, number); - if (number != 0) -- usb_release_interface(printer->handle, 0); -+ libusb_release_interface(printer->handle, 0); -+ -+ /* -+ * Re-attach "usblp" kernel module if it was attached before using this -+ * device -+ */ -+ if (printer->usblp_attached == 1) -+ if (libusb_attach_kernel_driver(printer->handle, printer->iface) < 0) -+ fprintf(stderr, "DEBUG: Failed to re-attach \"usblp\" kernel module to %04x:%04x\n", -+ devdesc.idVendor, devdesc.idProduct); -+ -+ libusb_free_config_descriptor(confptr); - - /* - * Close the interface and return... - */ - -- usb_close(printer->handle); -+ libusb_close(printer->handle); - printer->handle = NULL; - } - -@@ -249,15 +276,21 @@ - find_device(usb_cb_t cb, /* I - Callback function */ - const void *data) /* I - User data for callback */ - { -- struct usb_bus *bus; /* Current bus */ -- struct usb_device *device; /* Current device */ -- struct usb_config_descriptor *confptr;/* Pointer to current configuration */ -- struct usb_interface *ifaceptr; /* Pointer to current interface */ -- struct usb_interface_descriptor *altptr; -+ libusb_device **list; /* List of connected USB devices */ -+ libusb_device *device = NULL; /* Current device */ -+ struct libusb_device_descriptor devdesc; -+ /* Current device descriptor */ -+ struct libusb_config_descriptor *confptr = NULL; -+ /* Pointer to current configuration */ -+ const struct libusb_interface *ifaceptr = NULL; -+ /* Pointer to current interface */ -+ const struct libusb_interface_descriptor *altptr = NULL; - /* Pointer to current alternate setting */ -- struct usb_endpoint_descriptor *endpptr; -+ const struct libusb_endpoint_descriptor *endpptr = NULL; - /* Pointer to current endpoint */ -- int conf, /* Current configuration */ -+ ssize_t numdevs, /* number of connected devices */ -+ i = 0; -+ uint8_t conf, /* Current configuration */ - iface, /* Current interface */ - altset, /* Current alternate setting */ - protocol, /* Current protocol */ -@@ -274,29 +307,34 @@ - * Initialize libusb... - */ - -- usb_init(); -- fprintf(stderr, "DEBUG: usb_find_busses=%d\n", usb_find_busses()); -- fprintf(stderr, "DEBUG: usb_find_devices=%d\n", usb_find_devices()); -+ libusb_init(NULL); -+ numdevs = libusb_get_device_list(NULL, &list); -+ fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs); - - /* - * Then loop through the devices it found... - */ - -- for (bus = usb_get_busses(); bus; bus = bus->next) -- for (device = bus->devices; device; device = device->next) -+ if (numdevs > 0) -+ for (i = 0; i < numdevs; i++) - { -+ device = list[i]; -+ - /* - * Ignore devices with no configuration data and anything that is not - * a printer... - */ - -- if (!device->config || !device->descriptor.idVendor || -- !device->descriptor.idProduct) -+ libusb_get_device_descriptor (device, &devdesc); -+ -+ if (!devdesc.bNumConfigurations || !devdesc.idVendor || -+ !devdesc.idProduct) - continue; - -- for (conf = 0, confptr = device->config; -- conf < device->descriptor.bNumConfigurations; -- conf ++, confptr ++) -+ for (conf = 0; conf < devdesc.bNumConfigurations; conf ++) -+ { -+ if (libusb_get_config_descriptor (device, conf, &confptr) < 0) -+ continue; - for (iface = 0, ifaceptr = confptr->interface; - iface < confptr->bNumInterfaces; - iface ++, ifaceptr ++) -@@ -317,7 +355,7 @@ - * 1284.4 (packet mode) protocol as well. - */ - -- if (altptr->bInterfaceClass != USB_CLASS_PRINTER || -+ if (altptr->bInterfaceClass != LIBUSB_CLASS_PRINTER || - altptr->bInterfaceSubClass != 1 || - (altptr->bInterfaceProtocol != 1 && /* Unidirectional */ - altptr->bInterfaceProtocol != 2) || /* Bidirectional */ -@@ -330,10 +368,10 @@ - for (endp = 0, endpptr = altptr->endpoint; - endp < altptr->bNumEndpoints; - endp ++, endpptr ++) -- if ((endpptr->bmAttributes & USB_ENDPOINT_TYPE_MASK) == -- USB_ENDPOINT_TYPE_BULK) -+ if ((endpptr->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) == -+ LIBUSB_TRANSFER_TYPE_BULK) - { -- if (endpptr->bEndpointAddress & USB_ENDPOINT_DIR_MASK) -+ if (endpptr->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK) - read_endp = endp; - else - write_endp = endp; -@@ -361,31 +399,29 @@ - - if (!open_device(&printer, data != NULL)) - { -- if (!get_device_id(&printer, device_id, sizeof(device_id))) -- { -- make_device_uri(&printer, device_id, device_uri, -- sizeof(device_uri)); -+ get_device_id(&printer, device_id, sizeof(device_id)); -+ make_device_uri(&printer, device_id, device_uri, -+ sizeof(device_uri)); - -- if ((*cb)(&printer, device_uri, device_id, data)) -- { -- printer.read_endp = printer.device->config[printer.conf]. -- interface[printer.iface]. -+ if ((*cb)(&printer, device_uri, device_id, data)) -+ { -+ printer.read_endp = confptr->interface[printer.iface]. - altsetting[printer.altset]. - endpoint[printer.read_endp]. - bEndpointAddress; -- printer.write_endp = printer.device->config[printer.conf]. -- interface[printer.iface]. -+ printer.write_endp = confptr->interface[printer.iface]. - altsetting[printer.altset]. - endpoint[printer.write_endp]. - bEndpointAddress; -- return (&printer); -- } -+ return (&printer); - } - - close_device(&printer); - } - } - } -+ libusb_free_config_descriptor(confptr); -+ } - } - - /* -@@ -393,6 +429,13 @@ - * to print to... - */ - -+ /* -+ * Clean up .... -+ */ -+ -+ libusb_free_device_list(list, 1); -+ libusb_exit(NULL); -+ - return (NULL); - } - -@@ -409,10 +452,12 @@ - int length; /* Length of device ID */ - - -- if (usb_control_msg(printer->handle, -- USB_TYPE_CLASS | USB_ENDPOINT_IN | USB_RECIP_INTERFACE, -- 0, printer->conf, (printer->iface << 8) | printer->altset, -- buffer, bufsize, 5000) < 0) -+ if (libusb_control_transfer(printer->handle, -+ LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_ENDPOINT_IN | -+ LIBUSB_RECIPIENT_INTERFACE, -+ 0, printer->conf, -+ (printer->iface << 8) | printer->altset, -+ (unsigned char *)buffer, bufsize, 5000) < 0) - { - *buffer = '\0'; - return (-1); -@@ -482,7 +527,8 @@ - * Get the device URI and make/model strings... - */ - -- backendGetMakeModel(device_id, make_model, sizeof(make_model)); -+ if (backendGetMakeModel(device_id, make_model, sizeof(make_model))) -+ strlcpy(make_model, "Unknown", sizeof(make_model)); - - /* - * Report the printer... -@@ -510,12 +556,14 @@ - char *uri, /* I - Device URI buffer */ - size_t uri_size) /* I - Size of device URI buffer */ - { -+ struct libusb_device_descriptor devdesc; -+ /* Current device descriptor */ - char options[1024]; /* Device URI options */ - int num_values; /* Number of 1284 parameters */ - cups_option_t *values; /* 1284 parameters */ - const char *mfg, /* Manufacturer */ - *mdl, /* Model */ -- *des, /* Description */ -+ *des = NULL, /* Description */ - *sern; /* Serial number */ - size_t mfglen; /* Length of manufacturer string */ - char tempmfg[256], /* Temporary manufacturer string */ -@@ -532,16 +580,18 @@ - if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL) - if ((sern = cupsGetOption("SERN", num_values, values)) == NULL) - if ((sern = cupsGetOption("SN", num_values, values)) == NULL && -- printer->device->descriptor.iSerialNumber) -+ ((libusb_get_device_descriptor (printer->device, &devdesc) >= 0) && -+ devdesc.iSerialNumber)) - { - /* - * Try getting the serial number from the device itself... - */ - -- int length = usb_get_string_simple(printer->handle, -- printer->device->descriptor. -- iSerialNumber, -- tempsern, sizeof(tempsern) - 1); -+ int length = -+ libusb_get_string_descriptor_ascii(printer->handle, -+ devdesc.iSerialNumber, -+ (unsigned char *)tempsern, -+ sizeof(tempsern) - 1); - if (length > 0) - { - tempsern[length] = '\0'; -@@ -597,6 +647,19 @@ - mfg = tempmfg; - } - -+ if (!mdl) -+ { -+ /* -+ * No model? Use description... -+ */ -+ if (des) -+ mdl = des; /* We remove the manufacturer name below */ -+ else if (!strncasecmp(mfg, "Unknown", 7)) -+ mdl = "Printer"; -+ else -+ mdl = "Unknown Model"; -+ } -+ - mfglen = strlen(mfg); - - if (!strncasecmp(mdl, mfg, mfglen) && _cups_isspace(mdl[mfglen])) -@@ -642,7 +705,13 @@ - open_device(usb_printer_t *printer, /* I - Printer */ - int verbose) /* I - Update connecting-to-device state? */ - { -- int number; /* Configuration/interface/altset numbers */ -+ struct libusb_device_descriptor devdesc; -+ /* Current device descriptor */ -+ struct libusb_config_descriptor *confptr = NULL; -+ /* Pointer to current configuration */ -+ int number1 = -1, /* Configuration/interface/altset */ -+ number2 = -1, /* numbers */ -+ errcode = 0; - char current; /* Current configuration */ - - -@@ -657,7 +726,7 @@ - * Try opening the printer... - */ - -- if ((printer->handle = usb_open(printer->device)) == NULL) -+ if (libusb_open(printer->device, &printer->handle) < 0) - return (-1); - - if (verbose) -@@ -665,20 +734,24 @@ - - /* - * Set the desired configuration, but only if it needs changing. Some -- * printers (e.g., Samsung) don't like usb_set_configuration. It will succeed, -- * but the following print job is sometimes silently lost by the printer. -- */ -- -- if (usb_control_msg(printer->handle, -- USB_TYPE_STANDARD | USB_ENDPOINT_IN | USB_RECIP_DEVICE, -- 8, /* GET_CONFIGURATION */ -- 0, 0, ¤t, 1, 5000) != 1) -+ * printers (e.g., Samsung) don't like libusb_set_configuration. It will -+ * succeed, but the following print job is sometimes silently lost by the -+ * printer. -+ */ -+ if (libusb_control_transfer(printer->handle, -+ LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_ENDPOINT_IN | -+ LIBUSB_RECIPIENT_DEVICE, -+ 8, /* GET_CONFIGURATION */ -+ 0, 0, (unsigned char *)¤t, 1, 5000) < 0) - current = 0; /* Assume not configured */ - -- number = printer->device->config[printer->conf].bConfigurationValue; -- if (number != current) -+ libusb_get_device_descriptor (printer->device, &devdesc); -+ libusb_get_config_descriptor (printer->device, printer->conf, &confptr); -+ number1 = confptr->bConfigurationValue; -+ -+ if (number1 != current) - { -- if (usb_set_configuration(printer->handle, number) < 0) -+ if ((errcode = libusb_set_configuration(printer->handle, number1)) < 0) - { - /* - * If the set fails, chances are that the printer only supports a -@@ -686,26 +759,52 @@ - * the USB printer specification, but otherwise they'll work... - */ - -- if (errno != EBUSY) -+ if (errcode != LIBUSB_ERROR_BUSY) - fprintf(stderr, "DEBUG: Failed to set configuration %d for %04x:%04x\n", -- number, printer->device->descriptor.idVendor, -- printer->device->descriptor.idProduct); -+ number1, devdesc.idVendor, devdesc.idProduct); - } - } - - /* -+ * Get the "usblp" kernel module out of the way. This backend only -+ * works without the module attached. -+ */ -+ -+ errcode = libusb_kernel_driver_active(printer->handle, printer->iface); -+ if (errcode == 0) -+ printer->usblp_attached = 0; -+ else if (errcode == 1) -+ { -+ printer->usblp_attached = 1; -+ if ((errcode = -+ libusb_detach_kernel_driver(printer->handle, printer->iface)) < 0) -+ { -+ fprintf(stderr, "DEBUG: Failed to detach \"usblp\" module from %04x:%04x\n", -+ devdesc.idVendor, devdesc.idProduct); -+ goto error; -+ } -+ } -+ else -+ { -+ printer->usblp_attached = 0; -+ fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n", -+ devdesc.idVendor, devdesc.idProduct); -+ goto error; -+ } -+ -+ /* - * Claim interfaces as needed... - */ - -- number = printer->device->config[printer->conf].interface[printer->iface]. -- altsetting[printer->altset].bInterfaceNumber; -- while (usb_claim_interface(printer->handle, number) < 0) -+ number1 = confptr->interface[printer->iface]. -+ altsetting[printer->altset].bInterfaceNumber; -+ -+ while ((errcode = libusb_claim_interface(printer->handle, number1)) < 0) - { -- if (errno != EBUSY) -+ if (errcode != LIBUSB_ERROR_BUSY) - fprintf(stderr, - "DEBUG: Failed to claim interface %d for %04x:%04x: %s\n", -- number, printer->device->descriptor.idVendor, -- printer->device->descriptor.idProduct, strerror(errno)); -+ number1, devdesc.idVendor, devdesc.idProduct, strerror(errno)); - - goto error; - } -@@ -715,24 +814,29 @@ - * printers (e.g., Samsung) don't like usb_set_altinterface. - */ - -- if (printer->device->config[printer->conf].interface[printer->iface]. -- num_altsetting > 1) -+ if (confptr->interface[printer->iface].num_altsetting > 1) - { -- number = printer->device->config[printer->conf].interface[printer->iface]. -+ number1 = confptr->interface[printer->iface]. -+ altsetting[printer->altset].bInterfaceNumber; -+ number2 = confptr->interface[printer->iface]. - altsetting[printer->altset].bAlternateSetting; - -- while (usb_set_altinterface(printer->handle, number) < 0) -+ while ((errcode = -+ libusb_set_interface_alt_setting(printer->handle, number1, number2)) -+ < 0) - { -- if (errno != EBUSY) -+ if (errcode != LIBUSB_ERROR_BUSY) - fprintf(stderr, - "DEBUG: Failed to set alternate interface %d for %04x:%04x: " -- "%s\n", number, printer->device->descriptor.idVendor, -- printer->device->descriptor.idProduct, strerror(errno)); -+ "%s\n", -+ number2, devdesc.idVendor, devdesc.idProduct, strerror(errno)); - - goto error; - } - } - -+ libusb_free_config_descriptor(confptr); -+ - if (verbose) - fputs("STATE: -connecting-to-device\n", stderr); - -@@ -747,7 +851,7 @@ - if (verbose) - fputs("STATE: -connecting-to-device\n", stderr); - -- usb_close(printer->handle); -+ libusb_close(printer->handle); - printer->handle = NULL; - - return (-1); -@@ -856,9 +960,10 @@ - side_cb(usb_printer_t *printer, /* I - Printer */ - int print_fd) /* I - File to print */ - { -- ssize_t bytes, /* Bytes read/written */ -+ int bytes, /* Bytes read/written */ -+ transferred, - tbytes; /* Total bytes written */ -- char buffer[512]; /* Print data buffer */ -+ unsigned char buffer[512]; /* Print data buffer */ - struct pollfd pfd; /* Poll descriptor */ - cups_sc_command_t command; /* Request command */ - cups_sc_status_t status; /* Request/response status */ -@@ -882,8 +987,9 @@ - { - if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) - { -- while (usb_bulk_write(printer->handle, printer->write_endp, buffer, -- bytes, 5000) < 0) -+ while (libusb_bulk_transfer(printer->handle, printer->write_endp, -+ buffer, -+ bytes, &transferred, 5000) < 0) - { - _cupsLangPrintFilter(stderr, "ERROR", - _("Unable to send data to printer.")); ---- a/config-scripts/cups-common.m4 -+++ b/config-scripts/cups-common.m4 -@@ -211,8 +211,8 @@ - dnl See if we have libusb... - AC_ARG_ENABLE(libusb, [ --enable-libusb use libusb for USB printing]) - --LIBUSB="" --AC_SUBST(LIBUSB) -+LIBUSB_CFLAGS="" -+LIBUSB_LIBS="" - - if test x$enable_libusb = xyes; then - check_libusb=yes -@@ -223,12 +223,15 @@ - fi - - if test $check_libusb = yes; then -- AC_CHECK_LIB(usb, usb_get_string_simple,[ -- AC_CHECK_HEADER(usb.h, -- AC_DEFINE(HAVE_USB_H) -- LIBUSB="-lusb")]) -+ PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0) -+ if test -n "$LIBUSB_LIBS"; then -+ AC_DEFINE(HAVE_USB_H) -+ fi - fi - -+AC_SUBST(LIBUSB_CFLAGS) -+AC_SUBST(LIBUSB_LIBS) -+ - dnl See if we have libwrap for TCP wrappers support... - AC_ARG_ENABLE(tcp_wrappers, [ --enable-tcp-wrappers use libwrap for TCP wrappers support]) - diff -Nru cups-1.5.2/driver/Dependencies cups-1.5.3/driver/Dependencies --- cups-1.5.2/driver/Dependencies 2010-11-22 08:06:39.000000000 +0100 +++ cups-1.5.3/driver/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,20 +3,20 @@ commandtoescpx.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h commandtoescpx.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h commandtoescpx.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -commandtoescpx.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -commandtoescpx.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -commandtoescpx.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -commandtoescpx.o: ../cups/ipp-private.h ../cups/ipp.h +commandtoescpx.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +commandtoescpx.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +commandtoescpx.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +commandtoescpx.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h commandtoescpx.o: ../cups/language-private.h ../cups/transcode.h commandtoescpx.o: ../cups/thread-private.h driver.h ../cups/raster.h commandtoescpx.o: ../cups/ppd.h ../data/escp.h commandtopclx.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h commandtopclx.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h commandtopclx.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -commandtopclx.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -commandtopclx.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -commandtopclx.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -commandtopclx.o: ../cups/ipp-private.h ../cups/ipp.h +commandtopclx.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +commandtopclx.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +commandtopclx.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +commandtopclx.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h commandtopclx.o: ../cups/language-private.h ../cups/transcode.h commandtopclx.o: ../cups/thread-private.h driver.h ../cups/raster.h commandtopclx.o: ../cups/ppd.h ../data/pcl.h diff -Nru cups-1.5.2/filter/commandtops.c cups-1.5.3/filter/commandtops.c --- cups-1.5.2/filter/commandtops.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/filter/commandtops.c 2012-03-22 00:00:05.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: commandtops.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: commandtops.c 10373 2012-03-21 23:00:05Z mike $" * * PostScript command filter for CUPS. * - * Copyright 2008-2011 by Apple Inc. + * Copyright 2008-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -36,7 +36,7 @@ * Local functions... */ -static void auto_configure(ppd_file_t *ppd, const char *user); +static int auto_configure(ppd_file_t *ppd, const char *user); static void begin_ps(ppd_file_t *ppd, const char *user); static void end_ps(ppd_file_t *ppd); static void print_self_test_page(ppd_file_t *ppd, const char *user); @@ -51,6 +51,7 @@ main(int argc, /* I - Number of command-line arguments */ char *argv[]) /* I - Command-line arguments */ { + int status = 0; /* Exit status */ cups_file_t *fp; /* Command file */ char line[1024], /* Line from file */ *value; /* Value on line */ @@ -113,16 +114,20 @@ */ if (!_cups_strcasecmp(line, "AutoConfigure")) - auto_configure(ppd, argv[2]); + status |= auto_configure(ppd, argv[2]); else if (!_cups_strcasecmp(line, "PrintSelfTestPage")) print_self_test_page(ppd, argv[2]); else if (!_cups_strcasecmp(line, "ReportLevels")) report_levels(ppd, argv[2]); else - fprintf(stderr, "ERROR: Invalid printer command \"%s\"!\n", line); + { + _cupsLangPrintFilter(stderr, "ERROR", + _("Invalid printer command \"%s\"."), line); + status = 1; + } } - return (0); + return (status); } @@ -131,12 +136,14 @@ * query commands and/or SNMP lookups. */ -static void +static int /* O - Exit status */ auto_configure(ppd_file_t *ppd, /* I - PPD file */ const char *user) /* I - Printing user */ { + int status = 0; /* Exit status */ ppd_option_t *option; /* Current option in PPD */ ppd_attr_t *attr; /* Query command attribute */ + const char *valptr; /* Pointer into attribute value */ char buffer[1024], /* String buffer */ *bufptr; /* Pointer into buffer */ ssize_t bytes; /* Number of bytes read */ @@ -154,7 +161,7 @@ { fputs("DEBUG: Unable to auto-configure PostScript Printer - no " "bidirectional I/O available!\n", stderr); - return; + return (1); } /* @@ -162,6 +169,25 @@ */ begin_ps(ppd, user); + + /* + * (STR #4028) + * + * As a lot of PPDs contain bad PostScript query code, we need to prevent one + * bad query sequence from affecting all auto-configuration. The following + * error handler allows us to log PostScript errors to cupsd. + */ + + puts("/cups_handleerror {\n" + " $error /newerror false put\n" + " (:PostScript error in \") print cups_query_keyword print (\": ) " + "print\n" + " $error /errorname get 128 string cvs print\n" + " (; offending command:) print $error /command get 128 string cvs " + "print (\n) print flush\n" + "} bind def\n" + "errordict /timeout {} put\n" + "/cups_query_keyword (?Unknown) def\n"); fflush(stdout); /* @@ -202,7 +228,76 @@ */ fprintf(stderr, "DEBUG: Querying %s...\n", option->keyword); - fputs(attr->value, stdout); + + for (bufptr = buffer, valptr = attr->value; *valptr; valptr ++) + { + /* + * Log the query code, breaking at newlines... + */ + + if (*valptr == '\n') + { + *bufptr = '\0'; + fprintf(stderr, "DEBUG: %s\\n\n", buffer); + bufptr = buffer; + } + else if (*valptr < ' ') + { + if (bufptr >= (buffer + sizeof(buffer) - 4)) + { + *bufptr = '\0'; + fprintf(stderr, "DEBUG: %s\n", buffer); + bufptr = buffer; + } + + if (*valptr == '\r') + { + *bufptr++ = '\\'; + *bufptr++ = 'r'; + } + else if (*valptr == '\t') + { + *bufptr++ = '\\'; + *bufptr++ = 't'; + } + else + { + *bufptr++ = '\\'; + *bufptr++ = '0' + ((*valptr / 64) & 7); + *bufptr++ = '0' + ((*valptr / 8) & 7); + *bufptr++ = '0' + (*valptr & 7); + } + } + else + { + if (bufptr >= (buffer + sizeof(buffer) - 1)) + { + *bufptr = '\0'; + fprintf(stderr, "DEBUG: %s\n", buffer); + bufptr = buffer; + } + + *bufptr++ = *valptr; + } + } + + if (bufptr > buffer) + { + *bufptr = '\0'; + fprintf(stderr, "DEBUG: %s\n", buffer); + } + + printf("/cups_query_keyword (?%s) def\n", option->keyword); + /* Set keyword for error reporting */ + fputs("{ (", stdout); + for (valptr = attr->value; *valptr; valptr ++) + { + if (*valptr == '(' || *valptr == ')' || *valptr == '\\') + putchar('\\'); + putchar(*valptr); + } + fputs(") cvx exec } stopped { cups_handleerror } if clear\n", stdout); + /* Send query code */ fflush(stdout); datalen = 0; @@ -212,53 +307,119 @@ * Read the response data... */ - while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer) - 1, 90.0)) > 0) + bufptr = buffer; + buffer[0] = '\0'; + while ((bytes = cupsBackChannelRead(bufptr, + sizeof(buffer) - (bufptr - buffer) - 1, + 10.0)) > 0) { /* - * Trim whitespace from both ends... + * No newline at the end? Go on reading ... + */ + + bufptr += bytes; + *bufptr = '\0'; + + if (bytes == 0 || + (bufptr > buffer && bufptr[-1] != '\r' && bufptr[-1] != '\n')) + continue; + + /* + * Trim whitespace and control characters from both ends... */ - buffer[bytes] = '\0'; + bytes = bufptr - buffer; - for (bufptr = buffer + bytes - 1; bufptr >= buffer; bufptr --) - if (isspace(*bufptr & 255)) + for (bufptr --; bufptr >= buffer; bufptr --) + if (isspace(*bufptr & 255) || iscntrl(*bufptr & 255)) *bufptr = '\0'; else break; - for (bufptr = buffer; isspace(*bufptr & 255); bufptr ++); + for (bufptr = buffer; isspace(*bufptr & 255) || iscntrl(*bufptr & 255); + bufptr ++); - fprintf(stderr, "DEBUG: Got \"%s\" (%d bytes)\n", bufptr, (int)bytes); + if (bufptr > buffer) + { + _cups_strcpy(buffer, bufptr); + bufptr = buffer; + } + + fprintf(stderr, "DEBUG: Got %d bytes.\n", (int)bytes); /* * Skip blank lines... */ - if (!*bufptr) + if (!buffer[0]) continue; /* + * Check the response... + */ + + if ((bufptr = strchr(buffer, ':')) != NULL) + { + /* + * PostScript code for this option in the PPD is broken; show the + * interpreter's error message that came back... + */ + + fprintf(stderr, "DEBUG%s\n", bufptr); + break; + } + + /* * Verify the result is a valid option choice... */ - if (!ppdFindChoice(option, bufptr)) + if (!ppdFindChoice(option, buffer)) + { + if (!strcasecmp(buffer, "Unknown")) + break; + + bufptr = buffer; + buffer[0] = '\0'; continue; + } /* * Write out the result and move on to the next option... */ - fprintf(stderr, "DEBUG: Default%s=%s\n", option->keyword, bufptr); - fprintf(stderr, "PPD: Default%s=%s\n", option->keyword, bufptr); + fprintf(stderr, "PPD: Default%s=%s\n", option->keyword, buffer); break; } + + /* + * Printer did not answer this option's query + */ + + if (bytes <= 0) + { + fprintf(stderr, + "DEBUG: No answer to query for option %s within 10 seconds.\n", + option->keyword); + status = 1; + } } /* * Finish the job... */ + fflush(stdout); end_ps(ppd); + + /* + * Return... + */ + + if (status) + _cupsLangPrintFilter(stderr, "WARNING", + _("Unable to configure printer options.")); + + return (0); } @@ -280,6 +441,7 @@ puts("%!"); puts("userdict dup(\\004)cvn{}put (\\004\\004)cvn{}put\n"); + fflush(stdout); } @@ -319,7 +481,12 @@ * the product/interpreter information... */ - puts("% You are using the wrong driver for your printer!\n" + puts("\r%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + "%%%%%%%%%%%%%\n" + "\r%%%% If you can read this, you are using the wrong driver for your " + "printer. %%%%\n" + "\r%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + "%%%%%%%%%%%%%\n" "0 setgray\n" "2 setlinewidth\n" "initclip newpath clippath gsave stroke grestore pathbbox\n" @@ -367,5 +534,5 @@ /* - * End of "$Id: commandtops.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: commandtops.c 10373 2012-03-21 23:00:05Z mike $". */ diff -Nru cups-1.5.2/filter/Dependencies cups-1.5.3/filter/Dependencies --- cups-1.5.2/filter/Dependencies 2011-04-13 17:45:24.000000000 +0200 +++ cups-1.5.3/filter/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,96 +3,106 @@ image-bmp.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-bmp.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-bmp.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-bmp.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-bmp.o: ../cups/debug-private.h ../cups/versioning.h +image-bmp.o: ../cups/string-private.h ../config.h image-colorspace.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-colorspace.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-colorspace.o: ../cups/http.h ../cups/array.h ../cups/language.h image-colorspace.o: ../cups/ppd.h ../cups/cups.h ../cups/debug-private.h -image-colorspace.o: ../cups/string-private.h ../config.h +image-colorspace.o: ../cups/versioning.h ../cups/string-private.h ../config.h image-gif.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-gif.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-gif.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-gif.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-gif.o: ../cups/debug-private.h ../cups/versioning.h +image-gif.o: ../cups/string-private.h ../config.h image-jpeg.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-jpeg.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-jpeg.o: ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-jpeg.o: ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-jpeg.o: ../config.h +image-jpeg.o: ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-jpeg.o: ../cups/string-private.h ../config.h image-photocd.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-photocd.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-photocd.o: ../cups/http.h ../cups/array.h ../cups/language.h image-photocd.o: ../cups/ppd.h ../cups/cups.h ../cups/debug-private.h -image-photocd.o: ../cups/string-private.h ../config.h +image-photocd.o: ../cups/versioning.h ../cups/string-private.h ../config.h image-pix.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-pix.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-pix.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-pix.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-pix.o: ../cups/debug-private.h ../cups/versioning.h +image-pix.o: ../cups/string-private.h ../config.h image-png.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-png.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-png.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-png.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-png.o: ../cups/debug-private.h ../cups/versioning.h +image-png.o: ../cups/string-private.h ../config.h image-pnm.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-pnm.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-pnm.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-pnm.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-pnm.o: ../cups/debug-private.h ../cups/versioning.h +image-pnm.o: ../cups/string-private.h ../config.h image-sgi.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-sgi.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-sgi.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-sgi.o: ../cups/debug-private.h ../cups/string-private.h ../config.h -image-sgi.o: image-sgi.h +image-sgi.o: ../cups/debug-private.h ../cups/versioning.h +image-sgi.o: ../cups/string-private.h ../config.h image-sgi.h image-sgilib.o: image-sgi.h image-sun.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-sun.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-sun.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-sun.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-sun.o: ../cups/debug-private.h ../cups/versioning.h +image-sun.o: ../cups/string-private.h ../config.h image-tiff.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-tiff.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-tiff.o: ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-tiff.o: ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-tiff.o: ../config.h +image-tiff.o: ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-tiff.o: ../cups/string-private.h ../config.h image-zoom.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-zoom.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-zoom.o: ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-zoom.o: ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-zoom.o: ../config.h +image-zoom.o: ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-zoom.o: ../cups/string-private.h ../config.h image.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image.o: ../cups/debug-private.h ../cups/versioning.h +image.o: ../cups/string-private.h ../config.h error.o: image-private.h image.h ../cups/raster.h ../cups/cups.h error.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h error.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -error.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +error.o: ../cups/debug-private.h ../cups/versioning.h +error.o: ../cups/string-private.h ../config.h interpret.o: image-private.h image.h ../cups/raster.h ../cups/cups.h interpret.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h interpret.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -interpret.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +interpret.o: ../cups/debug-private.h ../cups/versioning.h +interpret.o: ../cups/string-private.h ../config.h raster.o: image-private.h image.h ../cups/raster.h ../cups/cups.h raster.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h raster.o: ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -raster.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +raster.o: ../cups/debug-private.h ../cups/versioning.h +raster.o: ../cups/string-private.h ../config.h bannertops.o: pstext.h common.h ../cups/string-private.h ../config.h bannertops.o: ../cups/cups.h ../cups/ppd.h ../cups/cups.h ../cups/file.h bannertops.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h bannertops.o: ../cups/array.h ../cups/language.h ../cups/transcode.h image.h bannertops.o: ../cups/raster.h ../cups/ppd.h ../cups/language-private.h commandtops.o: ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h -commandtops.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -commandtops.o: ../cups/ppd.h ../cups/cups.h ../cups/file.h -commandtops.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -commandtops.o: ../cups/array.h ../cups/language.h ../cups/pwg-private.h -commandtops.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -commandtops.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -commandtops.o: ../cups/transcode.h ../cups/thread-private.h -commandtops.o: ../cups/sidechannel.h +commandtops.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +commandtops.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +commandtops.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h +commandtops.o: ../cups/http.h ../cups/array.h ../cups/language.h +commandtops.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +commandtops.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +commandtops.o: ../cups/language-private.h ../cups/transcode.h +commandtops.o: ../cups/thread-private.h ../cups/sidechannel.h gziptoany.o: ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h -gziptoany.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -gziptoany.o: ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -gziptoany.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h -gziptoany.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -gziptoany.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -gziptoany.o: ../cups/language-private.h ../cups/transcode.h -gziptoany.o: ../cups/thread-private.h +gziptoany.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +gziptoany.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +gziptoany.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h +gziptoany.o: ../cups/array.h ../cups/language.h ../cups/pwg-private.h +gziptoany.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +gziptoany.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +gziptoany.o: ../cups/transcode.h ../cups/thread-private.h imagetops.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h imagetops.o: ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h imagetops.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h @@ -103,7 +113,8 @@ imagetoraster.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h imagetoraster.o: ../cups/array.h ../cups/language.h image-private.h image.h imagetoraster.o: ../cups/raster.h ../cups/ppd.h ../cups/debug-private.h -imagetoraster.o: ../cups/language-private.h ../cups/transcode.h +imagetoraster.o: ../cups/versioning.h ../cups/language-private.h +imagetoraster.o: ../cups/transcode.h common.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h common.o: ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h common.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h @@ -138,19 +149,23 @@ rastertolabel.o: ../cups/array.h ../cups/language.h ../cups/string-private.h rastertolabel.o: ../config.h ../cups/language-private.h ../cups/transcode.h rastertolabel.o: ../cups/raster.h ../cups/ppd.h -rastertopwg.o: ../cups/cups.h ../cups/language-private.h ../cups/transcode.h -rastertopwg.o: ../cups/language.h ../cups/array.h ../cups/versioning.h -rastertopwg.o: ../cups/raster.h ../cups/cups.h ../cups/file.h ../cups/ipp.h -rastertopwg.o: ../cups/http.h ../cups/ppd.h ../cups/string-private.h -rastertopwg.o: ../config.h +rastertopwg.o: ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h +rastertopwg.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +rastertopwg.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +rastertopwg.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h +rastertopwg.o: ../cups/http.h ../cups/array.h ../cups/language.h +rastertopwg.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +rastertopwg.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +rastertopwg.o: ../cups/language-private.h ../cups/transcode.h +rastertopwg.o: ../cups/thread-private.h ../cups/raster.h ../cups/ppd.h testimage.o: image.h ../cups/raster.h ../cups/cups.h ../cups/file.h testimage.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h testimage.o: ../cups/array.h ../cups/language.h ../cups/ppd.h testraster.o: image-private.h image.h ../cups/raster.h ../cups/cups.h testraster.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h testraster.o: ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -testraster.o: ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -testraster.o: ../config.h +testraster.o: ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +testraster.o: ../cups/string-private.h ../config.h textcommon.o: textcommon.h common.h ../cups/string-private.h ../config.h textcommon.o: ../cups/cups.h ../cups/ppd.h ../cups/cups.h ../cups/file.h textcommon.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h @@ -165,96 +180,106 @@ image-bmp.32.o: image-bmp.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-bmp.32.o: image-bmp.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-bmp.32.o: image-bmp.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-bmp.32.o: image-bmp.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-bmp.32.o: image-bmp.c ../cups/debug-private.h ../cups/versioning.h +image-bmp.32.o: image-bmp.c ../cups/string-private.h ../config.h image-colorspace.32.o: image-colorspace.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-colorspace.32.o: image-colorspace.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-colorspace.32.o: image-colorspace.c ../cups/http.h ../cups/array.h ../cups/language.h image-colorspace.32.o: image-colorspace.c ../cups/ppd.h ../cups/cups.h ../cups/debug-private.h -image-colorspace.32.o: image-colorspace.c ../cups/string-private.h ../config.h +image-colorspace.32.o: image-colorspace.c ../cups/versioning.h ../cups/string-private.h ../config.h image-gif.32.o: image-gif.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-gif.32.o: image-gif.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-gif.32.o: image-gif.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-gif.32.o: image-gif.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-gif.32.o: image-gif.c ../cups/debug-private.h ../cups/versioning.h +image-gif.32.o: image-gif.c ../cups/string-private.h ../config.h image-jpeg.32.o: image-jpeg.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-jpeg.32.o: image-jpeg.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-jpeg.32.o: image-jpeg.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-jpeg.32.o: image-jpeg.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-jpeg.32.o: image-jpeg.c ../config.h +image-jpeg.32.o: image-jpeg.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-jpeg.32.o: image-jpeg.c ../cups/string-private.h ../config.h image-photocd.32.o: image-photocd.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-photocd.32.o: image-photocd.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-photocd.32.o: image-photocd.c ../cups/http.h ../cups/array.h ../cups/language.h image-photocd.32.o: image-photocd.c ../cups/ppd.h ../cups/cups.h ../cups/debug-private.h -image-photocd.32.o: image-photocd.c ../cups/string-private.h ../config.h +image-photocd.32.o: image-photocd.c ../cups/versioning.h ../cups/string-private.h ../config.h image-pix.32.o: image-pix.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pix.32.o: image-pix.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-pix.32.o: image-pix.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-pix.32.o: image-pix.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-pix.32.o: image-pix.c ../cups/debug-private.h ../cups/versioning.h +image-pix.32.o: image-pix.c ../cups/string-private.h ../config.h image-png.32.o: image-png.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-png.32.o: image-png.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-png.32.o: image-png.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-png.32.o: image-png.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-png.32.o: image-png.c ../cups/debug-private.h ../cups/versioning.h +image-png.32.o: image-png.c ../cups/string-private.h ../config.h image-pnm.32.o: image-pnm.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pnm.32.o: image-pnm.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-pnm.32.o: image-pnm.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-pnm.32.o: image-pnm.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-pnm.32.o: image-pnm.c ../cups/debug-private.h ../cups/versioning.h +image-pnm.32.o: image-pnm.c ../cups/string-private.h ../config.h image-sgi.32.o: image-sgi.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sgi.32.o: image-sgi.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-sgi.32.o: image-sgi.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-sgi.32.o: image-sgi.c ../cups/debug-private.h ../cups/string-private.h ../config.h -image-sgi.32.o: image-sgi.c image-sgi.h +image-sgi.32.o: image-sgi.c ../cups/debug-private.h ../cups/versioning.h +image-sgi.32.o: image-sgi.c ../cups/string-private.h ../config.h image-sgi.h image-sgilib.32.o: image-sgilib.c image-sgi.h image-sun.32.o: image-sun.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sun.32.o: image-sun.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-sun.32.o: image-sun.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-sun.32.o: image-sun.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-sun.32.o: image-sun.c ../cups/debug-private.h ../cups/versioning.h +image-sun.32.o: image-sun.c ../cups/string-private.h ../config.h image-tiff.32.o: image-tiff.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-tiff.32.o: image-tiff.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-tiff.32.o: image-tiff.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-tiff.32.o: image-tiff.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-tiff.32.o: image-tiff.c ../config.h +image-tiff.32.o: image-tiff.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-tiff.32.o: image-tiff.c ../cups/string-private.h ../config.h image-zoom.32.o: image-zoom.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-zoom.32.o: image-zoom.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-zoom.32.o: image-zoom.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-zoom.32.o: image-zoom.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-zoom.32.o: image-zoom.c ../config.h +image-zoom.32.o: image-zoom.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-zoom.32.o: image-zoom.c ../cups/string-private.h ../config.h image.32.o: image.c image-private.h image.h ../cups/raster.h ../cups/cups.h image.32.o: image.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image.32.o: image.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image.32.o: image.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image.32.o: image.c ../cups/debug-private.h ../cups/versioning.h +image.32.o: image.c ../cups/string-private.h ../config.h error.32.o: error.c image-private.h image.h ../cups/raster.h ../cups/cups.h error.32.o: error.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h error.32.o: error.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -error.32.o: error.c ../cups/debug-private.h ../cups/string-private.h ../config.h +error.32.o: error.c ../cups/debug-private.h ../cups/versioning.h +error.32.o: error.c ../cups/string-private.h ../config.h interpret.32.o: interpret.c image-private.h image.h ../cups/raster.h ../cups/cups.h interpret.32.o: interpret.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h interpret.32.o: interpret.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -interpret.32.o: interpret.c ../cups/debug-private.h ../cups/string-private.h ../config.h +interpret.32.o: interpret.c ../cups/debug-private.h ../cups/versioning.h +interpret.32.o: interpret.c ../cups/string-private.h ../config.h raster.32.o: raster.c image-private.h image.h ../cups/raster.h ../cups/cups.h raster.32.o: raster.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h raster.32.o: raster.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -raster.32.o: raster.c ../cups/debug-private.h ../cups/string-private.h ../config.h +raster.32.o: raster.c ../cups/debug-private.h ../cups/versioning.h +raster.32.o: raster.c ../cups/string-private.h ../config.h bannertops.32.o: bannertops.c pstext.h common.h ../cups/string-private.h ../config.h bannertops.32.o: bannertops.c ../cups/cups.h ../cups/ppd.h ../cups/cups.h ../cups/file.h bannertops.32.o: bannertops.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h bannertops.32.o: bannertops.c ../cups/array.h ../cups/language.h ../cups/transcode.h image.h bannertops.32.o: bannertops.c ../cups/raster.h ../cups/ppd.h ../cups/language-private.h commandtops.32.o: commandtops.c ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h -commandtops.32.o: commandtops.c ../config.h ../cups/debug-private.h ../cups/ppd-private.h -commandtops.32.o: commandtops.c ../cups/ppd.h ../cups/cups.h ../cups/file.h -commandtops.32.o: commandtops.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h -commandtops.32.o: commandtops.c ../cups/array.h ../cups/language.h ../cups/pwg-private.h -commandtops.32.o: commandtops.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -commandtops.32.o: commandtops.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -commandtops.32.o: commandtops.c ../cups/transcode.h ../cups/thread-private.h -commandtops.32.o: commandtops.c ../cups/sidechannel.h +commandtops.32.o: commandtops.c ../config.h ../cups/debug-private.h ../cups/versioning.h +commandtops.32.o: commandtops.c ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +commandtops.32.o: commandtops.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h +commandtops.32.o: commandtops.c ../cups/http.h ../cups/array.h ../cups/language.h +commandtops.32.o: commandtops.c ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +commandtops.32.o: commandtops.c ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +commandtops.32.o: commandtops.c ../cups/language-private.h ../cups/transcode.h +commandtops.32.o: commandtops.c ../cups/thread-private.h ../cups/sidechannel.h gziptoany.32.o: gziptoany.c ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h -gziptoany.32.o: gziptoany.c ../config.h ../cups/debug-private.h ../cups/ppd-private.h -gziptoany.32.o: gziptoany.c ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -gziptoany.32.o: gziptoany.c ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h -gziptoany.32.o: gziptoany.c ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -gziptoany.32.o: gziptoany.c ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -gziptoany.32.o: gziptoany.c ../cups/language-private.h ../cups/transcode.h -gziptoany.32.o: gziptoany.c ../cups/thread-private.h +gziptoany.32.o: gziptoany.c ../config.h ../cups/debug-private.h ../cups/versioning.h +gziptoany.32.o: gziptoany.c ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +gziptoany.32.o: gziptoany.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h +gziptoany.32.o: gziptoany.c ../cups/array.h ../cups/language.h ../cups/pwg-private.h +gziptoany.32.o: gziptoany.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +gziptoany.32.o: gziptoany.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +gziptoany.32.o: gziptoany.c ../cups/transcode.h ../cups/thread-private.h imagetops.32.o: imagetops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h imagetops.32.o: imagetops.c ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h imagetops.32.o: imagetops.c ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h @@ -265,7 +290,8 @@ imagetoraster.32.o: imagetoraster.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h imagetoraster.32.o: imagetoraster.c ../cups/array.h ../cups/language.h image-private.h image.h imagetoraster.32.o: imagetoraster.c ../cups/raster.h ../cups/ppd.h ../cups/debug-private.h -imagetoraster.32.o: imagetoraster.c ../cups/language-private.h ../cups/transcode.h +imagetoraster.32.o: imagetoraster.c ../cups/versioning.h ../cups/language-private.h +imagetoraster.32.o: imagetoraster.c ../cups/transcode.h common.32.o: common.c common.h ../cups/string-private.h ../config.h ../cups/cups.h common.32.o: common.c ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h common.32.o: common.c ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h @@ -300,19 +326,23 @@ rastertolabel.32.o: rastertolabel.c ../cups/array.h ../cups/language.h ../cups/string-private.h rastertolabel.32.o: rastertolabel.c ../config.h ../cups/language-private.h ../cups/transcode.h rastertolabel.32.o: rastertolabel.c ../cups/raster.h ../cups/ppd.h -rastertopwg.32.o: rastertopwg.c ../cups/cups.h ../cups/language-private.h ../cups/transcode.h -rastertopwg.32.o: rastertopwg.c ../cups/language.h ../cups/array.h ../cups/versioning.h -rastertopwg.32.o: rastertopwg.c ../cups/raster.h ../cups/cups.h ../cups/file.h ../cups/ipp.h -rastertopwg.32.o: rastertopwg.c ../cups/http.h ../cups/ppd.h ../cups/string-private.h -rastertopwg.32.o: rastertopwg.c ../config.h +rastertopwg.32.o: rastertopwg.c ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h +rastertopwg.32.o: rastertopwg.c ../config.h ../cups/debug-private.h ../cups/versioning.h +rastertopwg.32.o: rastertopwg.c ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +rastertopwg.32.o: rastertopwg.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h +rastertopwg.32.o: rastertopwg.c ../cups/http.h ../cups/array.h ../cups/language.h +rastertopwg.32.o: rastertopwg.c ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +rastertopwg.32.o: rastertopwg.c ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +rastertopwg.32.o: rastertopwg.c ../cups/language-private.h ../cups/transcode.h +rastertopwg.32.o: rastertopwg.c ../cups/thread-private.h ../cups/raster.h ../cups/ppd.h testimage.32.o: testimage.c image.h ../cups/raster.h ../cups/cups.h ../cups/file.h testimage.32.o: testimage.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h testimage.32.o: testimage.c ../cups/array.h ../cups/language.h ../cups/ppd.h testraster.32.o: testraster.c image-private.h image.h ../cups/raster.h ../cups/cups.h testraster.32.o: testraster.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h testraster.32.o: testraster.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -testraster.32.o: testraster.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -testraster.32.o: testraster.c ../config.h +testraster.32.o: testraster.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +testraster.32.o: testraster.c ../cups/string-private.h ../config.h textcommon.32.o: textcommon.c textcommon.h common.h ../cups/string-private.h ../config.h textcommon.32.o: textcommon.c ../cups/cups.h ../cups/ppd.h ../cups/cups.h ../cups/file.h textcommon.32.o: textcommon.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h @@ -327,96 +357,106 @@ image-bmp.64.o: image-bmp.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-bmp.64.o: image-bmp.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-bmp.64.o: image-bmp.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-bmp.64.o: image-bmp.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-bmp.64.o: image-bmp.c ../cups/debug-private.h ../cups/versioning.h +image-bmp.64.o: image-bmp.c ../cups/string-private.h ../config.h image-colorspace.64.o: image-colorspace.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-colorspace.64.o: image-colorspace.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-colorspace.64.o: image-colorspace.c ../cups/http.h ../cups/array.h ../cups/language.h image-colorspace.64.o: image-colorspace.c ../cups/ppd.h ../cups/cups.h ../cups/debug-private.h -image-colorspace.64.o: image-colorspace.c ../cups/string-private.h ../config.h +image-colorspace.64.o: image-colorspace.c ../cups/versioning.h ../cups/string-private.h ../config.h image-gif.64.o: image-gif.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-gif.64.o: image-gif.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-gif.64.o: image-gif.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-gif.64.o: image-gif.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-gif.64.o: image-gif.c ../cups/debug-private.h ../cups/versioning.h +image-gif.64.o: image-gif.c ../cups/string-private.h ../config.h image-jpeg.64.o: image-jpeg.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-jpeg.64.o: image-jpeg.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-jpeg.64.o: image-jpeg.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-jpeg.64.o: image-jpeg.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-jpeg.64.o: image-jpeg.c ../config.h +image-jpeg.64.o: image-jpeg.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-jpeg.64.o: image-jpeg.c ../cups/string-private.h ../config.h image-photocd.64.o: image-photocd.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-photocd.64.o: image-photocd.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-photocd.64.o: image-photocd.c ../cups/http.h ../cups/array.h ../cups/language.h image-photocd.64.o: image-photocd.c ../cups/ppd.h ../cups/cups.h ../cups/debug-private.h -image-photocd.64.o: image-photocd.c ../cups/string-private.h ../config.h +image-photocd.64.o: image-photocd.c ../cups/versioning.h ../cups/string-private.h ../config.h image-pix.64.o: image-pix.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pix.64.o: image-pix.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-pix.64.o: image-pix.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-pix.64.o: image-pix.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-pix.64.o: image-pix.c ../cups/debug-private.h ../cups/versioning.h +image-pix.64.o: image-pix.c ../cups/string-private.h ../config.h image-png.64.o: image-png.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-png.64.o: image-png.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-png.64.o: image-png.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-png.64.o: image-png.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-png.64.o: image-png.c ../cups/debug-private.h ../cups/versioning.h +image-png.64.o: image-png.c ../cups/string-private.h ../config.h image-pnm.64.o: image-pnm.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pnm.64.o: image-pnm.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-pnm.64.o: image-pnm.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-pnm.64.o: image-pnm.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-pnm.64.o: image-pnm.c ../cups/debug-private.h ../cups/versioning.h +image-pnm.64.o: image-pnm.c ../cups/string-private.h ../config.h image-sgi.64.o: image-sgi.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sgi.64.o: image-sgi.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-sgi.64.o: image-sgi.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-sgi.64.o: image-sgi.c ../cups/debug-private.h ../cups/string-private.h ../config.h -image-sgi.64.o: image-sgi.c image-sgi.h +image-sgi.64.o: image-sgi.c ../cups/debug-private.h ../cups/versioning.h +image-sgi.64.o: image-sgi.c ../cups/string-private.h ../config.h image-sgi.h image-sgilib.64.o: image-sgilib.c image-sgi.h image-sun.64.o: image-sun.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sun.64.o: image-sun.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image-sun.64.o: image-sun.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image-sun.64.o: image-sun.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-sun.64.o: image-sun.c ../cups/debug-private.h ../cups/versioning.h +image-sun.64.o: image-sun.c ../cups/string-private.h ../config.h image-tiff.64.o: image-tiff.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-tiff.64.o: image-tiff.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-tiff.64.o: image-tiff.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-tiff.64.o: image-tiff.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-tiff.64.o: image-tiff.c ../config.h +image-tiff.64.o: image-tiff.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-tiff.64.o: image-tiff.c ../cups/string-private.h ../config.h image-zoom.64.o: image-zoom.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-zoom.64.o: image-zoom.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h image-zoom.64.o: image-zoom.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -image-zoom.64.o: image-zoom.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -image-zoom.64.o: image-zoom.c ../config.h +image-zoom.64.o: image-zoom.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +image-zoom.64.o: image-zoom.c ../cups/string-private.h ../config.h image.64.o: image.c image-private.h image.h ../cups/raster.h ../cups/cups.h image.64.o: image.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h image.64.o: image.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -image.64.o: image.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image.64.o: image.c ../cups/debug-private.h ../cups/versioning.h +image.64.o: image.c ../cups/string-private.h ../config.h error.64.o: error.c image-private.h image.h ../cups/raster.h ../cups/cups.h error.64.o: error.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h error.64.o: error.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -error.64.o: error.c ../cups/debug-private.h ../cups/string-private.h ../config.h +error.64.o: error.c ../cups/debug-private.h ../cups/versioning.h +error.64.o: error.c ../cups/string-private.h ../config.h interpret.64.o: interpret.c image-private.h image.h ../cups/raster.h ../cups/cups.h interpret.64.o: interpret.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h interpret.64.o: interpret.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -interpret.64.o: interpret.c ../cups/debug-private.h ../cups/string-private.h ../config.h +interpret.64.o: interpret.c ../cups/debug-private.h ../cups/versioning.h +interpret.64.o: interpret.c ../cups/string-private.h ../config.h raster.64.o: raster.c image-private.h image.h ../cups/raster.h ../cups/cups.h raster.64.o: raster.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h raster.64.o: raster.c ../cups/array.h ../cups/language.h ../cups/ppd.h ../cups/cups.h -raster.64.o: raster.c ../cups/debug-private.h ../cups/string-private.h ../config.h +raster.64.o: raster.c ../cups/debug-private.h ../cups/versioning.h +raster.64.o: raster.c ../cups/string-private.h ../config.h bannertops.64.o: bannertops.c pstext.h common.h ../cups/string-private.h ../config.h bannertops.64.o: bannertops.c ../cups/cups.h ../cups/ppd.h ../cups/cups.h ../cups/file.h bannertops.64.o: bannertops.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h bannertops.64.o: bannertops.c ../cups/array.h ../cups/language.h ../cups/transcode.h image.h bannertops.64.o: bannertops.c ../cups/raster.h ../cups/ppd.h ../cups/language-private.h commandtops.64.o: commandtops.c ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h -commandtops.64.o: commandtops.c ../config.h ../cups/debug-private.h ../cups/ppd-private.h -commandtops.64.o: commandtops.c ../cups/ppd.h ../cups/cups.h ../cups/file.h -commandtops.64.o: commandtops.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h -commandtops.64.o: commandtops.c ../cups/array.h ../cups/language.h ../cups/pwg-private.h -commandtops.64.o: commandtops.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -commandtops.64.o: commandtops.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -commandtops.64.o: commandtops.c ../cups/transcode.h ../cups/thread-private.h -commandtops.64.o: commandtops.c ../cups/sidechannel.h +commandtops.64.o: commandtops.c ../config.h ../cups/debug-private.h ../cups/versioning.h +commandtops.64.o: commandtops.c ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +commandtops.64.o: commandtops.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h +commandtops.64.o: commandtops.c ../cups/http.h ../cups/array.h ../cups/language.h +commandtops.64.o: commandtops.c ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +commandtops.64.o: commandtops.c ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +commandtops.64.o: commandtops.c ../cups/language-private.h ../cups/transcode.h +commandtops.64.o: commandtops.c ../cups/thread-private.h ../cups/sidechannel.h gziptoany.64.o: gziptoany.c ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h -gziptoany.64.o: gziptoany.c ../config.h ../cups/debug-private.h ../cups/ppd-private.h -gziptoany.64.o: gziptoany.c ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -gziptoany.64.o: gziptoany.c ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h -gziptoany.64.o: gziptoany.c ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -gziptoany.64.o: gziptoany.c ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -gziptoany.64.o: gziptoany.c ../cups/language-private.h ../cups/transcode.h -gziptoany.64.o: gziptoany.c ../cups/thread-private.h +gziptoany.64.o: gziptoany.c ../config.h ../cups/debug-private.h ../cups/versioning.h +gziptoany.64.o: gziptoany.c ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +gziptoany.64.o: gziptoany.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h +gziptoany.64.o: gziptoany.c ../cups/array.h ../cups/language.h ../cups/pwg-private.h +gziptoany.64.o: gziptoany.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +gziptoany.64.o: gziptoany.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +gziptoany.64.o: gziptoany.c ../cups/transcode.h ../cups/thread-private.h imagetops.64.o: imagetops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h imagetops.64.o: imagetops.c ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h imagetops.64.o: imagetops.c ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h @@ -427,7 +467,8 @@ imagetoraster.64.o: imagetoraster.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h imagetoraster.64.o: imagetoraster.c ../cups/array.h ../cups/language.h image-private.h image.h imagetoraster.64.o: imagetoraster.c ../cups/raster.h ../cups/ppd.h ../cups/debug-private.h -imagetoraster.64.o: imagetoraster.c ../cups/language-private.h ../cups/transcode.h +imagetoraster.64.o: imagetoraster.c ../cups/versioning.h ../cups/language-private.h +imagetoraster.64.o: imagetoraster.c ../cups/transcode.h common.64.o: common.c common.h ../cups/string-private.h ../config.h ../cups/cups.h common.64.o: common.c ../cups/ppd.h ../cups/cups.h ../cups/file.h ../cups/versioning.h common.64.o: common.c ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h @@ -462,19 +503,23 @@ rastertolabel.64.o: rastertolabel.c ../cups/array.h ../cups/language.h ../cups/string-private.h rastertolabel.64.o: rastertolabel.c ../config.h ../cups/language-private.h ../cups/transcode.h rastertolabel.64.o: rastertolabel.c ../cups/raster.h ../cups/ppd.h -rastertopwg.64.o: rastertopwg.c ../cups/cups.h ../cups/language-private.h ../cups/transcode.h -rastertopwg.64.o: rastertopwg.c ../cups/language.h ../cups/array.h ../cups/versioning.h -rastertopwg.64.o: rastertopwg.c ../cups/raster.h ../cups/cups.h ../cups/file.h ../cups/ipp.h -rastertopwg.64.o: rastertopwg.c ../cups/http.h ../cups/ppd.h ../cups/string-private.h -rastertopwg.64.o: rastertopwg.c ../config.h +rastertopwg.64.o: rastertopwg.c ../cups/cups-private.h ../cups/cups.h ../cups/string-private.h +rastertopwg.64.o: rastertopwg.c ../config.h ../cups/debug-private.h ../cups/versioning.h +rastertopwg.64.o: rastertopwg.c ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +rastertopwg.64.o: rastertopwg.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h +rastertopwg.64.o: rastertopwg.c ../cups/http.h ../cups/array.h ../cups/language.h +rastertopwg.64.o: rastertopwg.c ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +rastertopwg.64.o: rastertopwg.c ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +rastertopwg.64.o: rastertopwg.c ../cups/language-private.h ../cups/transcode.h +rastertopwg.64.o: rastertopwg.c ../cups/thread-private.h ../cups/raster.h ../cups/ppd.h testimage.64.o: testimage.c image.h ../cups/raster.h ../cups/cups.h ../cups/file.h testimage.64.o: testimage.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h testimage.64.o: testimage.c ../cups/array.h ../cups/language.h ../cups/ppd.h testraster.64.o: testraster.c image-private.h image.h ../cups/raster.h ../cups/cups.h testraster.64.o: testraster.c ../cups/file.h ../cups/versioning.h ../cups/ipp.h testraster.64.o: testraster.c ../cups/http.h ../cups/array.h ../cups/language.h ../cups/ppd.h -testraster.64.o: testraster.c ../cups/cups.h ../cups/debug-private.h ../cups/string-private.h -testraster.64.o: testraster.c ../config.h +testraster.64.o: testraster.c ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h +testraster.64.o: testraster.c ../cups/string-private.h ../config.h textcommon.64.o: textcommon.c textcommon.h common.h ../cups/string-private.h ../config.h textcommon.64.o: textcommon.c ../cups/cups.h ../cups/ppd.h ../cups/cups.h ../cups/file.h textcommon.64.o: textcommon.c ../cups/versioning.h ../cups/ipp.h ../cups/http.h diff -Nru cups-1.5.2/install-sh cups-1.5.3/install-sh --- cups-1.5.2/install-sh 2009-05-27 18:42:40.000000000 +0200 +++ cups-1.5.3/install-sh 2012-03-01 01:05:55.000000000 +0100 @@ -1,10 +1,10 @@ #!/bin/sh # -# "$Id: install-sh 8688 2009-05-27 16:42:40Z mike $" +# "$Id: install-sh 10317 2012-03-01 00:05:55Z mike $" # # Install a program, script, or datafile. # -# Copyright 2008-2009 by Apple Inc. +# Copyright 2008-2012 by Apple Inc. # # This script is not compatible with BSD (or any other) install program, as it # allows owner and group changes to fail with a warning and makes sure that the @@ -46,6 +46,7 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" +gzipprog="${GZIPPROG-gzip}" transformbasename="" transform_arg="" @@ -60,6 +61,11 @@ dst="" dir_arg="" +function gzipcp { + # gzipcp from to + $gzipprog -9 <"$1" >"$2" +} + while [ x"$1" != x ]; do case $1 in -c) @@ -101,6 +107,12 @@ continue ;; + -z) + instcmd="gzipcp" + shift + continue + ;; + *) if [ x"$src" = x ]; then src="$1" @@ -121,7 +133,7 @@ if [ x"$dir_arg" != x ]; then dst="$src" src="" - + if [ -d "$dst" ]; then instcmd=: else @@ -129,13 +141,13 @@ fi else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command - # might cause directories to be created, which would be especially bad + # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ ! -f "$src" -a ! -d "$src" ]; then echo "install: $src does not exist" exit 1 fi - + if [ x"$dst" = x ]; then echo "install: No destination specified" exit 1 diff -Nru cups-1.5.2/INSTALL.txt cups-1.5.3/INSTALL.txt --- cups-1.5.2/INSTALL.txt 2012-02-05 19:38:39.000000000 +0100 +++ cups-1.5.3/INSTALL.txt 2012-05-15 16:01:45.000000000 +0200 @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.5.2 - 2012-02-05 +INSTALL - CUPS v1.5.3 - 2012-05-15 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff -Nru cups-1.5.2/locale/cups_da.po cups-1.5.3/locale/cups_da.po --- cups-1.5.2/locale/cups_da.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_da.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Internet Printing Protocol" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Udskrevet til: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3839,15 +3846,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3857,12 +3858,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4044,6 +4051,9 @@ msgid "Unable to change server settings:" msgstr "Kan ikke ændre serverindstillinger:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Kan ikke oprette forbindelse til vært." @@ -4165,9 +4175,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Kan ikke hente liste over printerarkiver:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Kan ikke hente printerattributter:" diff -Nru cups-1.5.2/locale/cups_de.po cups-1.5.3/locale/cups_de.po --- cups-1.5.2/locale/cups_de.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_de.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2905,6 +2906,10 @@ msgid "Internet Printing Protocol" msgstr "Internet-Druckerprotokoll" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3510,6 +3515,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Gedruckt für: " @@ -3546,8 +3554,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3844,15 +3851,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3862,12 +3863,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4052,6 +4059,9 @@ msgid "Unable to change server settings:" msgstr "Servereinstellungen konnten nicht geändert werden:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Verbindungsaufbau zum Host fehlgeschlagen." @@ -4173,9 +4183,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Liste der Druckertreiber konnte nicht abgerufen werden:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Druckerattribute konnten nicht abgerufen werden:" diff -Nru cups-1.5.2/locale/cups_es.po cups-1.5.3/locale/cups_es.po --- cups-1.5.2/locale/cups_es.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_es.po 2012-03-07 22:38:28.000000000 +0100 @@ -16,13 +16,14 @@ msgstr "" "Project-Id-Version: CUPS 1.5\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2011-06-18 19:16+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "\t\t(todos)" @@ -3138,6 +3139,10 @@ msgid "Internet Printing Protocol" msgstr "Protocolo de Impresión de Internet IPP" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3750,6 +3755,9 @@ msgid "Print file was not accepted." msgstr "No se ha aceptado el archivo de impresión." +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Impreso para: " @@ -3786,9 +3794,8 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "Impresora ocupada; reintento en 30 segundos." -#, c-format -msgid "Printer did not respond after %d seconds." -msgstr "La impresora no respondió tras %d segundos." +msgid "Printer did not respond." +msgstr "" #, c-format msgid "Printer does not support IPP/%d.%d, trying IPP/%s." @@ -4085,15 +4092,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "El URI de la impresora es incorrecto o ya no existe." -msgid "The printer is almost out of ink." -msgstr "La impresora casi no tiene tinta." - msgid "The printer is busy." msgstr "La impresora está ocupada." -msgid "The printer is low on toner." -msgstr "La impresora tiene poco tóner." - msgid "The printer is not connected." msgstr "La impresora no está conectada." @@ -4103,12 +4104,18 @@ msgid "The printer is out of ink." msgstr "La impresora no tiene tinta." -msgid "The printer is out of toner." -msgstr "La impresora no tiene tóner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." +msgstr "" msgid "The printer is unreachable at this time." msgstr "La impresora es inalcanzable en este momento." +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "La impresora puede no existir o no estar disponible en este momento." @@ -4295,6 +4302,9 @@ msgid "Unable to change server settings:" msgstr "No se ha podido cambiar la configuración del servidor:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "No se ha podido conectar al servidor." @@ -4442,9 +4452,6 @@ msgid "Unable to get list of printer drivers:" msgstr "No se ha podido obtener la lista de controladores de impresora:" -msgid "Unable to get print job status." -msgstr "No se ha podido obtener el estado del trabajo de impresión." - msgid "Unable to get printer attributes:" msgstr "No se han podido obtener los atributos de la impresora:" @@ -5748,5 +5755,20 @@ msgid "variable-bindings uses indefinite length" msgstr "variable-bindings usa una longitud indefinida" +#~ msgid "Printer did not respond after %d seconds." +#~ msgstr "La impresora no respondió tras %d segundos." + +#~ msgid "The printer is almost out of ink." +#~ msgstr "La impresora casi no tiene tinta." + +#~ msgid "The printer is low on toner." +#~ msgstr "La impresora tiene poco tóner." + +#~ msgid "The printer is out of toner." +#~ msgstr "La impresora no tiene tóner." + #~ msgid "Unable to connect to server" #~ msgstr "No se ha podido conectar al servidor" + +#~ msgid "Unable to get print job status." +#~ msgstr "No se ha podido obtener el estado del trabajo de impresión." diff -Nru cups-1.5.2/locale/cups_eu.po cups-1.5.3/locale/cups_eu.po --- cups-1.5.2/locale/cups_eu.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_eu.po 2012-03-07 22:38:28.000000000 +0100 @@ -33,13 +33,14 @@ msgstr "" "Project-Id-Version: cups_1.4rc1_eu\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-07-03 19:34+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -2938,6 +2939,10 @@ msgid "Internet Printing Protocol" msgstr "Interneten inPrimatzeko Protokoloa" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3542,6 +3547,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Honentzako inprimatuta: " @@ -3578,8 +3586,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3874,15 +3881,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3892,12 +3893,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4081,6 +4088,9 @@ msgid "Unable to change server settings:" msgstr "Ezin dira zerbitzariaren ezarpenak aldatu:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Ezin da ostalariarekin konektatu." @@ -4202,9 +4212,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Ezin da inprimagailuen kontrolatzaileen zerrenda lortu:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Ezin dira inprimagailuaren atributuak lortu:" diff -Nru cups-1.5.2/locale/cups_fi.po cups-1.5.3/locale/cups_fi.po --- cups-1.5.2/locale/cups_fi.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_fi.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-12 15:10+0200\n" "Last-Translator: Teppo Turtiainen \n" "Language-Team: Finnish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Internet Printing Protocol" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3508,6 +3513,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Tulostettu kohteelle: " @@ -3544,8 +3552,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3841,15 +3848,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3859,12 +3860,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4047,6 +4054,9 @@ msgid "Unable to change server settings:" msgstr "Palvelimen asetuksia ei voida muuttaa:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Palvelimeen ei voida yhdistää." @@ -4168,9 +4178,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Luetteloa tulostinajureista ei voida hakea:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Tulostimen attribuutteja ei voida hakea:" diff -Nru cups-1.5.2/locale/cups_fr.po cups-1.5.3/locale/cups_fr.po --- cups-1.5.2/locale/cups_fr.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_fr.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2905,6 +2906,10 @@ msgid "Internet Printing Protocol" msgstr "Internet Printing Protocol" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL ( Langage de contrôle de tâche )" @@ -3508,6 +3513,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Imprimé pour : " @@ -3544,8 +3552,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3842,15 +3849,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3860,12 +3861,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4050,6 +4057,9 @@ msgid "Unable to change server settings:" msgstr "Impossible de modifier les réglages du serveur :" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Connexion à l’hôte impossible." @@ -4171,9 +4181,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Impossible d’obtenir la liste des gestionnaires d’impression :" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Impossible de récupérer les attributs de l’imprimante :" diff -Nru cups-1.5.2/locale/cups.header cups-1.5.3/locale/cups.header --- cups-1.5.2/locale/cups.header 2010-11-21 09:54:49.000000000 +0100 +++ cups-1.5.3/locale/cups.header 2012-02-13 18:13:21.000000000 +0100 @@ -3,7 +3,7 @@ # # Message catalog template for CUPS. # -# Copyright 2007-2010 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 2005-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the diff -Nru cups-1.5.2/locale/cups_hu.po cups-1.5.3/locale/cups_hu.po --- cups-1.5.2/locale/cups_hu.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_hu.po 2012-03-07 22:38:28.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2011-12-02 01:55+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -3111,6 +3111,10 @@ msgid "Internet Printing Protocol" msgstr "Internet nyomtatási protokoll" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3726,6 +3730,9 @@ msgid "Print file was not accepted." msgstr "A nyomtatási fájl nem lett elfogadva." +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Nyomtatva ehhez: " @@ -3762,9 +3769,8 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "Nyomtató elfoglalt; 30 másodperc múlva újrapróbálkozom." -#, c-format -msgid "Printer did not respond after %d seconds." -msgstr "A nyomtató nem válaszolt %d másodperc után." +msgid "Printer did not respond." +msgstr "" #, c-format msgid "Printer does not support IPP/%d.%d, trying IPP/%s." @@ -4061,15 +4067,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "A nyomtató URI-címe helytelen, vagy nem létezik." -msgid "The printer is almost out of ink." -msgstr "A nyomtatóból majdnem kifogyott a tinta." - msgid "The printer is busy." msgstr "A nyomtató elfoglalt." -msgid "The printer is low on toner." -msgstr "A nyomtatóban kifogyóban van a festékkazetta." - msgid "The printer is not connected." msgstr "A nyomtató nincs csatlakoztatva." @@ -4079,12 +4079,18 @@ msgid "The printer is out of ink." msgstr "A nyomtatóból kifogyott a tinta." -msgid "The printer is out of toner." -msgstr "A nyomtató festékkazettája kifogyott." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." +msgstr "" msgid "The printer is unreachable at this time." msgstr "A nyomtató jelenleg elérhetetlen." +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "A nyomtató nem létezik, vagy jelenleg elérhetetlen." @@ -4271,6 +4277,9 @@ msgid "Unable to change server settings:" msgstr "Nem módosíthatók a kiszolgáló beállításai:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "A géphez nem lehet kapcsolódni." @@ -4404,9 +4413,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Nem kérhető le a nyomtató-illesztőprogramok listája:" -msgid "Unable to get print job status." -msgstr "Nem kérhető le a nyomtatási feladat állapota." - msgid "Unable to get printer attributes:" msgstr "Nem kérhetők le a nyomtató attribútumai:" @@ -5783,6 +5789,18 @@ #~ msgid "Printer busy; will retry in 10 seconds." #~ msgstr "Nyomtató elfoglalt; 10 másodperc múlva újrapróbálkozom." +#~ msgid "Printer did not respond after %d seconds." +#~ msgstr "A nyomtató nem válaszolt %d másodperc után." + +#~ msgid "The printer is almost out of ink." +#~ msgstr "A nyomtatóból majdnem kifogyott a tinta." + +#~ msgid "The printer is low on toner." +#~ msgstr "A nyomtatóban kifogyóban van a festékkazetta." + +#~ msgid "The printer is out of toner." +#~ msgstr "A nyomtató festékkazettája kifogyott." + #~ msgid "This printer does not conform to the IPP standard and may not work." #~ msgstr "" #~ "Ez a nyomtató nem felel meg az IPP szabványnak, és lehet, hogy nem fog " @@ -5804,6 +5822,9 @@ #~ msgid "Unable to get job attributes: %s" #~ msgstr "Nem kérhetők le a feladat attribútumai: %s" +#~ msgid "Unable to get print job status." +#~ msgstr "Nem kérhető le a nyomtatási feladat állapota." + #~ msgid "Unable to get printer status: %s" #~ msgstr "Nem kérhető le a nyomtató állapota: %s" diff -Nru cups-1.5.2/locale/cups_id.po cups-1.5.3/locale/cups_id.po --- cups-1.5.2/locale/cups_id.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_id.po 2012-03-07 22:38:28.000000000 +0100 @@ -33,13 +33,14 @@ msgstr "" "Project-Id-Version: cups_id\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-09-29 05:17+0700\n" "Last-Translator: Citra Paska \n" "Language-Team: Bahasa Indonesia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: KBabel 1.11.4\n" msgid "\t\t(all)" @@ -2936,6 +2937,10 @@ msgid "Internet Printing Protocol" msgstr "Protokol Cetak Internet" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3539,6 +3544,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Dicetak Untuk: " @@ -3575,8 +3583,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3872,15 +3879,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3890,12 +3891,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4080,6 +4087,9 @@ msgid "Unable to change server settings:" msgstr "Tidak bisa mengubah pengaturan server:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Tidak bisa terhubung ke host." @@ -4201,9 +4211,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Tidak bisa memperoleh daftar penggerak pencetak:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Tidak bisa memperoleh atribut pencetak:" diff -Nru cups-1.5.2/locale/cups_it.po cups-1.5.3/locale/cups_it.po --- cups-1.5.2/locale/cups_it.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_it.po 2012-03-07 22:38:28.000000000 +0100 @@ -3,13 +3,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2010-01-10 01:03+0100\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -2906,6 +2907,10 @@ msgid "Internet Printing Protocol" msgstr "IPP (Internet Printing Protocol)" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3509,6 +3514,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Stampato per: " @@ -3545,8 +3553,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3843,15 +3850,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3861,12 +3862,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4050,6 +4057,9 @@ msgid "Unable to change server settings:" msgstr "Impossibile modificare le impostazioni del server:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Impossibile connettersi all'host." @@ -4171,9 +4181,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Impossibile ottenere l'elenco dei driver della stampante:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Impossibile ottenere gli attributi della stampante:" diff -Nru cups-1.5.2/locale/cups_ja.po cups-1.5.3/locale/cups_ja.po --- cups-1.5.2/locale/cups_ja.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_ja.po 2012-03-07 22:38:28.000000000 +0100 @@ -31,13 +31,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-20 16:43+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2933,6 +2934,10 @@ msgid "Internet Printing Protocol" msgstr "インターネット印刷プロトコル" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3536,6 +3541,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "プリント対象：" @@ -3572,8 +3580,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3870,15 +3877,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3888,12 +3889,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4078,6 +4085,9 @@ msgid "Unable to change server settings:" msgstr "サーバーの設定を変更できません:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "ホストに接続できません" @@ -4199,9 +4209,6 @@ msgid "Unable to get list of printer drivers:" msgstr "プリンタードライバーのリストを取得できません:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "プリンター属性を取得できません:" diff -Nru cups-1.5.2/locale/cups_ko.po cups-1.5.3/locale/cups_ko.po --- cups-1.5.2/locale/cups_ko.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_ko.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "인터넷 프린트 프로토콜" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "다음이 프린트됨: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3839,15 +3846,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3857,12 +3858,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4043,6 +4050,9 @@ msgid "Unable to change server settings:" msgstr "서버 설정값을 변경할 수 없음:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "호스트에 연결할 수 없음." @@ -4164,9 +4174,6 @@ msgid "Unable to get list of printer drivers:" msgstr "프린터 드라이버 목록을 얻을 수 없음:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "프린터 속성을 얻을 수 없음:" diff -Nru cups-1.5.2/locale/cups_nl.po cups-1.5.3/locale/cups_nl.po --- cups-1.5.2/locale/cups_nl.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_nl.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2905,6 +2906,10 @@ msgid "Internet Printing Protocol" msgstr "Internet Printing Protocol" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3508,6 +3513,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Afgedrukt voor: " @@ -3544,8 +3552,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3842,15 +3849,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3860,12 +3861,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4048,6 +4055,9 @@ msgid "Unable to change server settings:" msgstr "Niet mogelijk om serverinstellingen te wijzigen:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Niet mogelijk om verbinding met host te maken." @@ -4169,9 +4179,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Niet mogelijk om lijst van printerstuurprogramma&aops;s weer te geven:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Niet mogelijk om printerattributen weer te geven:" diff -Nru cups-1.5.2/locale/cups_no.po cups-1.5.3/locale/cups_no.po --- cups-1.5.2/locale/cups_no.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_no.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Internett-utskriftsprotokoll" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Skrevet ut for: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3840,15 +3847,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3858,12 +3859,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4044,6 +4051,9 @@ msgid "Unable to change server settings:" msgstr "Kan ikke endre tjenerinnstillinger:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Kan ikke koble til vert" @@ -4165,9 +4175,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Kan ikke hente liste over skriverdrivere:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Kan ikke hente skriverattributter:" diff -Nru cups-1.5.2/locale/cups_pl.po cups-1.5.3/locale/cups_pl.po --- cups-1.5.2/locale/cups_pl.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_pl.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Internetowy protokół druku" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Druk dla: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3840,15 +3847,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3858,12 +3859,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4047,6 +4054,9 @@ msgid "Unable to change server settings:" msgstr "Nie można zmienić ustawień serwera:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Nie można połączyć się z hostem." @@ -4168,9 +4178,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Nie można uzyskać listy sterowników drukarek:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Nie można uzyskać cech drukarki:" diff -Nru cups-1.5.2/locale/cups.pot cups-1.5.3/locale/cups.pot --- cups-1.5.2/locale/cups.pot 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups.pot 2012-03-07 22:38:28.000000000 +0100 @@ -3,7 +3,7 @@ # # Message catalog template for CUPS. # -# Copyright 2007-2010 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 2005-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -30,7 +30,7 @@ msgstr "" "Project-Id-Version: CUPS 1.5\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -197,11 +197,11 @@ " DETAILED CONFORMANCE TEST RESULTS" msgstr "" -#: systemv/cupstestppd.c:3780 +#: systemv/cupstestppd.c:3781 msgid " Ignore specific warnings." msgstr "" -#: systemv/cupstestppd.c:3784 +#: systemv/cupstestppd.c:3785 msgid " Issue warnings instead of errors." msgstr "" @@ -408,11 +408,11 @@ msgid " cupstestdsc [options] -" msgstr "" -#: systemv/cupstestppd.c:3775 +#: systemv/cupstestppd.c:3776 msgid " program | cupstestppd [options] -" msgstr "" -#: systemv/cupstestppd.c:3707 +#: systemv/cupstestppd.c:3708 #, c-format msgid "" " %s \"%s %s\" conflicts with \"%s %s\"\n" @@ -424,7 +424,7 @@ msgid " %s %s %s does not exist." msgstr "" -#: systemv/cupstestppd.c:3864 +#: systemv/cupstestppd.c:3865 #, c-format msgid " %s %s file \"%s\" has the wrong capitalization." msgstr "" @@ -436,13 +436,13 @@ " REF: Page 122, section 5.17" msgstr "" -#: systemv/cupstestppd.c:3467 systemv/cupstestppd.c:3516 -#: systemv/cupstestppd.c:3555 +#: systemv/cupstestppd.c:3468 systemv/cupstestppd.c:3517 +#: systemv/cupstestppd.c:3556 #, c-format msgid " %s Bad UTF-8 \"%s\" translation string for option %s, choice %s." msgstr "" -#: systemv/cupstestppd.c:3421 +#: systemv/cupstestppd.c:3422 #, c-format msgid " %s Bad UTF-8 \"%s\" translation string for option %s." msgstr "" @@ -472,7 +472,7 @@ msgid " %s Bad cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:3371 +#: systemv/cupstestppd.c:3372 #, c-format msgid " %s Bad language \"%s\"." msgstr "" @@ -509,12 +509,12 @@ msgid " %s Empty cupsUIConstraints %s" msgstr "" -#: systemv/cupstestppd.c:3499 systemv/cupstestppd.c:3539 +#: systemv/cupstestppd.c:3500 systemv/cupstestppd.c:3540 #, c-format msgid " %s Missing \"%s\" translation string for option %s, choice %s." msgstr "" -#: systemv/cupstestppd.c:3407 +#: systemv/cupstestppd.c:3408 #, c-format msgid " %s Missing \"%s\" translation string for option %s." msgstr "" @@ -567,7 +567,7 @@ msgid " %s Missing option %s in cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:3593 +#: systemv/cupstestppd.c:3594 #, c-format msgid " %s No base translation \"%s\" is included in file." msgstr "" @@ -589,12 +589,12 @@ msgid " %s Size \"%s\" has unexpected dimensions (%gx%g)." msgstr "" -#: systemv/cupstestppd.c:3312 +#: systemv/cupstestppd.c:3313 #, c-format msgid " %s Size \"%s\" should be \"%s\"." msgstr "" -#: systemv/cupstestppd.c:3273 +#: systemv/cupstestppd.c:3274 #, c-format msgid " %s Size \"%s\" should be the Adobe standard name \"%s\"." msgstr "" @@ -721,7 +721,7 @@ msgid " **FAIL** Bad LanguageVersion %s - must be English." msgstr "" -#: systemv/cupstestppd.c:3734 systemv/cupstestppd.c:3756 +#: systemv/cupstestppd.c:3735 systemv/cupstestppd.c:3757 #, c-format msgid " **FAIL** Default option code cannot be interpreted: %s" msgstr "" @@ -1067,7 +1067,7 @@ msgid " -I include-dir Add include directory to search path." msgstr "" -#: systemv/cupstestppd.c:3779 +#: systemv/cupstestppd.c:3780 msgid " -I {filename,filters,none,profiles}" msgstr "" @@ -1083,7 +1083,7 @@ msgid " -P filename.ppd Set PPD file." msgstr "" -#: systemv/cupstestppd.c:3781 +#: systemv/cupstestppd.c:3782 msgid " -R root-directory Set alternate root." msgstr "" @@ -1111,7 +1111,7 @@ msgid " -V version Set default IPP version." msgstr "" -#: systemv/cupstestppd.c:3782 +#: systemv/cupstestppd.c:3783 msgid " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" msgstr "" @@ -1247,11 +1247,11 @@ msgid " -q Be quiet - no output except errors." msgstr "" -#: systemv/cupstestppd.c:3786 +#: systemv/cupstestppd.c:3787 msgid " -q Run silently." msgstr "" -#: systemv/cupstestppd.c:3787 +#: systemv/cupstestppd.c:3788 msgid " -r Use 'relaxed' open mode." msgstr "" @@ -1275,7 +1275,7 @@ msgid " -u Remove the PPD file when finished." msgstr "" -#: systemv/cupstestppd.c:3788 +#: systemv/cupstestppd.c:3789 msgid " -v Be slightly verbose." msgstr "" @@ -1291,7 +1291,7 @@ msgid " -v Show all attributes sent and received." msgstr "" -#: systemv/cupstestppd.c:3789 +#: systemv/cupstestppd.c:3790 msgid " -vv Be very verbose." msgstr "" @@ -1346,13 +1346,13 @@ #: systemv/cupstestppd.c:2989 systemv/cupstestppd.c:3017 #: systemv/cupstestppd.c:3082 systemv/cupstestppd.c:3097 #: systemv/cupstestppd.c:3135 systemv/cupstestppd.c:3155 -#: systemv/cupstestppd.c:3169 systemv/cupstestppd.c:3367 -#: systemv/cupstestppd.c:3403 systemv/cupstestppd.c:3417 -#: systemv/cupstestppd.c:3463 systemv/cupstestppd.c:3495 -#: systemv/cupstestppd.c:3512 systemv/cupstestppd.c:3535 -#: systemv/cupstestppd.c:3551 systemv/cupstestppd.c:3589 -#: systemv/cupstestppd.c:3730 systemv/cupstestppd.c:3752 -#: systemv/cupstestppd.c:3860 +#: systemv/cupstestppd.c:3169 systemv/cupstestppd.c:3368 +#: systemv/cupstestppd.c:3404 systemv/cupstestppd.c:3418 +#: systemv/cupstestppd.c:3464 systemv/cupstestppd.c:3496 +#: systemv/cupstestppd.c:3513 systemv/cupstestppd.c:3536 +#: systemv/cupstestppd.c:3552 systemv/cupstestppd.c:3590 +#: systemv/cupstestppd.c:3731 systemv/cupstestppd.c:3753 +#: systemv/cupstestppd.c:3861 msgid " FAIL" msgstr "" @@ -1395,7 +1395,7 @@ msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:11213 +#: scheduler/ipp.c:11234 #, c-format msgid "%s cannot be changed." msgstr "" @@ -2727,7 +2727,7 @@ msgid "Accept Jobs" msgstr "" -#: cups/http-support.c:1254 +#: cups/http-support.c:1257 msgid "Accepted" msgstr "" @@ -2842,20 +2842,20 @@ msgid "Bad OrderDependency" msgstr "" -#: cups/ppd-cache.c:144 cups/ppd-cache.c:189 cups/ppd-cache.c:227 -#: cups/ppd-cache.c:233 cups/ppd-cache.c:249 cups/ppd-cache.c:265 -#: cups/ppd-cache.c:274 cups/ppd-cache.c:282 cups/ppd-cache.c:299 -#: cups/ppd-cache.c:307 cups/ppd-cache.c:322 cups/ppd-cache.c:330 -#: cups/ppd-cache.c:348 cups/ppd-cache.c:360 cups/ppd-cache.c:375 -#: cups/ppd-cache.c:387 cups/ppd-cache.c:409 cups/ppd-cache.c:417 -#: cups/ppd-cache.c:435 cups/ppd-cache.c:443 cups/ppd-cache.c:458 -#: cups/ppd-cache.c:466 cups/ppd-cache.c:484 cups/ppd-cache.c:492 -#: cups/ppd-cache.c:519 cups/ppd-cache.c:546 cups/ppd-cache.c:554 -#: cups/ppd-cache.c:562 +#: cups/ppd-cache.c:148 cups/ppd-cache.c:193 cups/ppd-cache.c:231 +#: cups/ppd-cache.c:237 cups/ppd-cache.c:253 cups/ppd-cache.c:269 +#: cups/ppd-cache.c:278 cups/ppd-cache.c:286 cups/ppd-cache.c:303 +#: cups/ppd-cache.c:311 cups/ppd-cache.c:326 cups/ppd-cache.c:334 +#: cups/ppd-cache.c:352 cups/ppd-cache.c:364 cups/ppd-cache.c:379 +#: cups/ppd-cache.c:391 cups/ppd-cache.c:413 cups/ppd-cache.c:421 +#: cups/ppd-cache.c:439 cups/ppd-cache.c:447 cups/ppd-cache.c:462 +#: cups/ppd-cache.c:470 cups/ppd-cache.c:488 cups/ppd-cache.c:496 +#: cups/ppd-cache.c:523 cups/ppd-cache.c:567 cups/ppd-cache.c:575 +#: cups/ppd-cache.c:583 msgid "Bad PPD cache file." msgstr "" -#: cups/http-support.c:1269 +#: cups/http-support.c:1272 msgid "Bad Request" msgstr "" @@ -2896,7 +2896,7 @@ msgid "Bad custom parameter" msgstr "" -#: cups/http-support.c:1421 scheduler/ipp.c:2549 +#: cups/http-support.c:1424 scheduler/ipp.c:2549 #, c-format msgid "Bad device-uri \"%s\"." msgstr "" @@ -2906,18 +2906,18 @@ msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:9424 scheduler/ipp.c:9440 scheduler/ipp.c:10631 -#: scheduler/ipp.c:12137 +#: scheduler/ipp.c:9423 scheduler/ipp.c:9439 scheduler/ipp.c:10652 +#: scheduler/ipp.c:12158 #, c-format msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:10647 +#: scheduler/ipp.c:10668 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "" -#: cups/util.c:927 +#: cups/util.c:928 msgid "Bad filename buffer" msgstr "" @@ -2931,7 +2931,7 @@ msgid "Bad font description line: %s" msgstr "" -#: scheduler/ipp.c:11229 +#: scheduler/ipp.c:11250 msgid "Bad job-priority value." msgstr "" @@ -2944,14 +2944,14 @@ msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:11259 +#: scheduler/ipp.c:11280 msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:4061 scheduler/ipp.c:4514 scheduler/ipp.c:7268 -#: scheduler/ipp.c:7415 scheduler/ipp.c:8858 scheduler/ipp.c:9127 -#: scheduler/ipp.c:9975 scheduler/ipp.c:10200 scheduler/ipp.c:10527 -#: scheduler/ipp.c:11121 +#: scheduler/ipp.c:4061 scheduler/ipp.c:4513 scheduler/ipp.c:7267 +#: scheduler/ipp.c:7414 scheduler/ipp.c:8857 scheduler/ipp.c:9126 +#: scheduler/ipp.c:9974 scheduler/ipp.c:10199 scheduler/ipp.c:10548 +#: scheduler/ipp.c:11142 #, c-format msgid "Bad job-uri \"%s\"." msgstr "" @@ -2961,12 +2961,12 @@ msgid "Bad lpi value %f." msgstr "" -#: scheduler/ipp.c:2194 scheduler/ipp.c:6810 +#: scheduler/ipp.c:2194 scheduler/ipp.c:6809 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:2158 scheduler/ipp.c:6774 +#: scheduler/ipp.c:2158 scheduler/ipp.c:6773 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "" @@ -3067,7 +3067,7 @@ msgid "Cancel RSS Subscription" msgstr "" -#: backend/ipp.c:1805 +#: backend/ipp.c:1899 msgid "Canceling print job." msgstr "" @@ -3084,7 +3084,7 @@ msgid "Change Settings" msgstr "" -#: scheduler/ipp.c:2206 scheduler/ipp.c:6822 +#: scheduler/ipp.c:2206 scheduler/ipp.c:6821 #, c-format msgid "Character set \"%s\" not supported." msgstr "" @@ -3097,7 +3097,7 @@ msgid "Clean Print Heads" msgstr "" -#: scheduler/ipp.c:4966 +#: scheduler/ipp.c:4965 msgid "Close-Job doesn't support the job-uri attribute." msgstr "" @@ -3120,15 +3120,15 @@ msgid "Community name uses indefinite length" msgstr "" -#: backend/ipp.c:765 backend/lpd.c:868 backend/socket.c:395 +#: backend/ipp.c:775 backend/lpd.c:862 backend/socket.c:395 msgid "Connected to printer." msgstr "" -#: backend/ipp.c:672 backend/lpd.c:708 backend/socket.c:314 +#: backend/ipp.c:682 backend/lpd.c:685 backend/socket.c:314 msgid "Connecting to printer." msgstr "" -#: cups/http-support.c:1242 +#: cups/http-support.c:1245 msgid "Continue" msgstr "" @@ -3136,15 +3136,15 @@ msgid "Continuous" msgstr "" -#: backend/lpd.c:1019 backend/lpd.c:1161 +#: backend/lpd.c:1008 backend/lpd.c:1140 msgid "Control file sent successfully." msgstr "" -#: backend/ipp.c:1189 backend/lpd.c:462 +#: backend/ipp.c:1219 backend/lpd.c:460 msgid "Copying print data." msgstr "" -#: cups/http-support.c:1251 +#: cups/http-support.c:1254 msgid "Created" msgstr "" @@ -3180,7 +3180,7 @@ msgid "Darkness" msgstr "" -#: backend/lpd.c:1109 +#: backend/lpd.c:1093 msgid "Data file sent successfully." msgstr "" @@ -3249,7 +3249,7 @@ msgid "Disabled" msgstr "" -#: scheduler/ipp.c:7317 +#: scheduler/ipp.c:7316 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "" @@ -3586,7 +3586,7 @@ msgid "Executive" msgstr "" -#: cups/http-support.c:1297 +#: cups/http-support.c:1300 msgid "Expectation Failed" msgstr "" @@ -3665,7 +3665,7 @@ msgid "Folio" msgstr "" -#: cups/http-support.c:1276 +#: cups/http-support.c:1279 msgid "Forbidden" msgstr "" @@ -3690,10 +3690,10 @@ msgid "Glossy Paper" msgstr "" -#: scheduler/ipp.c:4039 scheduler/ipp.c:4440 scheduler/ipp.c:4978 -#: scheduler/ipp.c:7246 scheduler/ipp.c:7393 scheduler/ipp.c:8835 -#: scheduler/ipp.c:9953 scheduler/ipp.c:10178 scheduler/ipp.c:10505 -#: scheduler/ipp.c:11099 +#: scheduler/ipp.c:4039 scheduler/ipp.c:4439 scheduler/ipp.c:4977 +#: scheduler/ipp.c:7245 scheduler/ipp.c:7392 scheduler/ipp.c:8834 +#: scheduler/ipp.c:9952 scheduler/ipp.c:10177 scheduler/ipp.c:10526 +#: scheduler/ipp.c:11120 msgid "Got a printer-uri attribute but no job-id." msgstr "" @@ -3821,7 +3821,7 @@ msgid "Intellitech" msgstr "" -#: cups/http-support.c:1303 +#: cups/http-support.c:1306 msgid "Internal Server Error" msgstr "" @@ -3845,10 +3845,15 @@ msgid "Internet Postage 3-Part - 2 1/4 x 7\"" msgstr "" -#: backend/ipp.c:294 +#: backend/ipp.c:301 msgid "Internet Printing Protocol" msgstr "" +#: filter/commandtops.c:125 +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + #: cups/ppd.c:1377 msgid "JCL" msgstr "" @@ -3909,42 +3914,42 @@ msgid "JIS B9" msgstr "" -#: scheduler/ipp.c:10250 +#: scheduler/ipp.c:10249 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "" -#: scheduler/ipp.c:4079 scheduler/ipp.c:4310 scheduler/ipp.c:4365 -#: scheduler/ipp.c:4542 scheduler/ipp.c:4988 scheduler/ipp.c:6908 -#: scheduler/ipp.c:7286 scheduler/ipp.c:7433 scheduler/ipp.c:7733 -#: scheduler/ipp.c:8682 scheduler/ipp.c:8704 scheduler/ipp.c:8876 -#: scheduler/ipp.c:9101 scheduler/ipp.c:9144 scheduler/ipp.c:9993 -#: scheduler/ipp.c:10218 scheduler/ipp.c:10545 scheduler/ipp.c:11139 +#: scheduler/ipp.c:4079 scheduler/ipp.c:4309 scheduler/ipp.c:4364 +#: scheduler/ipp.c:4541 scheduler/ipp.c:4987 scheduler/ipp.c:6907 +#: scheduler/ipp.c:7285 scheduler/ipp.c:7432 scheduler/ipp.c:7732 +#: scheduler/ipp.c:8681 scheduler/ipp.c:8703 scheduler/ipp.c:8875 +#: scheduler/ipp.c:9100 scheduler/ipp.c:9143 scheduler/ipp.c:9992 +#: scheduler/ipp.c:10217 scheduler/ipp.c:10566 scheduler/ipp.c:11160 #, c-format msgid "Job #%d does not exist." msgstr "" -#: scheduler/ipp.c:4574 +#: scheduler/ipp.c:4573 #, c-format msgid "Job #%d is already aborted - can't cancel." msgstr "" -#: scheduler/ipp.c:4568 +#: scheduler/ipp.c:4567 #, c-format msgid "Job #%d is already canceled - can't cancel." msgstr "" -#: scheduler/ipp.c:4580 +#: scheduler/ipp.c:4579 #, c-format msgid "Job #%d is already completed - can't cancel." msgstr "" -#: scheduler/ipp.c:8902 scheduler/ipp.c:9186 scheduler/ipp.c:11154 +#: scheduler/ipp.c:8901 scheduler/ipp.c:9185 scheduler/ipp.c:11175 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:10232 +#: scheduler/ipp.c:10231 #, c-format msgid "Job #%d is not complete." msgstr "" @@ -3954,7 +3959,7 @@ msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:10007 +#: scheduler/ipp.c:10006 #, c-format msgid "Job #%d is not held." msgstr "" @@ -3983,7 +3988,7 @@ msgid "Job UUID: " msgstr "" -#: scheduler/ipp.c:11237 +#: scheduler/ipp.c:11258 msgid "Job is completed and cannot be changed." msgstr "" @@ -3991,11 +3996,11 @@ msgid "Job operation failed:" msgstr "" -#: scheduler/ipp.c:11273 scheduler/ipp.c:11292 scheduler/ipp.c:11303 +#: scheduler/ipp.c:11294 scheduler/ipp.c:11313 scheduler/ipp.c:11324 msgid "Job state cannot be changed." msgstr "" -#: scheduler/ipp.c:10098 +#: scheduler/ipp.c:10097 msgid "Job subscriptions cannot be renewed." msgstr "" @@ -4003,7 +4008,7 @@ msgid "Jobs" msgstr "" -#: backend/lpd.c:185 +#: backend/lpd.c:183 msgid "LPD/LPR Host or Printer" msgstr "" @@ -4015,7 +4020,7 @@ msgid "Label Top" msgstr "" -#: scheduler/ipp.c:2215 scheduler/ipp.c:6831 +#: scheduler/ipp.c:2215 scheduler/ipp.c:6830 #, c-format msgid "Language \"%s\" not supported." msgstr "" @@ -4064,7 +4069,7 @@ msgid "Long-Edge (Portrait)" msgstr "" -#: cups/http-support.c:1518 +#: cups/http-support.c:1521 msgid "Looking for printer." msgstr "" @@ -4124,7 +4129,7 @@ msgid "Missing asterisk in column 1" msgstr "" -#: scheduler/ipp.c:7309 +#: scheduler/ipp.c:7308 msgid "Missing document-number attribute." msgstr "" @@ -4139,7 +4144,7 @@ msgid "Missing form variable" msgstr "" -#: scheduler/ipp.c:10599 +#: scheduler/ipp.c:10620 msgid "Missing last-document attribute in request." msgstr "" @@ -4151,7 +4156,7 @@ msgid "Missing media-size in media-col." msgstr "" -#: scheduler/ipp.c:7863 +#: scheduler/ipp.c:7862 msgid "Missing notify-subscription-ids attribute." msgstr "" @@ -4159,7 +4164,7 @@ msgid "Missing option keyword" msgstr "" -#: scheduler/ipp.c:4221 scheduler/ipp.c:4246 +#: scheduler/ipp.c:4220 scheduler/ipp.c:4245 msgid "Missing requesting-user-name attribute." msgstr "" @@ -4214,7 +4219,7 @@ msgid "Move Job" msgstr "" -#: cups/http-support.c:1260 +#: cups/http-support.c:1263 msgid "Moved Permanently" msgstr "" @@ -4246,11 +4251,11 @@ msgid "No" msgstr "" -#: cups/http-support.c:1257 +#: cups/http-support.c:1260 msgid "No Content" msgstr "" -#: cups/util.c:1286 +#: cups/util.c:1297 msgid "No PPD name" msgstr "" @@ -4266,7 +4271,7 @@ msgid "No active connection" msgstr "" -#: scheduler/ipp.c:4491 +#: scheduler/ipp.c:4490 #, c-format msgid "No active jobs on %s." msgstr "" @@ -4275,7 +4280,7 @@ msgid "No attributes in request." msgstr "" -#: scheduler/ipp.c:4122 +#: scheduler/ipp.c:4121 msgid "No authentication information provided." msgstr "" @@ -4283,11 +4288,11 @@ msgid "No community name" msgstr "" -#: scheduler/ipp.c:7109 +#: scheduler/ipp.c:7108 msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:8439 +#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:8438 msgid "No destinations added." msgstr "" @@ -4303,7 +4308,7 @@ msgid "No error-status" msgstr "" -#: scheduler/ipp.c:9390 scheduler/ipp.c:10613 +#: scheduler/ipp.c:9389 scheduler/ipp.c:10634 msgid "No file in print request." msgstr "" @@ -4311,7 +4316,7 @@ msgid "No fonts in charset file." msgstr "" -#: cups/util.c:921 +#: cups/util.c:922 msgid "No modification time" msgstr "" @@ -4325,19 +4330,19 @@ msgid "No pages were found." msgstr "" -#: cups/util.c:915 +#: cups/util.c:916 msgid "No printer name" msgstr "" -#: cups/util.c:1789 +#: cups/util.c:1800 msgid "No printer-uri found" msgstr "" -#: cups/util.c:1774 +#: cups/util.c:1785 msgid "No printer-uri found for class" msgstr "" -#: scheduler/ipp.c:7512 +#: scheduler/ipp.c:7511 msgid "No printer-uri in request." msgstr "" @@ -4345,11 +4350,11 @@ msgid "No request-id" msgstr "" -#: scheduler/ipp.c:6716 +#: scheduler/ipp.c:6715 msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:8775 +#: scheduler/ipp.c:8774 msgid "No subscriptions found." msgstr "" @@ -4373,11 +4378,11 @@ msgid "Normal" msgstr "" -#: cups/http-support.c:1279 +#: cups/http-support.c:1282 msgid "Not Found" msgstr "" -#: cups/http-support.c:1291 +#: cups/http-support.c:1294 msgid "Not Implemented" msgstr "" @@ -4385,15 +4390,15 @@ msgid "Not Installed" msgstr "" -#: cups/http-support.c:1266 +#: cups/http-support.c:1269 msgid "Not Modified" msgstr "" -#: cups/http-support.c:1294 +#: cups/http-support.c:1297 msgid "Not Supported" msgstr "" -#: scheduler/ipp.c:1598 scheduler/ipp.c:11835 +#: scheduler/ipp.c:1598 scheduler/ipp.c:11856 msgid "Not allowed to print." msgstr "" @@ -4405,7 +4410,7 @@ msgid "Note: this program only validates the DSC comments, not the PostScript itself." msgstr "" -#: cups/http-support.c:1248 cups/ppd.c:336 +#: cups/http-support.c:1251 cups/ppd.c:336 msgid "OK" msgstr "" @@ -4449,7 +4454,7 @@ #: scheduler/cupsfilter.c:1437 scheduler/cupsfilter.c:1464 #: scheduler/main.c:2058 systemv/cupsaddsmb.c:284 systemv/cupsctl.c:209 -#: systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3777 test/ipptool.c:4382 +#: systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3778 test/ipptool.c:4382 #: ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 #: ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254 msgid "Options:" @@ -4459,11 +4464,11 @@ msgid "Options: " msgstr "" -#: cups/ppd-cache.c:152 +#: cups/ppd-cache.c:156 msgid "Out of date PPD cache file." msgstr "" -#: cups/ppd-cache.c:1313 +#: cups/ppd-cache.c:1366 msgid "Out of memory." msgstr "" @@ -4539,7 +4544,7 @@ msgid "ParamCustominTearInterval" msgstr "" -#: cups/auth.c:196 cups/auth.c:365 +#: cups/auth.c:199 cups/auth.c:367 #, c-format msgid "Password for %s on %s? " msgstr "" @@ -4637,12 +4642,12 @@ msgid "Print and Tear" msgstr "" -#: backend/ipp.c:1466 +#: backend/ipp.c:1519 #, c-format msgid "Print file accepted - job ID %d." msgstr "" -#: backend/ipp.c:1457 +#: backend/ipp.c:1509 msgid "Print file accepted - job ID unknown." msgstr "" @@ -4650,10 +4655,14 @@ msgid "Print file sent." msgstr "" -#: backend/ipp.c:1421 +#: backend/ipp.c:1470 msgid "Print file was not accepted." msgstr "" +#: backend/ipp.c:1871 +msgid "Print job too large." +msgstr "" + #: filter/bannertops.c:648 msgid "Printed For: " msgstr "" @@ -4702,12 +4711,11 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#: backend/lpd.c:617 backend/lpd.c:1005 backend/lpd.c:1092 backend/lpd.c:1147 -#, c-format -msgid "Printer did not respond after %d seconds." +#: backend/lpd.c:611 backend/lpd.c:997 backend/lpd.c:1079 backend/lpd.c:1129 +msgid "Printer did not respond." msgstr "" -#: backend/ipp.c:870 backend/ipp.c:877 +#: backend/ipp.c:881 backend/ipp.c:888 #, c-format msgid "Printer does not support IPP/%d.%d, trying IPP/%s." msgstr "" @@ -4768,7 +4776,7 @@ msgid "Quarto" msgstr "" -#: scheduler/ipp.c:1593 scheduler/ipp.c:11830 +#: scheduler/ipp.c:1593 scheduler/ipp.c:11851 msgid "Quota limit reached." msgstr "" @@ -4781,7 +4789,7 @@ msgid "Rank Owner Pri Job Files Total Size" msgstr "" -#: backend/ipp.c:1784 backend/socket.c:475 driver/rastertoescpx.c:1923 +#: backend/ipp.c:1878 backend/socket.c:475 driver/rastertoescpx.c:1923 #: driver/rastertopclx.c:1948 filter/rastertoepson.c:1152 #: filter/rastertohp.c:881 filter/rastertolabel.c:1307 msgid "Ready to print." @@ -4791,12 +4799,12 @@ msgid "Reject Jobs" msgstr "" -#: backend/lpd.c:1015 backend/lpd.c:1157 +#: backend/lpd.c:1004 backend/lpd.c:1136 #, c-format msgid "Remote host did not accept control file (%d)." msgstr "" -#: backend/lpd.c:1105 +#: backend/lpd.c:1089 #, c-format msgid "Remote host did not accept data file (%d)." msgstr "" @@ -4805,7 +4813,7 @@ msgid "Reprint After Error" msgstr "" -#: cups/http-support.c:1282 +#: cups/http-support.c:1285 msgid "Request Entity Too Large" msgstr "" @@ -4842,15 +4850,15 @@ msgid "SEQUENCE uses indefinite length" msgstr "" -#: cups/http-support.c:1306 +#: cups/http-support.c:1309 msgid "SSL/TLS Negotiation Error" msgstr "" -#: cups/http-support.c:1263 +#: cups/http-support.c:1266 msgid "See Other" msgstr "" -#: backend/usb-darwin.c:543 +#: backend/usb-darwin.c:543 backend/usb-libusb.c:273 msgid "Sending data to printer." msgstr "" @@ -4876,7 +4884,7 @@ msgid "Server Stopped" msgstr "" -#: cups/http-support.c:1300 +#: cups/http-support.c:1303 msgid "Service Unavailable" msgstr "" @@ -4917,7 +4925,7 @@ msgid "Special Paper" msgstr "" -#: backend/lpd.c:1056 +#: backend/lpd.c:1045 #, c-format msgid "Spooling job, %.0f%% complete." msgstr "" @@ -4950,8 +4958,8 @@ msgid "Stylus Photo Series" msgstr "" -#: scheduler/ipp.c:4637 scheduler/ipp.c:7879 scheduler/ipp.c:8588 -#: scheduler/ipp.c:10086 +#: scheduler/ipp.c:4636 scheduler/ipp.c:7878 scheduler/ipp.c:8587 +#: scheduler/ipp.c:10085 #, c-format msgid "Subscription #%d does not exist." msgstr "" @@ -4968,7 +4976,7 @@ msgid "Super B/A3" msgstr "" -#: cups/http-support.c:1245 +#: cups/http-support.c:1248 msgid "Switching Protocols" msgstr "" @@ -4996,18 +5004,18 @@ msgid "Tear-Off Adjust Position" msgstr "" -#: scheduler/ipp.c:7583 scheduler/ipp.c:7661 scheduler/ipp.c:7677 -#: scheduler/ipp.c:7695 +#: scheduler/ipp.c:7582 scheduler/ipp.c:7660 scheduler/ipp.c:7676 +#: scheduler/ipp.c:7694 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "" -#: scheduler/ipp.c:8110 +#: scheduler/ipp.c:8109 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "" -#: scheduler/ipp.c:8097 +#: scheduler/ipp.c:8096 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "" @@ -5042,7 +5050,7 @@ msgid "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "" -#: scheduler/ipp.c:2225 scheduler/ipp.c:6841 +#: scheduler/ipp.c:2225 scheduler/ipp.c:6840 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" @@ -5091,29 +5099,21 @@ msgid "The print file could not be opened." msgstr "" -#: backend/ipp.c:887 +#: backend/ipp.c:898 msgid "The printer URI is incorrect or no longer exists." msgstr "" -#: cups/localize.c:335 -msgid "The printer is almost out of ink." -msgstr "" - -#: backend/ipp.c:738 backend/ipp.c:852 backend/ipp.c:953 backend/ipp.c:1248 -#: backend/ipp.c:1399 backend/lpd.c:842 backend/socket.c:374 +#: backend/ipp.c:748 backend/ipp.c:863 backend/ipp.c:969 backend/ipp.c:1298 +#: backend/ipp.c:1446 backend/lpd.c:819 backend/socket.c:374 msgid "The printer is busy." msgstr "" -#: cups/localize.c:313 -msgid "The printer is low on toner." -msgstr "" - #: cups/localize.c:311 msgid "The printer is not connected." msgstr "" -#: backend/ipp.c:716 backend/ipp.c:749 backend/ipp.c:848 backend/lpd.c:821 -#: backend/lpd.c:862 backend/socket.c:353 backend/socket.c:386 +#: backend/ipp.c:726 backend/ipp.c:759 backend/ipp.c:859 backend/lpd.c:798 +#: backend/lpd.c:839 backend/socket.c:353 backend/socket.c:386 msgid "The printer is not responding." msgstr "" @@ -5121,15 +5121,23 @@ msgid "The printer is out of ink." msgstr "" -#: cups/localize.c:315 -msgid "The printer is out of toner." +#: cups/localize.c:335 +msgid "The printer is running low on ink." msgstr "" -#: backend/ipp.c:731 backend/lpd.c:835 backend/socket.c:367 +#: cups/localize.c:313 +msgid "The printer is running low on toner." +msgstr "" + +#: backend/ipp.c:741 backend/lpd.c:812 backend/socket.c:367 msgid "The printer is unreachable at this time." msgstr "" -#: backend/ipp.c:725 backend/lpd.c:829 backend/socket.c:361 +#: cups/localize.c:315 +msgid "The printer may be out of toner." +msgstr "" + +#: backend/ipp.c:735 backend/lpd.c:806 backend/socket.c:361 msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -5137,14 +5145,14 @@ msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." msgstr "" -#: scheduler/ipp.c:904 scheduler/ipp.c:1216 scheduler/ipp.c:4286 -#: scheduler/ipp.c:4457 scheduler/ipp.c:6372 scheduler/ipp.c:6675 -#: scheduler/ipp.c:6989 scheduler/ipp.c:7549 scheduler/ipp.c:8315 -#: scheduler/ipp.c:8371 scheduler/ipp.c:8694 scheduler/ipp.c:8960 -#: scheduler/ipp.c:9049 scheduler/ipp.c:9082 scheduler/ipp.c:9405 -#: scheduler/ipp.c:9798 scheduler/ipp.c:9879 scheduler/ipp.c:11008 -#: scheduler/ipp.c:11463 scheduler/ipp.c:11793 scheduler/ipp.c:11875 -#: scheduler/ipp.c:12167 +#: scheduler/ipp.c:904 scheduler/ipp.c:1216 scheduler/ipp.c:4285 +#: scheduler/ipp.c:4456 scheduler/ipp.c:6371 scheduler/ipp.c:6674 +#: scheduler/ipp.c:6988 scheduler/ipp.c:7548 scheduler/ipp.c:8314 +#: scheduler/ipp.c:8370 scheduler/ipp.c:8693 scheduler/ipp.c:8959 +#: scheduler/ipp.c:9048 scheduler/ipp.c:9081 scheduler/ipp.c:9404 +#: scheduler/ipp.c:9797 scheduler/ipp.c:9878 scheduler/ipp.c:11029 +#: scheduler/ipp.c:11484 scheduler/ipp.c:11814 scheduler/ipp.c:11896 +#: scheduler/ipp.c:12188 msgid "The printer or class does not exist." msgstr "" @@ -5177,7 +5185,7 @@ msgid "The printer-uri \"%s\" contains invalid characters." msgstr "" -#: scheduler/ipp.c:4263 +#: scheduler/ipp.c:4262 msgid "The printer-uri attribute is required." msgstr "" @@ -5197,12 +5205,12 @@ msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." msgstr "" -#: scheduler/ipp.c:7644 +#: scheduler/ipp.c:7643 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "" -#: scheduler/ipp.c:6919 +#: scheduler/ipp.c:6918 msgid "There are too many subscriptions." msgstr "" @@ -5211,7 +5219,7 @@ msgstr "" #: backend/usb-darwin.c:379 backend/usb-darwin.c:438 backend/usb-darwin.c:505 -#: backend/usb-darwin.c:526 +#: backend/usb-darwin.c:526 backend/usb-libusb.c:235 backend/usb-libusb.c:256 msgid "There was an unrecoverable USB error." msgstr "" @@ -5261,7 +5269,7 @@ msgid "Tray 4" msgstr "" -#: cups/http-support.c:1285 +#: cups/http-support.c:1288 msgid "URI Too Long" msgstr "" @@ -5314,7 +5322,7 @@ msgid "Unable to add class:" msgstr "" -#: backend/ipp.c:1542 +#: backend/ipp.c:1616 msgid "Unable to add document to print job." msgstr "" @@ -5343,7 +5351,7 @@ msgid "Unable to cancel RSS subscription:" msgstr "" -#: backend/ipp.c:1826 +#: backend/ipp.c:1920 msgid "Unable to cancel print job." msgstr "" @@ -5359,11 +5367,15 @@ msgid "Unable to change server settings:" msgstr "" +#: filter/commandtops.c:421 +msgid "Unable to configure printer options." +msgstr "" + #: cups/adminutil.c:911 cups/request.c:1022 msgid "Unable to connect to host." msgstr "" -#: backend/ipp.c:694 backend/ipp.c:1093 backend/lpd.c:801 +#: backend/ipp.c:704 backend/ipp.c:1119 backend/lpd.c:778 #: backend/parallel.c:219 backend/serial.c:241 backend/socket.c:333 #: backend/usb-unix.c:117 msgid "Unable to contact printer, queuing on next printer in class." @@ -5412,7 +5424,7 @@ msgid "Unable to copy print file" msgstr "" -#: backend/ipp.c:1915 +#: backend/ipp.c:2012 msgid "Unable to create compressed print file" msgstr "" @@ -5420,7 +5432,7 @@ msgid "Unable to create pipes for filters" msgstr "" -#: cups/util.c:601 cups/util.c:1644 +#: cups/util.c:601 cups/util.c:1655 msgid "Unable to create printer-uri" msgstr "" @@ -5448,35 +5460,35 @@ msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "" -#: cups/http.c:4187 +#: cups/http.c:4192 msgid "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" -#: cups/http.c:4177 +#: cups/http.c:4182 msgid "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" -#: cups/http.c:4172 +#: cups/http.c:4177 msgid "Unable to establish a secure connection to host (expired certificate)." msgstr "" -#: cups/http.c:4182 +#: cups/http.c:4187 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" -#: cups/http.c:4192 +#: cups/http.c:4197 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)." msgstr "" -#: cups/http.c:4167 +#: cups/http.c:4172 msgid "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" -#: cups/http.c:4162 +#: cups/http.c:4167 msgid "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/http.c:3915 cups/http.c:4219 cups/http.c:4252 cups/http.c:4269 +#: cups/http.c:3929 cups/http.c:4224 cups/http.c:4257 cups/http.c:4274 msgid "Unable to establish a secure connection to host." msgstr "" @@ -5484,7 +5496,7 @@ msgid "Unable to find destination for job" msgstr "" -#: cups/http-support.c:1631 +#: cups/http-support.c:1634 msgid "Unable to find printer." msgstr "" @@ -5492,11 +5504,11 @@ msgid "Unable to fork filter" msgstr "" -#: backend/ipp.c:1937 +#: backend/ipp.c:2034 msgid "Unable to generate compressed print file" msgstr "" -#: backend/ipp.c:2723 +#: backend/ipp.c:2938 msgid "Unable to get backend exit status." msgstr "" @@ -5512,10 +5524,6 @@ msgid "Unable to get list of printer drivers:" msgstr "" -#: backend/ipp.c:1633 -msgid "Unable to get print job status." -msgstr "" - #: cgi-bin/admin.c:2959 msgid "Unable to get printer attributes:" msgstr "" @@ -5524,7 +5532,7 @@ msgid "Unable to get printer list:" msgstr "" -#: backend/ipp.c:906 +#: backend/ipp.c:922 msgid "Unable to get printer status." msgstr "" @@ -5542,12 +5550,12 @@ msgid "Unable to install Windows 9x printer driver files (%d)." msgstr "" -#: backend/ipp.c:626 backend/lpd.c:419 backend/socket.c:275 +#: backend/ipp.c:636 backend/lpd.c:417 backend/socket.c:275 #, c-format msgid "Unable to locate printer \"%s\"." msgstr "" -#: backend/dnssd.c:529 backend/ipp.c:311 backend/lpd.c:202 +#: backend/dnssd.c:529 backend/ipp.c:318 backend/lpd.c:200 #: backend/socket.c:171 msgid "Unable to locate printer." msgstr "" @@ -5580,7 +5588,7 @@ msgid "Unable to open charset file" msgstr "" -#: backend/ipp.c:1921 +#: backend/ipp.c:2018 msgid "Unable to open compressed print file" msgstr "" @@ -5592,16 +5600,16 @@ msgid "Unable to open device file" msgstr "" -#: scheduler/ipp.c:7330 +#: scheduler/ipp.c:7329 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "" -#: backend/ipp.c:352 backend/ipp.c:1927 backend/lpd.c:486 -#: backend/parallel.c:150 backend/serial.c:190 backend/socket.c:158 -#: backend/usb.c:237 filter/bannertops.c:183 filter/gziptoany.c:71 -#: filter/pstext.c:89 filter/pstext.c:249 filter/pstext.c:266 -#: filter/pstops.c:305 +#: backend/ipp.c:359 backend/ipp.c:1380 backend/ipp.c:1576 backend/ipp.c:2024 +#: backend/lpd.c:484 backend/parallel.c:150 backend/serial.c:190 +#: backend/socket.c:158 backend/usb.c:237 filter/bannertops.c:183 +#: filter/gziptoany.c:71 filter/pstext.c:89 filter/pstext.c:249 +#: filter/pstext.c:266 filter/pstops.c:305 msgid "Unable to open print file" msgstr "" @@ -5633,7 +5641,8 @@ msgid "Unable to read print data" msgstr "" -#: backend/usb-darwin.c:613 backend/usb-darwin.c:657 +#: backend/usb-darwin.c:613 backend/usb-darwin.c:657 backend/usb-libusb.c:343 +#: backend/usb-libusb.c:378 msgid "Unable to read print data." msgstr "" @@ -5650,7 +5659,7 @@ msgid "Unable to send command to printer driver" msgstr "" -#: backend/usb-darwin.c:735 backend/usb-libusb.c:179 backend/usb-libusb.c:889 +#: backend/usb-darwin.c:735 backend/usb-libusb.c:454 msgid "Unable to send data to printer." msgstr "" @@ -5672,7 +5681,7 @@ msgid "Unable to set server default:" msgstr "" -#: backend/ipp.c:2582 backend/ipp.c:2659 backend/ipp.c:2667 +#: backend/ipp.c:2797 backend/ipp.c:2874 backend/ipp.c:2882 msgid "Unable to start backend process." msgstr "" @@ -5693,7 +5702,7 @@ msgid "Unable to write uncompressed print data: %s" msgstr "" -#: cups/http-support.c:1273 +#: cups/http-support.c:1276 msgid "Unauthorized" msgstr "" @@ -5701,7 +5710,7 @@ msgid "Units" msgstr "" -#: cups/http-support.c:1313 cups/ppd.c:364 +#: cups/http-support.c:1316 cups/ppd.c:364 msgid "Unknown" msgstr "" @@ -5710,22 +5719,22 @@ msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "" -#: backend/ipp.c:494 +#: backend/ipp.c:501 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "" -#: backend/lpd.c:348 +#: backend/lpd.c:346 #, c-format msgid "Unknown file order: \"%s\"." msgstr "" -#: backend/lpd.c:319 +#: backend/lpd.c:317 #, c-format msgid "Unknown format character: \"%c\"." msgstr "" -#: backend/ipp.c:541 +#: backend/ipp.c:548 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "" @@ -5735,22 +5744,22 @@ msgid "Unknown option \"%s\"." msgstr "" -#: backend/lpd.c:334 +#: backend/lpd.c:332 #, c-format msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:11665 +#: scheduler/ipp.c:11686 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "" -#: scheduler/ipp.c:11648 +#: scheduler/ipp.c:11669 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "" -#: backend/ipp.c:513 +#: backend/ipp.c:520 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "" @@ -5770,17 +5779,17 @@ msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:9371 scheduler/ipp.c:10578 scheduler/ipp.c:12119 +#: scheduler/ipp.c:9370 scheduler/ipp.c:10599 scheduler/ipp.c:12140 #, c-format msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:9505 scheduler/ipp.c:10728 scheduler/ipp.c:12148 +#: scheduler/ipp.c:9504 scheduler/ipp.c:10749 scheduler/ipp.c:12169 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:10711 +#: scheduler/ipp.c:10732 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "" @@ -5826,7 +5835,7 @@ msgid "Unsupported value type" msgstr "" -#: cups/http-support.c:1288 +#: cups/http-support.c:1291 msgid "Upgrade Required" msgstr "" @@ -5847,7 +5856,7 @@ msgid "Usage: %s job user title copies options [filename]" msgstr "" -#: backend/dnssd.c:174 backend/ipp.c:300 backend/lpd.c:191 +#: backend/dnssd.c:174 backend/ipp.c:307 backend/lpd.c:189 #: backend/parallel.c:127 backend/serial.c:167 backend/socket.c:135 #: backend/usb.c:183 driver/commandtoescpx.c:57 driver/commandtopclx.c:57 #: filter/textcommon.c:518 monitor/bcp.c:62 monitor/tbcp.c:61 @@ -5855,7 +5864,7 @@ msgid "Usage: %s job-id user title copies options [file]" msgstr "" -#: filter/bannertops.c:118 filter/commandtops.c:73 filter/gziptoany.c:50 +#: filter/bannertops.c:118 filter/commandtops.c:74 filter/gziptoany.c:50 #: filter/imagetops.c:123 filter/imagetoraster.c:215 filter/pstops.c:269 #, c-format msgid "Usage: %s job-id user title copies options file" @@ -5885,7 +5894,7 @@ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "" -#: systemv/cupstestppd.c:3773 +#: systemv/cupstestppd.c:3774 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]" msgstr "" @@ -5956,11 +5965,11 @@ msgid "Version uses indefinite length" msgstr "" -#: backend/ipp.c:1567 +#: backend/ipp.c:1656 msgid "Waiting for job to complete." msgstr "" -#: backend/usb-darwin.c:457 backend/usb-libusb.c:118 +#: backend/usb-darwin.c:457 backend/usb-libusb.c:193 msgid "Waiting for printer to become available." msgstr "" @@ -5972,7 +5981,7 @@ msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "" -#: cups/http-support.c:1309 +#: cups/http-support.c:1312 msgid "Web Interface is Disabled" msgstr "" @@ -6013,11 +6022,11 @@ msgid "convert: Use the -f option to specify a file to convert." msgstr "" -#: scheduler/ipp.c:7202 +#: scheduler/ipp.c:7201 msgid "cups-deviced failed to execute." msgstr "" -#: scheduler/ipp.c:8032 scheduler/ipp.c:8282 +#: scheduler/ipp.c:8031 scheduler/ipp.c:8281 msgid "cups-driverd failed to execute." msgstr "" @@ -6187,7 +6196,7 @@ msgid "ipptool: Unknown option \"-%c\"." msgstr "" -#: scheduler/ipp.c:9038 +#: scheduler/ipp.c:9037 msgid "job-printer-uri attribute missing." msgstr "" @@ -6493,16 +6502,16 @@ msgid "no system default destination" msgstr "" -#: scheduler/ipp.c:6890 +#: scheduler/ipp.c:6889 msgid "notify-events not specified." msgstr "" -#: scheduler/ipp.c:2179 scheduler/ipp.c:6795 +#: scheduler/ipp.c:2179 scheduler/ipp.c:6794 #, c-format msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "" -#: scheduler/ipp.c:2169 scheduler/ipp.c:6785 +#: scheduler/ipp.c:2169 scheduler/ipp.c:6784 #, c-format msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "" @@ -6904,7 +6913,7 @@ msgid "ppdc: Unable to load localization file \"%s\" - %s" msgstr "" -#: ppdc/ppdc-file.cxx:49 +#: ppdc/ppdc-file.cxx:50 #, c-format msgid "ppdc: Unable to open %s: %s" msgstr "" diff -Nru cups-1.5.2/locale/cups_pt_BR.po cups-1.5.3/locale/cups_pt_BR.po --- cups-1.5.2/locale/cups_pt_BR.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_pt_BR.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2011-12-20 13:04-0200\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Protocolo de Impressão da Internet" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Impresso para: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3841,15 +3848,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3859,12 +3860,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4047,6 +4054,9 @@ msgid "Unable to change server settings:" msgstr "Não é possível alterar as configurações do servidor:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Não é possível conectar ao host." @@ -4168,9 +4178,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Não é possível obter uma lista de drivers de impressora:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Não é possível obter os atributos de impressora:" diff -Nru cups-1.5.2/locale/cups_pt.po cups-1.5.3/locale/cups_pt.po --- cups-1.5.2/locale/cups_pt.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_pt.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Protocolo de impressão via Internet" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Impresso para: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3841,15 +3848,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3859,12 +3860,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4049,6 +4056,9 @@ msgid "Unable to change server settings:" msgstr "Não é possível alterar as definições do servidor:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Não é possível ligar ao host." @@ -4170,9 +4180,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Não é possível obter a lista de recursos da impressora:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Não é possível obter os atributos da impressora:" diff -Nru cups-1.5.2/locale/cups_ru.po cups-1.5.3/locale/cups_ru.po --- cups-1.5.2/locale/cups_ru.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_ru.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Протокол интернет-печати" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Напечатано для: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3841,15 +3848,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3859,12 +3860,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4045,6 +4052,9 @@ msgid "Unable to change server settings:" msgstr "Не удается изменить настройки сервера:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Не удается подключиться к хосту." @@ -4166,9 +4176,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Не удается получить список драйверов принтера:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Не удается получить атрибуты принтера:" diff -Nru cups-1.5.2/locale/cups.strings cups-1.5.3/locale/cups.strings --- cups-1.5.2/locale/cups.strings 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups.strings 2012-03-07 22:38:28.000000000 +0100 @@ -839,6 +839,7 @@ "Internet Postage 3-Part" = "Internet Postage 3-Part"; "Internet Postage 3-Part - 2 1/4 x 7\"" = "Internet Postage 3-Part - 2 1/4 x 7\""; "Internet Printing Protocol" = "Internet Printing Protocol"; +"Invalid printer command \"%s\"." = "Invalid printer command \"%s\"."; "JCL" = "JCL"; "JIS B0" = "JIS B0"; "JIS B1" = "JIS B1"; @@ -1030,6 +1031,7 @@ "Print file accepted - job ID unknown." = "Print file accepted - job ID unknown."; "Print file sent." = "Print file sent."; "Print file was not accepted." = "Print file was not accepted."; +"Print job too large." = "Print job too large."; "Printed For: " = "Printed For: "; "Printed From: " = "Printed From: "; "Printed On: " = "Printed On: "; @@ -1042,7 +1044,7 @@ "Printer Settings" = "Printer Settings"; "Printer busy, will retry in 10 seconds." = "Printer busy, will retry in 10 seconds."; "Printer busy; will retry in 30 seconds." = "Printer busy; will retry in 30 seconds."; -"Printer did not respond after %d seconds." = "Printer did not respond after %d seconds."; +"Printer did not respond." = "Printer did not respond."; "Printer does not support IPP/%d.%d, trying IPP/%s." = "Printer does not support IPP/%d.%d, trying IPP/%s."; "Printer is busy, will retry in 5 seconds." = "Printer is busy, will retry in 5 seconds."; "Printer is not currently connected." = "Printer is not currently connected."; @@ -1135,14 +1137,14 @@ "The paper tray needs to be filled." = "The paper tray needs to be filled."; "The print file could not be opened." = "The print file could not be opened."; "The printer URI is incorrect or no longer exists." = "The printer URI is incorrect or no longer exists."; -"The printer is almost out of ink." = "The printer is almost out of ink."; "The printer is busy." = "The printer is busy."; -"The printer is low on toner." = "The printer is low on toner."; "The printer is not connected." = "The printer is not connected."; "The printer is not responding." = "The printer is not responding."; "The printer is out of ink." = "The printer is out of ink."; -"The printer is out of toner." = "The printer is out of toner."; +"The printer is running low on ink." = "The printer is running low on ink."; +"The printer is running low on toner." = "The printer is running low on toner."; "The printer is unreachable at this time." = "The printer is unreachable at this time."; +"The printer may be out of toner." = "The printer may be out of toner."; "The printer may not exist or is unavailable at this time." = "The printer may not exist or is unavailable at this time."; "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."; "The printer or class does not exist." = "The printer or class does not exist."; @@ -1197,6 +1199,7 @@ "Unable to change printer-is-shared attribute:" = "Unable to change printer-is-shared attribute:"; "Unable to change printer:" = "Unable to change printer:"; "Unable to change server settings:" = "Unable to change server settings:"; +"Unable to configure printer options." = "Unable to configure printer options."; "Unable to connect to host." = "Unable to connect to host."; "Unable to contact printer, queuing on next printer in class." = "Unable to contact printer, queuing on next printer in class."; "Unable to copy 64-bit CUPS printer driver files (%d)." = "Unable to copy 64-bit CUPS printer driver files (%d)."; @@ -1233,7 +1236,6 @@ "Unable to get class list:" = "Unable to get class list:"; "Unable to get class status:" = "Unable to get class status:"; "Unable to get list of printer drivers:" = "Unable to get list of printer drivers:"; -"Unable to get print job status." = "Unable to get print job status."; "Unable to get printer attributes:" = "Unable to get printer attributes:"; "Unable to get printer list:" = "Unable to get printer list:"; "Unable to get printer status." = "Unable to get printer status."; diff -Nru cups-1.5.2/locale/cups_sv.po cups-1.5.3/locale/cups_sv.po --- cups-1.5.2/locale/cups_sv.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_sv.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2904,6 +2905,10 @@ msgid "Internet Printing Protocol" msgstr "Internet Printing Protocol" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3507,6 +3512,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "Utskriven för: " @@ -3543,8 +3551,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3841,15 +3848,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3859,12 +3860,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4048,6 +4055,9 @@ msgid "Unable to change server settings:" msgstr "Kunde inte ändra serverinställningar:" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "Kunde inte ansluta till värd." @@ -4169,9 +4179,6 @@ msgid "Unable to get list of printer drivers:" msgstr "Kunde inte hämta listan med skrivardrivrutiner:" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "Kunde inte hämta skrivarattribut:" diff -Nru cups-1.5.2/locale/cups_zh.po cups-1.5.3/locale/cups_zh.po --- cups-1.5.2/locale/cups_zh.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_zh.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2903,6 +2904,10 @@ msgid "Internet Printing Protocol" msgstr "Internet 打印协议" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3506,6 +3511,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "打印人：" @@ -3542,8 +3550,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3838,15 +3845,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3856,12 +3857,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4040,6 +4047,9 @@ msgid "Unable to change server settings:" msgstr "无法更改服务器设置：" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "无法连接到主机。" @@ -4161,9 +4171,6 @@ msgid "Unable to get list of printer drivers:" msgstr "无法获得打印机驱动程序的列表：" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "无法获得打印机属性：" diff -Nru cups-1.5.2/locale/cups_zh_TW.po cups-1.5.3/locale/cups_zh_TW.po --- cups-1.5.2/locale/cups_zh_TW.po 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/cups_zh_TW.po 2012-03-07 22:38:28.000000000 +0100 @@ -2,13 +2,14 @@ msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2012-01-30 14:18-0800\n" +"POT-Creation-Date: 2012-03-07 13:38-0800\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" msgid "\t\t(all)" msgstr "" @@ -2903,6 +2904,10 @@ msgid "Internet Printing Protocol" msgstr "Internet 列印通訊協定" +#, c-format +msgid "Invalid printer command \"%s\"." +msgstr "" + msgid "JCL" msgstr "JCL" @@ -3506,6 +3511,9 @@ msgid "Print file was not accepted." msgstr "" +msgid "Print job too large." +msgstr "" + msgid "Printed For: " msgstr "列印對象：" @@ -3542,8 +3550,7 @@ msgid "Printer busy; will retry in 30 seconds." msgstr "" -#, c-format -msgid "Printer did not respond after %d seconds." +msgid "Printer did not respond." msgstr "" #, c-format @@ -3838,15 +3845,9 @@ msgid "The printer URI is incorrect or no longer exists." msgstr "" -msgid "The printer is almost out of ink." -msgstr "" - msgid "The printer is busy." msgstr "" -msgid "The printer is low on toner." -msgstr "" - msgid "The printer is not connected." msgstr "" @@ -3856,12 +3857,18 @@ msgid "The printer is out of ink." msgstr "" -msgid "The printer is out of toner." +msgid "The printer is running low on ink." +msgstr "" + +msgid "The printer is running low on toner." msgstr "" msgid "The printer is unreachable at this time." msgstr "" +msgid "The printer may be out of toner." +msgstr "" + msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4040,6 +4047,9 @@ msgid "Unable to change server settings:" msgstr "無法更改伺服器設定：" +msgid "Unable to configure printer options." +msgstr "" + msgid "Unable to connect to host." msgstr "無法連接主機。" @@ -4161,9 +4171,6 @@ msgid "Unable to get list of printer drivers:" msgstr "無法取得印表機驅動程式的列表：" -msgid "Unable to get print job status." -msgstr "" - msgid "Unable to get printer attributes:" msgstr "無法取得印表機屬性：" diff -Nru cups-1.5.2/locale/Dependencies cups-1.5.3/locale/Dependencies --- cups-1.5.2/locale/Dependencies 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/locale/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,24 +3,26 @@ checkpo.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h checkpo.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h checkpo.o: ../cups/language.h ../cups/string-private.h ../config.h -checkpo.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -checkpo.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -checkpo.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -checkpo.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -checkpo.o: ../cups/thread-private.h +checkpo.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +checkpo.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +checkpo.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +checkpo.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +checkpo.o: ../cups/transcode.h ../cups/thread-private.h po2strings.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h po2strings.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h po2strings.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -po2strings.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -po2strings.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -po2strings.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -po2strings.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -po2strings.o: ../cups/transcode.h ../cups/thread-private.h +po2strings.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +po2strings.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +po2strings.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +po2strings.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +po2strings.o: ../cups/language-private.h ../cups/transcode.h +po2strings.o: ../cups/thread-private.h translate.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h translate.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h translate.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -translate.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -translate.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -translate.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -translate.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -translate.o: ../cups/transcode.h ../cups/thread-private.h +translate.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +translate.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +translate.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +translate.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +translate.o: ../cups/language-private.h ../cups/transcode.h +translate.o: ../cups/thread-private.h diff -Nru cups-1.5.2/locale/Makefile cups-1.5.3/locale/Makefile --- cups-1.5.2/locale/Makefile 2012-01-30 23:19:03.000000000 +0100 +++ cups-1.5.3/locale/Makefile 2012-02-13 18:13:21.000000000 +0100 @@ -1,9 +1,9 @@ # -# "$Id: Makefile 10209 2012-01-30 22:19:03Z mike $" +# "$Id: Makefile 10270 2012-02-13 17:13:21Z mike $" # # Locale file makefile for CUPS. # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1993-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -141,7 +141,7 @@ echo Checking cups.pot... ./checkpo cups.pot for loc in *.po; do \ - echo Merging changes into cups_$$loc.po... ; \ + echo Merging changes into cups_$$loc... ; \ msgmerge -o $$loc -s -N --no-location $$loc cups.pot ; \ done echo Updating cups.strings... @@ -215,5 +215,5 @@ # -# End of "$Id: Makefile 10209 2012-01-30 22:19:03Z mike $". +# End of "$Id: Makefile 10270 2012-02-13 17:13:21Z mike $". # diff -Nru cups-1.5.2/locale/po2strings.c cups-1.5.3/locale/po2strings.c --- cups-1.5.2/locale/po2strings.c 2011-03-22 00:03:22.000000000 +0100 +++ cups-1.5.3/locale/po2strings.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: po2strings.c 9637 2011-03-21 23:03:22Z mike $" + * "$Id: po2strings.c 10379 2012-03-23 22:16:22Z mike $" * * Convert a GNU gettext .po file to an Apple .strings file. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -175,7 +175,7 @@ /* * Find start of value... */ - + if ((ptr = strchr(s, '\"')) == NULL) continue; @@ -196,15 +196,18 @@ if (*msgid) cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, (use_msgid || !*msgstr) ? msgid : msgstr); + } + if (msgid) free(msgid); + + if (msgstr) free(msgstr); - } msgid = strdup(ptr); msgstr = NULL; } - else if (s[0] == '\"' ) + else if (s[0] == '\"' && (msgid || msgstr)) { /* * Append to current string... @@ -215,6 +218,9 @@ if ((temp = realloc(msgstr ? msgstr : msgid, length + strlen(ptr) + 1)) == NULL) { + free(msgid); + if (msgstr) + free(msgstr); perror("Unable to allocate string"); return (1); } @@ -250,8 +256,12 @@ * Set the string... */ + if (msgstr) + free(msgstr); + if ((msgstr = strdup(ptr)) == NULL) { + free(msgid); perror("Unable to allocate msgstr"); return (1); } @@ -264,10 +274,13 @@ if (*msgid) cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, (use_msgid || !*msgstr) ? msgid : msgstr); + } + if (msgid) free(msgid); + + if (msgstr) free(msgstr); - } cupsFileClose(po); cupsFileClose(strings); @@ -277,5 +290,5 @@ /* - * End of "$Id: po2strings.c 9637 2011-03-21 23:03:22Z mike $". + * End of "$Id: po2strings.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/Makedefs.in cups-1.5.3/Makedefs.in --- cups-1.5.2/Makedefs.in 2011-05-04 06:28:00.000000000 +0200 +++ cups-1.5.3/Makedefs.in 2012-03-01 01:05:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# "$Id: Makedefs.in 9737 2011-05-04 04:28:00Z mike $" +# "$Id: Makedefs.in 10317 2012-03-01 00:05:55Z mike $" # # Common makefile definitions for CUPS. # @@ -43,6 +43,7 @@ INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ +INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ INSTALL_DATA = $(INSTALL) -c -m 444 INSTALL_DIR = $(INSTALL) -d INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ @@ -304,5 +305,5 @@ # -# End of "$Id: Makedefs.in 9737 2011-05-04 04:28:00Z mike $" +# End of "$Id: Makedefs.in 10317 2012-03-01 00:05:55Z mike $" # diff -Nru cups-1.5.2/monitor/Dependencies cups-1.5.3/monitor/Dependencies --- cups-1.5.2/monitor/Dependencies 2010-11-22 08:06:39.000000000 +0100 +++ cups-1.5.3/monitor/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,16 +3,16 @@ bcp.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h bcp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h bcp.o: ../cups/language.h ../cups/string-private.h ../config.h -bcp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -bcp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -bcp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -bcp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -bcp.o: ../cups/thread-private.h +bcp.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +bcp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +bcp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +bcp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +bcp.o: ../cups/transcode.h ../cups/thread-private.h tbcp.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h tbcp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h tbcp.o: ../cups/language.h ../cups/string-private.h ../config.h -tbcp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -tbcp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -tbcp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -tbcp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -tbcp.o: ../cups/thread-private.h +tbcp.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +tbcp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +tbcp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +tbcp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +tbcp.o: ../cups/transcode.h ../cups/thread-private.h diff -Nru cups-1.5.2/notifier/Dependencies cups-1.5.3/notifier/Dependencies --- cups-1.5.2/notifier/Dependencies 2011-04-13 17:45:24.000000000 +0200 +++ cups-1.5.3/notifier/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -6,19 +6,20 @@ mailto.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h mailto.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h mailto.o: ../cups/language.h ../cups/string-private.h ../config.h -mailto.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -mailto.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -mailto.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -mailto.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -mailto.o: ../cups/thread-private.h +mailto.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +mailto.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +mailto.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +mailto.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +mailto.o: ../cups/transcode.h ../cups/thread-private.h rss.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h rss.o: ../cups/http.h ../cups/array.h ../cups/language.h ../cups/language.h rss.o: ../cups/string-private.h ../config.h ../cups/array.h testnotify.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h testnotify.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h testnotify.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -testnotify.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -testnotify.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -testnotify.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -testnotify.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -testnotify.o: ../cups/transcode.h ../cups/thread-private.h +testnotify.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +testnotify.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +testnotify.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +testnotify.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +testnotify.o: ../cups/language-private.h ../cups/transcode.h +testnotify.o: ../cups/thread-private.h diff -Nru cups-1.5.2/notifier/rss.c cups-1.5.3/notifier/rss.c --- cups-1.5.2/notifier/rss.c 2010-03-24 01:45:34.000000000 +0100 +++ cups-1.5.3/notifier/rss.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: rss.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: rss.c 10379 2012-03-23 22:16:22Z mike $" * * RSS notifier for CUPS. * @@ -251,7 +251,7 @@ { /* * Save the messages to the file again, uploading as needed... - */ + */ if (save_rss(rss, newname, baseurl)) { @@ -553,6 +553,15 @@ sequence_number = atoi(start + 6); } + if (subject) + free(subject); + + if (text) + free(text); + + if (link_url) + free(link_url); + fclose(fp); } @@ -727,5 +736,5 @@ /* - * End of "$Id: rss.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: rss.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/packaging/cups.list.in cups-1.5.3/packaging/cups.list.in --- cups-1.5.2/packaging/cups.list.in 2011-05-04 06:28:00.000000000 +0200 +++ cups-1.5.3/packaging/cups.list.in 2012-04-24 01:49:19.000000000 +0200 @@ -1,9 +1,9 @@ # -# "$Id: cups.list.in 9737 2011-05-04 04:28:00Z mike $" +# "$Id: cups.list.in 10439 2012-04-23 23:49:19Z mike $" # # ESP Package Manager (EPM) file list for CUPS. # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -15,7 +15,7 @@ # Product information %product CUPS -%copyright 2007-2011 by Apple Inc. +%copyright 2007-2012 by Apple Inc. %vendor Apple Inc. #%license LICENSE.txt %readme LICENSE.txt @@ -26,7 +26,7 @@ %version @CUPS_VERSION@ %format all %description CUPS is the standards-based, open source printing system developed by -%description Apple Inc. for Mac OS® X and other UNIX®-like operating systems. +%description Apple Inc. for OS X and other UNIX®-like operating systems. %format rpm %provides lpd @@ -796,5 +796,5 @@ %subpackage # -# End of "$Id: cups.list.in 9737 2011-05-04 04:28:00Z mike $". +# End of "$Id: cups.list.in 10439 2012-04-23 23:49:19Z mike $". # diff -Nru cups-1.5.2/packaging/cups.spec cups-1.5.3/packaging/cups.spec --- cups-1.5.2/packaging/cups.spec 2012-02-05 19:56:17.000000000 +0100 +++ cups-1.5.3/packaging/cups.spec 2012-05-15 16:08:08.000000000 +0200 @@ -1,11 +1,11 @@ # -# "$Id: cups.spec.in 9819 2011-06-10 21:25:02Z mike $" +# "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $" # # RPM "spec" file for CUPS. # # Original version by Jason McMullan . # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1999-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -18,12 +18,18 @@ # Conditional build options (--with name/--without name): # # dbus - Enable/disable DBUS support (default = enable) +# dnssd - Enable/disable DNS-SD support (default = disable) # php - Enable/disable PHP 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_php: %{!?_without_php: %define _with_php --with-php}} %{?_with_php: %define _php --with-php} %{!?_with_php: %define _php --without-php} @@ -34,12 +40,12 @@ Summary: CUPS Name: cups -Version: 1.5.2 +Version: 1.5.3 Release: 1 Epoch: 1 License: GPL Group: System Environment/Daemons -Source: http://ftp.easysw.com/pub/cups/1.5.2/cups-1.5.2-source.tar.bz2 +Source: http://ftp.easysw.com/pub/cups/1.5.3/cups-1.5.3-source.tar.bz2 Url: http://www.cups.org Packager: Anonymous Vendor: Apple Inc. @@ -79,7 +85,7 @@ %description CUPS is the standards-based, open source printing system developed by -Apple Inc. for Mac OS® X and other UNIX®-like operating systems. +Apple Inc. for OS X and other UNIX®-like operating systems. %description devel This package provides the CUPS headers and development environment. @@ -100,7 +106,7 @@ %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ - ./configure %{_dbus} %{_php} %{_static} + ./configure %{_dbus} %{_dnssd} %{_php} %{_static} # If we got this far, all prerequisite libraries must be here. make @@ -189,6 +195,9 @@ /usr/bin/lp* %dir /usr/lib/cups %dir /usr/lib/cups/backend +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +/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 @@ -243,6 +252,10 @@ /usr/share/doc/cups/es/* %dir /usr/share/doc/cups/eu /usr/share/doc/cups/eu/* +%dir /usr/share/doc/cups/fr +/usr/share/doc/cups/fr/* +%dir /usr/share/doc/cups/hu +/usr/share/doc/cups/hu/* %dir /usr/share/doc/cups/id /usr/share/doc/cups/id/* %dir /usr/share/doc/cups/it @@ -372,5 +385,5 @@ # -# End of "$Id: cups.spec.in 9819 2011-06-10 21:25:02Z mike $". +# End of "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $". # diff -Nru cups-1.5.2/packaging/cups.spec.in cups-1.5.3/packaging/cups.spec.in --- cups-1.5.2/packaging/cups.spec.in 2011-06-10 23:25:02.000000000 +0200 +++ cups-1.5.3/packaging/cups.spec.in 2012-04-23 19:46:53.000000000 +0200 @@ -1,11 +1,11 @@ # -# "$Id: cups.spec.in 9819 2011-06-10 21:25:02Z mike $" +# "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $" # # RPM "spec" file for CUPS. # # Original version by Jason McMullan . # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1999-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -18,12 +18,18 @@ # Conditional build options (--with name/--without name): # # dbus - Enable/disable DBUS support (default = enable) +# dnssd - Enable/disable DNS-SD support (default = disable) # php - Enable/disable PHP 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_php: %{!?_without_php: %define _with_php --with-php}} %{?_with_php: %define _php --with-php} %{!?_with_php: %define _php --without-php} @@ -39,7 +45,7 @@ Epoch: 1 License: GPL Group: System Environment/Daemons -Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 +Source: http://ftp.cups.org/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Url: http://www.cups.org Packager: Anonymous Vendor: Apple Inc. @@ -79,7 +85,7 @@ %description CUPS is the standards-based, open source printing system developed by -Apple Inc. for Mac OS® X and other UNIX®-like operating systems. +Apple Inc. for OS X and other UNIX®-like operating systems. %description devel This package provides the CUPS headers and development environment. @@ -100,7 +106,7 @@ %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ - ./configure %{_dbus} %{_php} %{_static} + ./configure %{_dbus} %{_dnssd} %{_php} %{_static} # If we got this far, all prerequisite libraries must be here. make @@ -189,6 +195,9 @@ /usr/bin/lp* %dir /usr/lib/cups %dir /usr/lib/cups/backend +%if %{?_with_dnssd:1}%{!?_with_dnssd:0} +/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 @@ -243,6 +252,10 @@ /usr/share/doc/cups/es/* %dir /usr/share/doc/cups/eu /usr/share/doc/cups/eu/* +%dir /usr/share/doc/cups/fr +/usr/share/doc/cups/fr/* +%dir /usr/share/doc/cups/hu +/usr/share/doc/cups/hu/* %dir /usr/share/doc/cups/id /usr/share/doc/cups/id/* %dir /usr/share/doc/cups/it @@ -372,5 +385,5 @@ # -# End of "$Id: cups.spec.in 9819 2011-06-10 21:25:02Z mike $". +# End of "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $". # diff -Nru cups-1.5.2/ppdc/Dependencies cups-1.5.3/ppdc/Dependencies --- cups-1.5.2/ppdc/Dependencies 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/ppdc/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -4,155 +4,166 @@ ppdc-array.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-array.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h ppdc-array.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdc-array.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdc-array.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdc-array.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-array.o: ../cups/language-private.h ../cups/transcode.h +ppdc-array.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdc-array.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdc-array.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-array.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdc-array.o: ../cups/thread-private.h ppdc-attr.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-attr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-attr.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h ppdc-attr.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdc-attr.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdc-attr.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdc-attr.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-attr.o: ../cups/language-private.h ../cups/transcode.h +ppdc-attr.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdc-attr.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdc-attr.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-attr.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdc-attr.o: ../cups/thread-private.h ppdc-catalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-catalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-catalog.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-catalog.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-catalog.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-catalog.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-catalog.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-catalog.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-catalog.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-catalog.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-catalog.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-catalog.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-catalog.o: ../cups/language-private.h ../cups/transcode.h ppdc-catalog.o: ../cups/thread-private.h ppdc-choice.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-choice.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-choice.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-choice.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-choice.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-choice.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-choice.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-choice.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-choice.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-choice.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-choice.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-choice.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-choice.o: ../cups/language-private.h ../cups/transcode.h ppdc-choice.o: ../cups/thread-private.h ppdc-constraint.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-constraint.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-constraint.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-constraint.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-constraint.o: ../cups/debug-private.h ../cups/ppd-private.h -ppdc-constraint.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -ppdc-constraint.o: ../cups/http-private.h ../cups/http.h -ppdc-constraint.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-constraint.o: ../cups/language-private.h ../cups/transcode.h -ppdc-constraint.o: ../cups/thread-private.h +ppdc-constraint.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-constraint.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-constraint.o: ../cups/pwg-private.h ../cups/http-private.h +ppdc-constraint.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-constraint.o: ../cups/ipp.h ../cups/language-private.h +ppdc-constraint.o: ../cups/transcode.h ../cups/thread-private.h ppdc-driver.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-driver.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-driver.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-driver.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-driver.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-driver.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-driver.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-driver.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-driver.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-driver.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-driver.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-driver.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-driver.o: ../cups/language-private.h ../cups/transcode.h ppdc-driver.o: ../cups/thread-private.h ppdc-file.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-file.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-file.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h ppdc-file.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdc-file.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdc-file.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdc-file.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-file.o: ../cups/language-private.h ../cups/transcode.h +ppdc-file.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdc-file.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdc-file.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-file.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdc-file.o: ../cups/thread-private.h ppdc-filter.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-filter.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-filter.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-filter.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-filter.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-filter.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-filter.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-filter.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-filter.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-filter.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-filter.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-filter.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-filter.o: ../cups/language-private.h ../cups/transcode.h ppdc-filter.o: ../cups/thread-private.h ppdc-font.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-font.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-font.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h ppdc-font.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdc-font.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdc-font.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdc-font.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-font.o: ../cups/language-private.h ../cups/transcode.h +ppdc-font.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdc-font.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdc-font.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-font.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdc-font.o: ../cups/thread-private.h ppdc-group.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-group.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-group.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h ppdc-group.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdc-group.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdc-group.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdc-group.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-group.o: ../cups/language-private.h ../cups/transcode.h +ppdc-group.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdc-group.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdc-group.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-group.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdc-group.o: ../cups/thread-private.h ppdc-import.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-import.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-import.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-import.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-import.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-import.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-import.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-import.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-import.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-import.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-import.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-import.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-import.o: ../cups/language-private.h ../cups/transcode.h ppdc-import.o: ../cups/thread-private.h ppdc-mediasize.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-mediasize.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-mediasize.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-mediasize.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-mediasize.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-mediasize.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-mediasize.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-mediasize.o: ../cups/ipp.h ../cups/language-private.h -ppdc-mediasize.o: ../cups/transcode.h ../cups/thread-private.h +ppdc-mediasize.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-mediasize.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-mediasize.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-mediasize.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-mediasize.o: ../cups/language-private.h ../cups/transcode.h +ppdc-mediasize.o: ../cups/thread-private.h ppdc-message.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-message.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-message.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-message.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-message.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-message.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-message.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-message.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-message.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-message.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-message.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-message.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-message.o: ../cups/language-private.h ../cups/transcode.h ppdc-message.o: ../cups/thread-private.h ppdc-option.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-option.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-option.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-option.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-option.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-option.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-option.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-option.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-option.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-option.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-option.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-option.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-option.o: ../cups/language-private.h ../cups/transcode.h ppdc-option.o: ../cups/thread-private.h ppdc-profile.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-profile.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-profile.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-profile.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-profile.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-profile.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-profile.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-profile.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-profile.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-profile.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-profile.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-profile.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-profile.o: ../cups/language-private.h ../cups/transcode.h ppdc-profile.o: ../cups/thread-private.h ppdc-shared.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-shared.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-shared.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-shared.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-shared.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-shared.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-shared.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-shared.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-shared.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-shared.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-shared.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-shared.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-shared.o: ../cups/language-private.h ../cups/transcode.h ppdc-shared.o: ../cups/thread-private.h ppdc-source.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-source.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-source.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-source.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-source.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-source.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-source.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-source.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-source.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-source.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-source.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-source.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-source.o: ../cups/language-private.h ../cups/transcode.h ppdc-source.o: ../cups/thread-private.h ../cups/raster.h ../cups/ppd.h ppdc-source.o: ../data/epson.h ../data/escp.h ../data/hp.h ../data/label.h ppdc-source.o: ../data/pcl.h @@ -160,79 +171,83 @@ ppdc-string.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-string.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-string.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-string.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-string.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-string.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-string.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-string.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-string.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-string.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-string.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-string.o: ../cups/language-private.h ../cups/transcode.h ppdc-string.o: ../cups/thread-private.h ppdc-variable.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc-variable.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdc-variable.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ppdc-variable.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdc-variable.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdc-variable.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdc-variable.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdc-variable.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-variable.o: ../cups/debug-private.h ../cups/versioning.h +ppdc-variable.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdc-variable.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdc-variable.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-variable.o: ../cups/language-private.h ../cups/transcode.h ppdc-variable.o: ../cups/thread-private.h genstrings.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h genstrings.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h genstrings.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h genstrings.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -genstrings.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -genstrings.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -genstrings.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -genstrings.o: ../cups/language-private.h ../cups/transcode.h +genstrings.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +genstrings.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +genstrings.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +genstrings.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h genstrings.o: ../cups/thread-private.h ppdc.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h ppdc.o: ../cups/http.h ../cups/array.h ../cups/language.h ppdc.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdc.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdc.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdc.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdc.o: ../cups/language-private.h ../cups/transcode.h +ppdc.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdc.o: ../cups/thread-private.h ppdhtml.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdhtml.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h ppdhtml.o: ../cups/http.h ../cups/array.h ../cups/language.h ppdhtml.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdhtml.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdhtml.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdhtml.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdhtml.o: ../cups/language-private.h ../cups/transcode.h +ppdhtml.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdhtml.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdhtml.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdhtml.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdhtml.o: ../cups/thread-private.h ppdi.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdi.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h ppdi.o: ../cups/http.h ../cups/array.h ../cups/language.h ppdi.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdi.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdi.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdi.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdi.o: ../cups/language-private.h ../cups/transcode.h +ppdi.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdi.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdi.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdi.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdi.o: ../cups/thread-private.h ppdmerge.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ppdmerge.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/array.h ppdmerge.o: ../cups/language.h ../cups/string-private.h ../config.h -ppdmerge.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ppdmerge.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ppdmerge.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ppdmerge.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdmerge.o: ../cups/debug-private.h ../cups/versioning.h +ppdmerge.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ppdmerge.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ppdmerge.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdmerge.o: ../cups/language-private.h ../cups/transcode.h ppdmerge.o: ../cups/thread-private.h ../cups/ppd-private.h ../cups/array.h ppdpo.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h ppdpo.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h ppdpo.o: ../cups/http.h ../cups/array.h ../cups/language.h ppdpo.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -ppdpo.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -ppdpo.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h -ppdpo.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h -ppdpo.o: ../cups/language-private.h ../cups/transcode.h +ppdpo.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +ppdpo.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h +ppdpo.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdpo.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ppdpo.o: ../cups/thread-private.h testcatalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h testcatalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h testcatalog.o: ../cups/ipp.h ../cups/http.h ../cups/array.h testcatalog.o: ../cups/language.h ../cups/string-private.h ../config.h -testcatalog.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -testcatalog.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -testcatalog.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -testcatalog.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +testcatalog.o: ../cups/debug-private.h ../cups/versioning.h +testcatalog.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +testcatalog.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +testcatalog.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +testcatalog.o: ../cups/language-private.h ../cups/transcode.h testcatalog.o: ../cups/thread-private.h diff -Nru cups-1.5.2/ppdc/ppdc-file.cxx cups-1.5.3/ppdc/ppdc-file.cxx --- cups-1.5.2/ppdc/ppdc-file.cxx 2010-11-22 08:06:39.000000000 +0100 +++ cups-1.5.3/ppdc/ppdc-file.cxx 2012-03-07 07:05:39.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: ppdc-file.cxx 9384 2010-11-22 07:06:39Z mike $" +// "$Id: ppdc-file.cxx 10338 2012-03-07 06:05:39Z mike $" // // File class for the CUPS PPD Compiler. // @@ -42,8 +42,9 @@ else fp = cupsFileOpen(f, "r"); - filename = f; - line = 1; + close_on_delete = !ffp; + filename = f; + line = 1; if (!fp) _cupsLangPrintf(stderr, _("ppdc: Unable to open %s: %s"), f, @@ -57,7 +58,7 @@ ppdcFile::~ppdcFile() { - if (fp) + if (close_on_delete && fp) cupsFileClose(fp); } @@ -105,5 +106,5 @@ // -// End of "$Id: ppdc-file.cxx 9384 2010-11-22 07:06:39Z mike $". +// End of "$Id: ppdc-file.cxx 10338 2012-03-07 06:05:39Z mike $". // diff -Nru cups-1.5.2/ppdc/ppdc.h cups-1.5.3/ppdc/ppdc.h --- cups-1.5.2/ppdc/ppdc.h 2009-06-05 22:49:06.000000000 +0200 +++ cups-1.5.3/ppdc/ppdc.h 2012-03-07 07:05:39.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: ppdc.h 8698 2009-06-05 20:49:06Z mike $" +// "$Id: ppdc.h 10338 2012-03-07 06:05:39Z mike $" // // Definitions for the CUPS PPD Compiler. // @@ -447,6 +447,7 @@ { public: + bool close_on_delete; // Close file on delete? cups_file_t *fp; // File pointer const char *filename; // Filename int line; // Line in file @@ -528,5 +529,5 @@ #endif // !_PPDC_H_ // -// End of "$Id: ppdc.h 8698 2009-06-05 20:49:06Z mike $". +// End of "$Id: ppdc.h 10338 2012-03-07 06:05:39Z mike $". // diff -Nru cups-1.5.2/ppdc/ppdc-source.cxx cups-1.5.3/ppdc/ppdc-source.cxx --- cups-1.5.2/ppdc/ppdc-source.cxx 2011-09-09 20:02:30.000000000 +0200 +++ cups-1.5.3/ppdc/ppdc-source.cxx 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: ppdc-source.cxx 9985 2011-09-09 18:02:30Z mike $" +// "$Id: ppdc-source.cxx 10379 2012-03-23 22:16:22Z mike $" // // Source class for the CUPS PPD Compiler. // -// Copyright 2007-2011 by Apple Inc. +// Copyright 2007-2012 by Apple Inc. // Copyright 2002-2007 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -1340,7 +1340,8 @@ // NAME logicop value for (newv = (char *)v + 1; *newv && (isalnum(*newv & 255) || *newv == '_'); - newv ++); + newv ++) + /* do nothing */; ch = *newv; *newv = '\0'; @@ -3906,5 +3907,5 @@ // -// End of "$Id: ppdc-source.cxx 9985 2011-09-09 18:02:30Z mike $". +// End of "$Id: ppdc-source.cxx 10379 2012-03-23 22:16:22Z mike $". // diff -Nru cups-1.5.2/README.txt cups-1.5.3/README.txt --- cups-1.5.2/README.txt 2012-02-05 19:38:39.000000000 +0100 +++ cups-1.5.3/README.txt 2012-05-15 16:01:45.000000000 +0200 @@ -1,4 +1,4 @@ -README - CUPS v1.5.2 - 2012-02-05 +README - CUPS v1.5.3 - 2012-05-15 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" diff -Nru cups-1.5.2/scheduler/cert.c cups-1.5.3/scheduler/cert.c --- cups-1.5.2/scheduler/cert.c 2011-11-03 00:43:51.000000000 +0100 +++ cups-1.5.3/scheduler/cert.c 2012-02-12 06:48:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: cert.c 10101 2011-11-02 23:43:51Z mike $" + * "$Id: cert.c 10262 2012-02-12 05:48:09Z mike $" * * Authentication certificate routines for the CUPS scheduler. * @@ -121,6 +121,8 @@ * groups can access it... */ + int j; /* Looping var */ + # ifdef HAVE_MBR_UID_TO_UUID /* * On MacOS X, ACLs use UUIDs instead of GIDs... @@ -134,6 +136,13 @@ * Add each group ID to the ACL... */ + for (j = 0; j < i; j ++) + if (SystemGroupIDs[j] == SystemGroupIDs[i]) + break; + + if (j < i) + continue; /* Skip duplicate groups */ + acl_create_entry(&acl, &entry); acl_get_permset(entry, &permset); acl_add_perm(permset, ACL_READ_DATA); @@ -142,6 +151,7 @@ acl_set_qualifier(entry, &group); acl_set_permset(entry, permset); } + # else /* * POSIX ACLs need permissions for owner, group, other, and mask @@ -184,6 +194,13 @@ * Add each group ID to the ACL... */ + for (j = 0; j < i; j ++) + if (SystemGroupIDs[j] == SystemGroupIDs[i]) + break; + + if (j < i) + continue; /* Skip duplicate groups */ + acl_create_entry(&acl, &entry); acl_get_permset(entry, &permset); acl_add_perm(permset, ACL_READ); @@ -196,7 +213,6 @@ { char *text, *textptr; /* Temporary string */ - cupsdLogMessage(CUPSD_LOG_ERROR, "ACL did not validate: %s", strerror(errno)); text = acl_to_text(acl, NULL); @@ -438,5 +454,5 @@ /* - * End of "$Id: cert.c 10101 2011-11-02 23:43:51Z mike $". + * End of "$Id: cert.c 10262 2012-02-12 05:48:09Z mike $". */ diff -Nru cups-1.5.2/scheduler/client.c cups-1.5.3/scheduler/client.c --- cups-1.5.2/scheduler/client.c 2012-01-14 00:00:22.000000000 +0100 +++ cups-1.5.3/scheduler/client.c 2012-03-07 07:05:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: client.c 10178 2012-01-13 23:00:22Z mike $" + * "$Id: client.c 10338 2012-03-07 06:05:39Z mike $" * * Client routines for the CUPS scheduler. * @@ -4483,7 +4483,21 @@ return (0); } - cupsFilePrintf(fp, "%s\nr\n\ny\nb\ns\ny\n%s\n\n\n\n\n%s\ny\n", + cupsFilePrintf(fp, + "%s\n" /* Enter key and certificate label */ + "r\n" /* Generate RSA key pair */ + "2048\n" /* Key size in bits */ + "y\n" /* OK (y = yes) */ + "b\n" /* Usage (b=signing/encryption) */ + "s\n" /* Sign with SHA1 */ + "y\n" /* OK (y = yes) */ + "%s\n" /* Common name */ + "\n" /* Country (default) */ + "\n" /* Organization (default) */ + "\n" /* Organizational unit (default) */ + "\n" /* State/Province (default) */ + "%s\n" /* Email address */ + "y\n", /* OK (y = yes) */ servername, servername, ServerAdmin); cupsFileClose(fp); @@ -5186,5 +5200,5 @@ /* - * End of "$Id: client.c 10178 2012-01-13 23:00:22Z mike $". + * End of "$Id: client.c 10338 2012-03-07 06:05:39Z mike $". */ diff -Nru cups-1.5.2/scheduler/cups-driverd.cxx cups-1.5.3/scheduler/cups-driverd.cxx --- cups-1.5.2/scheduler/cups-driverd.cxx 2011-10-14 17:51:23.000000000 +0200 +++ cups-1.5.3/scheduler/cups-driverd.cxx 2012-02-13 23:48:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: cups-driverd.cxx 10070 2011-10-14 15:51:23Z mike $" + * "$Id: cups-driverd.cxx 10276 2012-02-13 22:48:22Z mike $" * * PPD/driver support for CUPS. * @@ -7,7 +7,7 @@ * created from driver information files, and dynamically generated PPD files * using driver helper programs. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -2294,17 +2294,19 @@ ppd->record.model_number = model_number; ppd->record.type = type; + strlcpy(ppd->record.filename, name, sizeof(ppd->record.filename)); strlcpy(ppd->record.name, name, sizeof(ppd->record.name)); - strlcpy(ppd->record.make, manufacturer, sizeof(ppd->record.make)); - strlcpy(ppd->record.make_and_model, make_model, - sizeof(ppd->record.make_and_model)); strlcpy(ppd->record.languages[0], lang_version, sizeof(ppd->record.languages[0])); strlcpy(ppd->record.products[0], (char *)cupsArrayFirst(products), sizeof(ppd->record.products[0])); strlcpy(ppd->record.psversions[0], (char *)cupsArrayFirst(psversions), sizeof(ppd->record.psversions[0])); + strlcpy(ppd->record.make, manufacturer, sizeof(ppd->record.make)); + strlcpy(ppd->record.make_and_model, make_model, + sizeof(ppd->record.make_and_model)); strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id)); + strlcpy(ppd->record.scheme, "file", sizeof(ppd->record.scheme)); } /* @@ -2580,5 +2582,5 @@ /* - * End of "$Id: cups-driverd.cxx 10070 2011-10-14 15:51:23Z mike $". + * End of "$Id: cups-driverd.cxx 10276 2012-02-13 22:48:22Z mike $". */ diff -Nru cups-1.5.2/scheduler/cups-lpd.c cups-1.5.3/scheduler/cups-lpd.c --- cups-1.5.2/scheduler/cups-lpd.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/scheduler/cups-lpd.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: cups-lpd.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: cups-lpd.c 10379 2012-03-23 22:16:22Z mike $" * * Line Printer Daemon interface for CUPS. * @@ -237,7 +237,7 @@ list = NULL; else { - for (list = dest + 1; *list && !isspace(*list & 255); list ++); + for (list = dest; *list && !isspace(*list & 255); list ++); while (isspace(*list & 255)) *list++ = '\0'; @@ -1623,5 +1623,5 @@ /* - * End of "$Id: cups-lpd.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: cups-lpd.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/scheduler/cups-polld.c cups-1.5.3/scheduler/cups-polld.c --- cups-1.5.2/scheduler/cups-polld.c 2011-05-07 01:07:28.000000000 +0200 +++ cups-1.5.3/scheduler/cups-polld.c 2012-03-02 19:26:30.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: cups-polld.c 9753 2011-05-06 23:07:28Z mike $" + * "$Id: cups-polld.c 10321 2012-03-02 18:26:30Z mike $" * * Polling daemon for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -291,6 +291,7 @@ fprintf(stderr, "ERROR: %s CUPS-Get-Printers failed: %s\n", prefix, cupsLastErrorString()); ippDelete(response); + restart_polling = 1; return (-1); } @@ -465,5 +466,5 @@ /* - * End of "$Id: cups-polld.c 9753 2011-05-06 23:07:28Z mike $". + * End of "$Id: cups-polld.c 10321 2012-03-02 18:26:30Z mike $". */ diff -Nru cups-1.5.2/scheduler/Dependencies cups-1.5.3/scheduler/Dependencies --- cups-1.5.2/scheduler/Dependencies 2011-05-12 07:46:30.000000000 +0200 +++ cups-1.5.3/scheduler/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,11 +3,11 @@ auth.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h auth.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h auth.o: ../cups/language.h ../cups/string-private.h ../config.h -auth.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -auth.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -auth.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -auth.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -auth.o: ../cups/thread-private.h ../cups/file-private.h +auth.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +auth.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +auth.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +auth.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +auth.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h auth.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h auth.o: statbuf.h cert.h auth.h client.h policy.h printers.h auth.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -15,23 +15,23 @@ banners.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h banners.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h banners.o: ../cups/language.h ../cups/string-private.h ../config.h -banners.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -banners.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -banners.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -banners.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -banners.o: ../cups/thread-private.h ../cups/file-private.h -banners.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h -banners.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -banners.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -banners.o: network.h subscriptions.h ../cups/dir.h +banners.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +banners.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +banners.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +banners.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +banners.o: ../cups/transcode.h ../cups/thread-private.h +banners.o: ../cups/file-private.h ../cups/cups-private.h mime.h +banners.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +banners.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +banners.o: conf.h banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h cert.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h cert.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h cert.o: ../cups/language.h ../cups/string-private.h ../config.h -cert.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -cert.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -cert.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -cert.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -cert.o: ../cups/thread-private.h ../cups/file-private.h +cert.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +cert.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +cert.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cert.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cert.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h cert.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h cert.o: statbuf.h cert.h auth.h client.h policy.h printers.h cert.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -39,23 +39,23 @@ classes.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h classes.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h classes.o: ../cups/language.h ../cups/string-private.h ../config.h -classes.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -classes.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -classes.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -classes.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -classes.o: ../cups/thread-private.h ../cups/file-private.h -classes.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h -classes.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -classes.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -classes.o: network.h subscriptions.h +classes.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +classes.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +classes.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +classes.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +classes.o: ../cups/transcode.h ../cups/thread-private.h +classes.o: ../cups/file-private.h ../cups/cups-private.h mime.h +classes.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +classes.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +classes.o: conf.h banners.h dirsvc.h network.h subscriptions.h client.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h client.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h client.o: ../cups/language.h ../cups/string-private.h ../config.h -client.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -client.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -client.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -client.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -client.o: ../cups/thread-private.h ../cups/file-private.h +client.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +client.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +client.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +client.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +client.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h client.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h client.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h client.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -63,11 +63,11 @@ conf.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h conf.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h conf.o: ../cups/language.h ../cups/string-private.h ../config.h -conf.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -conf.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -conf.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -conf.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -conf.o: ../cups/thread-private.h ../cups/file-private.h +conf.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +conf.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +conf.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +conf.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +conf.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h conf.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h conf.o: statbuf.h cert.h auth.h client.h policy.h printers.h conf.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -75,11 +75,11 @@ dirsvc.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h dirsvc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h dirsvc.o: ../cups/language.h ../cups/string-private.h ../config.h -dirsvc.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -dirsvc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -dirsvc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -dirsvc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -dirsvc.o: ../cups/thread-private.h ../cups/file-private.h +dirsvc.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +dirsvc.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +dirsvc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +dirsvc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +dirsvc.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h dirsvc.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h dirsvc.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h dirsvc.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -87,22 +87,23 @@ env.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h env.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h env.o: ../cups/language.h ../cups/string-private.h ../config.h -env.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -env.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -env.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -env.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -env.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h -env.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h -env.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -env.o: conf.h banners.h dirsvc.h network.h subscriptions.h +env.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +env.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +env.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +env.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +env.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h +env.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +env.o: statbuf.h cert.h auth.h client.h policy.h printers.h +env.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +env.o: network.h subscriptions.h file.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h file.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h file.o: ../cups/language.h ../cups/string-private.h ../config.h -file.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -file.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -file.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -file.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -file.o: ../cups/thread-private.h ../cups/file-private.h +file.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +file.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +file.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +file.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +file.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h file.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h file.o: statbuf.h cert.h auth.h client.h policy.h printers.h file.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -110,11 +111,11 @@ main.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h main.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h main.o: ../cups/language.h ../cups/string-private.h ../config.h -main.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -main.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -main.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -main.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -main.o: ../cups/thread-private.h ../cups/file-private.h +main.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +main.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +main.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +main.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +main.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h main.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h main.o: statbuf.h cert.h auth.h client.h policy.h printers.h main.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -122,23 +123,23 @@ ipp.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h ipp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h ipp.o: ../cups/language.h ../cups/string-private.h ../config.h -ipp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ipp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ipp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ipp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -ipp.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h -ipp.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h -ipp.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -ipp.o: conf.h banners.h dirsvc.h network.h subscriptions.h -ipp.o: ../cups/ppd-private.h +ipp.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +ipp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +ipp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ipp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ipp.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h +ipp.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +ipp.o: statbuf.h cert.h auth.h client.h policy.h printers.h +ipp.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +ipp.o: network.h subscriptions.h ../cups/ppd-private.h listen.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h listen.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h listen.o: ../cups/language.h ../cups/string-private.h ../config.h -listen.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -listen.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -listen.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -listen.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -listen.o: ../cups/thread-private.h ../cups/file-private.h +listen.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +listen.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +listen.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +listen.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +listen.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h listen.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h listen.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h listen.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -146,47 +147,48 @@ job.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h job.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h job.o: ../cups/language.h ../cups/string-private.h ../config.h -job.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -job.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -job.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -job.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -job.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h -job.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h -job.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -job.o: conf.h banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h -job.o: ../cups/dir.h +job.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +job.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +job.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +job.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +job.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h +job.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +job.o: statbuf.h cert.h auth.h client.h policy.h printers.h +job.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +job.o: network.h subscriptions.h ../cups/backend.h ../cups/dir.h log.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h log.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h log.o: ../cups/language.h ../cups/string-private.h ../config.h -log.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -log.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -log.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -log.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -log.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h -log.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h -log.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -log.o: conf.h banners.h dirsvc.h network.h subscriptions.h +log.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +log.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +log.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +log.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +log.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h +log.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +log.o: statbuf.h cert.h auth.h client.h policy.h printers.h +log.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +log.o: network.h subscriptions.h network.o: ../cups/http-private.h ../config.h ../cups/http.h network.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h network.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h network.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h network.o: ../cups/language.h ../cups/string-private.h -network.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -network.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -network.o: ../cups/language-private.h ../cups/transcode.h -network.o: ../cups/thread-private.h ../cups/file-private.h -network.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h -network.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -network.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -network.o: network.h subscriptions.h +network.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +network.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +network.o: ../cups/http-private.h ../cups/language-private.h +network.o: ../cups/transcode.h ../cups/thread-private.h +network.o: ../cups/file-private.h ../cups/cups-private.h mime.h +network.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +network.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +network.o: conf.h banners.h dirsvc.h network.h subscriptions.h policy.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h policy.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h policy.o: ../cups/language.h ../cups/string-private.h ../config.h -policy.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -policy.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -policy.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -policy.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -policy.o: ../cups/thread-private.h ../cups/file-private.h +policy.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +policy.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +policy.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +policy.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +policy.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h policy.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h policy.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h policy.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -194,10 +196,11 @@ printers.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h printers.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h printers.o: ../cups/language.h ../cups/string-private.h ../config.h -printers.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -printers.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -printers.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -printers.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +printers.o: ../cups/debug-private.h ../cups/versioning.h +printers.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +printers.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +printers.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +printers.o: ../cups/language-private.h ../cups/transcode.h printers.o: ../cups/thread-private.h ../cups/file-private.h printers.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h printers.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h @@ -206,23 +209,23 @@ process.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h process.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h process.o: ../cups/language.h ../cups/string-private.h ../config.h -process.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -process.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -process.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -process.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -process.o: ../cups/thread-private.h ../cups/file-private.h -process.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h -process.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -process.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -process.o: network.h subscriptions.h +process.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +process.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +process.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +process.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +process.o: ../cups/transcode.h ../cups/thread-private.h +process.o: ../cups/file-private.h ../cups/cups-private.h mime.h +process.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +process.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +process.o: conf.h banners.h dirsvc.h network.h subscriptions.h quotas.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h quotas.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h quotas.o: ../cups/language.h ../cups/string-private.h ../config.h -quotas.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -quotas.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -quotas.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -quotas.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -quotas.o: ../cups/thread-private.h ../cups/file-private.h +quotas.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +quotas.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +quotas.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +quotas.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +quotas.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h quotas.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h quotas.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h quotas.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -230,11 +233,11 @@ select.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h select.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h select.o: ../cups/language.h ../cups/string-private.h ../config.h -select.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -select.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -select.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -select.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -select.o: ../cups/thread-private.h ../cups/file-private.h +select.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +select.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +select.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +select.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +select.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h select.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h select.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h select.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h @@ -244,8 +247,8 @@ server.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h server.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h server.o: ../cups/language.h ../cups/string-private.h ../cups/debug-private.h -server.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h -server.o: ../cups/pwg-private.h ../cups/http-private.h +server.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h +server.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h server.o: ../cups/language-private.h ../cups/transcode.h server.o: ../cups/thread-private.h ../cups/file-private.h server.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h @@ -255,22 +258,22 @@ statbuf.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h statbuf.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h statbuf.o: ../cups/language.h ../cups/string-private.h ../config.h -statbuf.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -statbuf.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -statbuf.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -statbuf.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -statbuf.o: ../cups/thread-private.h ../cups/file-private.h -statbuf.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h -statbuf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -statbuf.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -statbuf.o: network.h subscriptions.h +statbuf.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +statbuf.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +statbuf.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +statbuf.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +statbuf.o: ../cups/transcode.h ../cups/thread-private.h +statbuf.o: ../cups/file-private.h ../cups/cups-private.h mime.h +statbuf.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +statbuf.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +statbuf.o: conf.h banners.h dirsvc.h network.h subscriptions.h subscriptions.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h subscriptions.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h subscriptions.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -subscriptions.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -subscriptions.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -subscriptions.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -subscriptions.o: ../cups/ipp-private.h ../cups/ipp.h +subscriptions.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +subscriptions.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +subscriptions.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +subscriptions.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h subscriptions.o: ../cups/language-private.h ../cups/transcode.h subscriptions.o: ../cups/thread-private.h ../cups/file-private.h subscriptions.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h @@ -280,52 +283,57 @@ sysman.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h sysman.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h sysman.o: ../cups/language.h ../cups/string-private.h ../config.h -sysman.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -sysman.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -sysman.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -sysman.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -sysman.o: ../cups/thread-private.h ../cups/file-private.h +sysman.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +sysman.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +sysman.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +sysman.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +sysman.o: ../cups/transcode.h ../cups/thread-private.h ../cups/file-private.h sysman.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h sysman.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h sysman.o: network.h subscriptions.h -filter.o: ../cups/string-private.h ../config.h ../cups/debug-private.h mime.h -filter.o: ../cups/array.h ../cups/ipp.h ../cups/file.h +filter.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +filter.o: ../cups/versioning.h mime.h ../cups/array.h ../cups/ipp.h +filter.o: ../cups/file.h mime.o: ../cups/string-private.h ../config.h ../cups/debug-private.h -mime.o: ../cups/dir.h ../cups/versioning.h mime-private.h mime.h -mime.o: ../cups/array.h ../cups/ipp.h ../cups/file.h -type.o: ../cups/string-private.h ../config.h ../cups/debug-private.h mime.h -type.o: ../cups/array.h ../cups/ipp.h ../cups/file.h +mime.o: ../cups/versioning.h ../cups/dir.h ../cups/versioning.h +mime.o: mime-private.h mime.h ../cups/array.h ../cups/ipp.h ../cups/file.h +type.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +type.o: ../cups/versioning.h mime.h ../cups/array.h ../cups/ipp.h +type.o: ../cups/file.h cupsfilter.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cupsfilter.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h cupsfilter.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -cupsfilter.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -cupsfilter.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -cupsfilter.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -cupsfilter.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -cupsfilter.o: ../cups/transcode.h ../cups/thread-private.h -cupsfilter.o: ../cups/file-private.h ../cups/cups-private.h -cupsfilter.o: ../cups/ppd-private.h mime.h ../cups/array.h ../cups/file.h +cupsfilter.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +cupsfilter.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cupsfilter.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cupsfilter.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cupsfilter.o: ../cups/language-private.h ../cups/transcode.h +cupsfilter.o: ../cups/thread-private.h ../cups/file-private.h +cupsfilter.o: ../cups/cups-private.h ../cups/ppd-private.h mime.h +cupsfilter.o: ../cups/array.h ../cups/file.h cups-deviced.o: util.h ../cups/array-private.h ../cups/array.h -cups-deviced.o: ../cups/versioning.h ../cups/file-private.h -cups-deviced.o: ../cups/cups-private.h ../cups/array.h ../cups/dir.h +cups-deviced.o: ../cups/file-private.h ../cups/cups-private.h ../cups/dir.h +cups-deviced.o: ../cups/versioning.h cups-exec.o: ../cups/string-private.h ../config.h cups-lpd.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cups-lpd.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h cups-lpd.o: ../cups/language.h ../cups/string-private.h ../config.h -cups-lpd.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -cups-lpd.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -cups-lpd.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -cups-lpd.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +cups-lpd.o: ../cups/debug-private.h ../cups/versioning.h +cups-lpd.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cups-lpd.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cups-lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cups-lpd.o: ../cups/language-private.h ../cups/transcode.h cups-lpd.o: ../cups/thread-private.h cups-polld.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cups-polld.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h cups-polld.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -cups-polld.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -cups-polld.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -cups-polld.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -cups-polld.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -cups-polld.o: ../cups/transcode.h ../cups/thread-private.h +cups-polld.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +cups-polld.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cups-polld.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cups-polld.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cups-polld.o: ../cups/language-private.h ../cups/transcode.h +cups-polld.o: ../cups/thread-private.h testdirsvc.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h testdirsvc.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h testdirsvc.o: ../cups/string-private.h ../config.h @@ -333,20 +341,21 @@ testlpd.o: ../cups/http.h ../cups/array.h ../cups/language.h testlpd.o: ../cups/string-private.h ../config.h testmime.o: ../cups/string-private.h ../config.h ../cups/dir.h -testmime.o: ../cups/versioning.h ../cups/debug-private.h +testmime.o: ../cups/versioning.h ../cups/debug-private.h ../cups/versioning.h testmime.o: ../cups/ppd-private.h mime.h ../cups/array.h ../cups/ipp.h testmime.o: ../cups/file.h testspeed.o: ../cups/string-private.h ../config.h ../cups/cups.h testspeed.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h testspeed.o: ../cups/array.h ../cups/language.h ../cups/language.h -testspeed.o: ../cups/debug-private.h +testspeed.o: ../cups/debug-private.h ../cups/versioning.h testsub.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h testsub.o: ../cups/http.h ../cups/array.h ../cups/language.h -testsub.o: ../cups/debug-private.h ../cups/string-private.h ../config.h -util.o: util.h ../cups/array-private.h ../cups/array.h ../cups/versioning.h -util.o: ../cups/file-private.h ../cups/cups-private.h +testsub.o: ../cups/debug-private.h ../cups/versioning.h +testsub.o: ../cups/string-private.h ../config.h +util.o: util.h ../cups/array-private.h ../cups/array.h ../cups/file-private.h +util.o: ../cups/cups-private.h cups-driverd.o: util.h ../cups/array-private.h ../cups/array.h -cups-driverd.o: ../cups/versioning.h ../cups/file-private.h -cups-driverd.o: ../cups/cups-private.h ../cups/dir.h ../cups/transcode.h -cups-driverd.o: ../cups/language.h ../cups/ppd-private.h ../ppdc/ppdc.h +cups-driverd.o: ../cups/file-private.h ../cups/cups-private.h ../cups/dir.h +cups-driverd.o: ../cups/versioning.h ../cups/transcode.h ../cups/language.h +cups-driverd.o: ../cups/array.h ../cups/ppd-private.h ../ppdc/ppdc.h cups-driverd.o: ../cups/file.h diff -Nru cups-1.5.2/scheduler/dirsvc.c cups-1.5.3/scheduler/dirsvc.c --- cups-1.5.2/scheduler/dirsvc.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/scheduler/dirsvc.c 2012-02-11 03:05:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: dirsvc.c 10243 2012-02-11 02:05:21Z mike $" * * Directory services routines for the CUPS scheduler. * @@ -2311,7 +2311,8 @@ void *context) /* I - Unused */ { char valueStr[1024], /* Domain string */ - hostname[1024]; /* Complete hostname */ + hostname[1024], /* Complete hostname */ + *hostptr; /* Pointer into hostname */ (void)key; @@ -2322,6 +2323,10 @@ kCFStringEncodingUTF8)) { snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDHostName, valueStr); + hostptr = hostname + strlen(hostname) - 1; + if (*hostptr == '.') + *hostptr = '\0'; /* Strip trailing dot */ + if (!DNSSDAlias) DNSSDAlias = cupsArrayNew(NULL, NULL); @@ -5575,5 +5580,5 @@ /* - * End of "$Id: dirsvc.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: dirsvc.c 10243 2012-02-11 02:05:21Z mike $". */ diff -Nru cups-1.5.2/scheduler/ipp.c cups-1.5.3/scheduler/ipp.c --- cups-1.5.2/scheduler/ipp.c 2011-11-07 07:08:44.000000000 +0100 +++ cups-1.5.3/scheduler/ipp.c 2012-02-13 21:42:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 10112 2011-11-07 06:08:44Z mike $" + * "$Id: ipp.c 10274 2012-02-13 20:42:51Z mike $" * * IPP routines for the CUPS scheduler. * @@ -4106,7 +4106,6 @@ { cupsd_printer_t *printer; /* Job destination */ - /* * No auth data. If we need to authenticate via Kerberos, send a * HTTP auth challenge, otherwise just return an IPP error... @@ -10363,6 +10362,8 @@ fchown(cupsFileNumber(fp), 0, 0); fchmod(cupsFileNumber(fp), 0400); + cupsFilePuts(fp, "CUPSD-AUTH-V2\n"); + for (i = 0; i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])); i ++) @@ -10381,7 +10382,7 @@ { httpEncode64_2(line, sizeof(line), auth_info->values[i].string.text, strlen(auth_info->values[i].string.text)); - cupsFilePrintf(fp, "%s\n", line); + cupsFilePutConf(fp, dest->auth_info_required[i], line); if (!strcmp(dest->auth_info_required[i], "username")) cupsdSetStringf(job->auth_env + i, "AUTH_USERNAME=%s", @@ -10396,11 +10397,31 @@ cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", auth_info->values[i].string.text); else - cupsdSetStringf(job->auth_env + i, "AUTH_%s=%s", - dest->auth_info_required[i], - auth_info->values[i].string.text); + i --; } } + else if (auth_info && auth_info->num_values == 2 && + dest->num_auth_info_required == 1 && + !strcmp(dest->auth_info_required[0], "negotiate")) + { + /* + * Allow fallback to username+password for Kerberized queues... + */ + + httpEncode64_2(line, sizeof(line), auth_info->values[0].string.text, + strlen(auth_info->values[0].string.text)); + cupsFilePutConf(fp, "username", line); + + cupsdSetStringf(job->auth_env + 0, "AUTH_USERNAME=%s", + auth_info->values[0].string.text); + + httpEncode64_2(line, sizeof(line), auth_info->values[1].string.text, + strlen(auth_info->values[1].string.text)); + cupsFilePutConf(fp, "password", line); + + cupsdSetStringf(job->auth_env + 1, "AUTH_PASSWORD=%s", + auth_info->values[1].string.text); + } else if (con->username[0]) { /* @@ -10408,7 +10429,7 @@ */ httpEncode64_2(line, sizeof(line), con->username, strlen(con->username)); - cupsFilePrintf(fp, "%s\n", line); + cupsFilePutConf(fp, "username", line); cupsdSetStringf(job->auth_env + 0, "AUTH_USERNAME=%s", con->username); @@ -10417,7 +10438,7 @@ */ httpEncode64_2(line, sizeof(line), con->password, strlen(con->password)); - cupsFilePrintf(fp, "%s\n", line); + cupsFilePutConf(fp, "password", line); cupsdSetStringf(job->auth_env + 1, "AUTH_PASSWORD=%s", con->password); } @@ -10425,7 +10446,7 @@ #ifdef HAVE_GSSAPI if (con->gss_uid > 0) { - cupsFilePrintf(fp, "%d\n", (int)con->gss_uid); + cupsFilePrintf(fp, "uid %d\n", (int)con->gss_uid); cupsdSetStringf(&job->auth_uid, "AUTH_UID=%d", (int)con->gss_uid); } #endif /* HAVE_GSSAPI */ @@ -12278,5 +12299,5 @@ /* - * End of "$Id: ipp.c 10112 2011-11-07 06:08:44Z mike $". + * End of "$Id: ipp.c 10274 2012-02-13 20:42:51Z mike $". */ diff -Nru cups-1.5.2/scheduler/job.c cups-1.5.3/scheduler/job.c --- cups-1.5.2/scheduler/job.c 2011-09-02 20:14:34.000000000 +0200 +++ cups-1.5.3/scheduler/job.c 2012-04-20 05:01:06.000000000 +0200 @@ -1,9 +1,9 @@ /* - * "$Id: job.c 9955 2011-09-02 18:14:34Z mike $" + * "$Id: job.c 10420 2012-04-20 03:01:06Z mike $" * * Job management routines for the CUPS scheduler. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -1815,32 +1815,52 @@ if ((fp = cupsFileOpen(jobfile, "r")) != NULL) { - int bytes; /* Size of auth data */ + int bytes, /* Size of auth data */ + linenum = 1; /* Current line number */ char line[65536], /* Line from file */ + *value, /* Value from line */ data[65536]; /* Decoded data */ - for (i = 0; - i < destptr->num_auth_info_required && - i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])) && - cupsFileGets(fp, line, sizeof(line)); - i ++) + if (cupsFileGets(fp, line, sizeof(line)) && + !strcmp(line, "CUPSD-AUTH-V2")) { - bytes = sizeof(data); - httpDecode64_2(data, &bytes, line); + i = 0; + while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) + { + /* + * Decode value... + */ - if (!strcmp(destptr->auth_info_required[i], "username")) - cupsdSetStringf(job->auth_env + i, "AUTH_USERNAME=%s", data); - else if (!strcmp(destptr->auth_info_required[i], "domain")) - cupsdSetStringf(job->auth_env + i, "AUTH_DOMAIN=%s", data); - else if (!strcmp(destptr->auth_info_required[i], "password")) - cupsdSetStringf(job->auth_env + i, "AUTH_PASSWORD=%s", data); - else if (!strcmp(destptr->auth_info_required[i], "negotiate")) - cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", line); - } + bytes = sizeof(data); + httpDecode64_2(data, &bytes, value); + + /* + * Assign environment variables... + */ + + if (!strcmp(line, "uid")) + { + cupsdSetStringf(&job->auth_uid, "AUTH_UID=%s", value); + continue; + } + else if (i >= (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0]))) + break; + + if (!strcmp(line, "username")) + cupsdSetStringf(job->auth_env + i, "AUTH_USERNAME=%s", data); + else if (!strcmp(line, "domain")) + cupsdSetStringf(job->auth_env + i, "AUTH_DOMAIN=%s", data); + else if (!strcmp(line, "password")) + cupsdSetStringf(job->auth_env + i, "AUTH_PASSWORD=%s", data); + else if (!strcmp(line, "negotiate")) + cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", data); + else + continue; - if (cupsFileGets(fp, line, sizeof(line)) && isdigit(line[0] & 255)) - cupsdSetStringf(&job->auth_uid, "AUTH_UID=%s", line); + i ++; + } + } cupsFileClose(fp); } @@ -3306,9 +3326,6 @@ if ((ppd = _ppdCacheGetInputSlot(pc, job->attrs, NULL)) != NULL) num_pwgppds = cupsAddOption(pc->source_option, ppd, num_pwgppds, &pwgppds); - else if (!ippFindAttribute(job->attrs, "AP_D_InputSlot", IPP_TAG_ZERO)) - num_pwgppds = cupsAddOption("AP_D_InputSlot", "", num_pwgppds, - &pwgppds); } if (!ippFindAttribute(job->attrs, "MediaType", IPP_TAG_ZERO) && (ppd = _ppdCacheGetMediaType(pc, job->attrs, NULL)) != NULL) @@ -3356,6 +3373,14 @@ num_pwgppds = cupsAddOption(pc->sides_option, pc->sides_2sided_short, num_pwgppds, &pwgppds); } + + /* + * Map finishings values... + */ + + num_pwgppds = _ppdCacheGetFinishingOptions(pc, job->attrs, + IPP_FINISHINGS_NONE, num_pwgppds, + &pwgppds); } /* @@ -4116,6 +4141,10 @@ if (!cupsdLoadJob(job)) return; + if (!job->printer_message) + job->printer_message = ippFindAttribute(job->attrs, + "job-printer-state-message", + IPP_TAG_TEXT); if (job->printer_message) cupsdSetString(&(job->printer_message->values[0].string.text), ""); @@ -4743,5 +4772,5 @@ /* - * End of "$Id: job.c 9955 2011-09-02 18:14:34Z mike $". + * End of "$Id: job.c 10420 2012-04-20 03:01:06Z mike $". */ diff -Nru cups-1.5.2/scheduler/network.c cups-1.5.3/scheduler/network.c --- cups-1.5.2/scheduler/network.c 2011-04-16 01:38:13.000000000 +0200 +++ cups-1.5.3/scheduler/network.c 2012-03-23 23:16:22.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: network.c 9691 2011-04-15 23:38:13Z mike $" + * "$Id: network.c 10379 2012-03-23 22:16:22Z mike $" * * Network interface functions for the CUPS scheduler. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -166,7 +166,7 @@ */ if (httpAddrLocalhost((http_addr_t *)(addr->ifa_addr))) - strcpy(hostname, "localhost"); + strlcpy(hostname, "localhost", sizeof(hostname)); else httpAddrString((http_addr_t *)(addr->ifa_addr), hostname, sizeof(hostname)); @@ -186,7 +186,7 @@ strlcpy(temp->name, addr->ifa_name, sizeof(temp->name)); temp->hostlen = hostlen; - strcpy(temp->hostname, hostname); /* Safe because hostname is allocated */ + memcpy(temp->hostname, hostname, hostlen + 1); if (addr->ifa_addr->sa_family == AF_INET) { @@ -296,5 +296,5 @@ /* - * End of "$Id: network.c 9691 2011-04-15 23:38:13Z mike $". + * End of "$Id: network.c 10379 2012-03-23 22:16:22Z mike $". */ diff -Nru cups-1.5.2/scheduler/printers.c cups-1.5.3/scheduler/printers.c --- cups-1.5.2/scheduler/printers.c 2011-09-15 00:38:58.000000000 +0200 +++ cups-1.5.3/scheduler/printers.c 2012-02-16 00:21:06.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: printers.c 10001 2011-09-14 22:38:58Z mike $" + * "$Id: printers.c 10295 2012-02-15 23:21:06Z mike $" * * Printer routines for the CUPS scheduler. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -1981,7 +1981,9 @@ ipp_attribute_t *attr; /* Attribute */ int i, /* Looping var */ count; /* Number of values */ - char *ptr; /* Pointer into value */ + char *ptr, /* Pointer into value */ + *start, /* Start of value */ + quote; /* Quote character */ ipp_tag_t value_tag; /* Value tag for this attribute */ @@ -1999,9 +2001,21 @@ * Count the number of values... */ - for (count = 1, ptr = value; - (ptr = strchr(ptr, ',')) != NULL; - ptr ++, count ++); + for (count = 1, quote = '\0', ptr = value; + *ptr; + ptr ++) + { + if (*ptr == quote) + quote = '\0'; + else if (quote) + continue; + else if (*ptr == '\\' && ptr[1]) + ptr ++; + else if (*ptr == '\'' || *ptr == '\"') + quote = *ptr; + else if (*ptr == ',') + count ++; + } /* * Then add or update the attribute as needed... @@ -2085,15 +2099,33 @@ return; } - for (i = 0; i < count; i ++) + for (i = 0, quote = '\0', ptr = value; i < count; i ++) { - if ((ptr = strchr(value, ',')) != NULL) - *ptr++ = '\0'; + for (start = ptr; *ptr; ptr ++) + { + if (*ptr == quote) + *ptr = quote = '\0'; + else if (quote) + continue; + else if (*ptr == '\\' && ptr[1]) + _cups_strcpy(ptr, ptr + 1); + else if (*ptr == '\'' || *ptr == '\"') + { + quote = *ptr; - attr->values[i].string.text = _cupsStrAlloc(value); + if (ptr == start) + start ++; + else + _cups_strcpy(ptr, ptr + 1); + } + else if (*ptr == ',') + { + *ptr++ = '\0'; + break; + } + } - if (ptr) - value = ptr; + attr->values[i].string.text = _cupsStrAlloc(start); } } } @@ -5496,5 +5528,5 @@ /* - * End of "$Id: printers.c 10001 2011-09-14 22:38:58Z mike $". + * End of "$Id: printers.c 10295 2012-02-15 23:21:06Z mike $". */ diff -Nru cups-1.5.2/scheduler/subscriptions.c cups-1.5.3/scheduler/subscriptions.c --- cups-1.5.2/scheduler/subscriptions.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.3/scheduler/subscriptions.c 2012-02-12 06:48:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: subscriptions.c 10262 2012-02-12 05:48:09Z mike $" * * Subscription routines for the CUPS scheduler. * @@ -146,7 +146,11 @@ temp->time = time(NULL); temp->attrs = ippNew(); temp->job = job; - temp->dest = dest; + + if (dest) + temp->dest = dest; + else if (job) + temp->dest = dest = cupsdFindPrinter(job->dest); /* * Add common event notification attributes... @@ -1634,5 +1638,5 @@ /* - * End of "$Id: subscriptions.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: subscriptions.c 10262 2012-02-12 05:48:09Z mike $". */ diff -Nru cups-1.5.2/scheduler/sysman.c cups-1.5.3/scheduler/sysman.c --- cups-1.5.2/scheduler/sysman.c 2011-06-11 01:41:28.000000000 +0200 +++ cups-1.5.3/scheduler/sysman.c 2012-02-13 21:30:23.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: sysman.c 9824 2011-06-10 23:41:28Z mike $" + * "$Id: sysman.c 10273 2012-02-13 20:30:23Z mike $" * * System management functions for the CUPS scheduler. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -266,8 +266,8 @@ # define SYSEVENT_NAMECHANGED 0x10 /* Computer name changed */ -/* - * Structures... +/* + * Structures... */ typedef struct cupsd_sysevent_s /*** System event data ****/ @@ -286,14 +286,14 @@ } cupsd_thread_data_t; -/* - * Local globals... +/* + * Local globals... */ static pthread_t SysEventThread = NULL; /* Thread to host a runloop */ static pthread_mutex_t SysEventThreadMutex = { 0 }; - /* Coordinates access to shared gloabals */ + /* Coordinates access to shared gloabals */ static pthread_cond_t SysEventThreadCond = { 0 }; /* Thread initialization complete condition */ static CFRunLoopRef SysEventRunloop = NULL; @@ -316,8 +316,8 @@ static cupsd_sysevent_t LastSysEvent; /* Last system event (for delayed sleep) */ -/* - * Local functions... +/* + * Local functions... */ static void *sysEventThreadEntry(void); @@ -499,8 +499,8 @@ kSCEntNetIPv6); if (!NetworkGlobalKeyDNS) - NetworkGlobalKeyDNS = - SCDynamicStoreKeyCreateNetworkGlobalEntity(kCFAllocatorDefault, + NetworkGlobalKeyDNS = + SCDynamicStoreKeyCreateNetworkGlobalEntity(kCFAllocatorDefault, kSCDynamicStoreDomainState, kSCEntNetDNS); @@ -582,7 +582,7 @@ threadData.timerRef = CFRunLoopTimerCreate(kCFAllocatorDefault, - CFAbsoluteTimeGetCurrent() + (86400L * 365L * 10L), + CFAbsoluteTimeGetCurrent() + (86400L * 365L * 10L), 86400L * 365L * 10L, 0, 0, sysEventTimerNotifier, &timerContext); CFRunLoopAddTimer(CFRunLoopGetCurrent(), threadData.timerRef, @@ -674,7 +674,7 @@ break; case kIOMessageSystemHasPoweredOn: - /* + /* * Because powered on is followed by a net-changed event, delay * before sending it. */ @@ -702,7 +702,7 @@ if (sendit == 1) { - /* + /* * Send the event to the main thread now. */ @@ -712,7 +712,7 @@ } else { - /* + /* * Send the event to the main thread after 1 to 2 seconds. */ @@ -738,7 +738,7 @@ threadData = (cupsd_thread_data_t *)context; - + (void)store; /* anti-compiler-warning-code */ CFRange range = CFRangeMake(0, CFArrayGetCount(changedKeys)); @@ -758,12 +758,12 @@ } /* - * Because we registered for several different kinds of change notifications - * this callback usually gets called several times in a row. We use a timer to + * Because we registered for several different kinds of change notifications + * this callback usually gets called several times in a row. We use a timer to * de-bounce these so we only end up generating one event for the main thread. */ - CFRunLoopTimerSetNextFireDate(threadData->timerRef, + CFRunLoopTimerSetNextFireDate(threadData->timerRef, CFAbsoluteTimeGetCurrent() + 5); } @@ -885,13 +885,18 @@ #ifdef kIOPMAssertionTypeDenySystemSleep /* - * Tell the OS it is OK to sleep when we remove our assertion... + * Remove our assertion as needed since the user wants the system to + * sleep (different than idle sleep)... */ - IOAllowPowerChange(sysevent.powerKernelPort, - sysevent.powerNotificationID); + if (dark_wake) + { + cupsdLogMessage(CUPSD_LOG_DEBUG, "Releasing dark wake assertion."); + IOPMAssertionRelease(dark_wake); + dark_wake = 0; + } +#endif /* kIOPMAssertionTypeDenySystemSleep */ -#else /* * If we have no printing jobs, allow the power change immediately. * Otherwise set the SleepJobs time to 15 seconds in the future when @@ -935,7 +940,6 @@ sysevent.powerNotificationID); } } -#endif /* kIOPMAssertionTypeDenySystemSleep */ } if (sysevent.event & SYSEVENT_WOKE) @@ -944,6 +948,17 @@ IOAllowPowerChange(sysevent.powerKernelPort, sysevent.powerNotificationID); Sleeping = 0; + +#ifdef kIOPMAssertionTypeDenySystemSleep + if (cupsArrayCount(PrintingJobs) > 0 && !dark_wake) + { + cupsdLogMessage(CUPSD_LOG_DEBUG, "Asserting dark wake."); + IOPMAssertionCreateWithName(kIOPMAssertionTypeDenySystemSleep, + kIOPMAssertionLevelOn, + CFSTR("org.cups.cupsd"), &dark_wake); + } +#endif /* kIOPMAssertionTypeDenySystemSleep */ + cupsdCheckJobs(); } @@ -1018,5 +1033,5 @@ /* - * End of "$Id: sysman.c 9824 2011-06-10 23:41:28Z mike $". + * End of "$Id: sysman.c 10273 2012-02-13 20:30:23Z mike $". */ diff -Nru cups-1.5.2/scripting/php/Dependencies cups-1.5.3/scripting/php/Dependencies --- cups-1.5.2/scripting/php/Dependencies 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/scripting/php/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -4,4 +4,4 @@ phpcups.o: ../../cups/cups.h ../../cups/file.h ../../cups/versioning.h phpcups.o: ../../cups/ipp.h ../../cups/http.h ../../cups/array.h phpcups.o: ../../cups/language.h ../../cups/language.h -phpcups.o: ../../cups/debug-private.h +phpcups.o: ../../cups/debug-private.h ../../cups/versioning.h diff -Nru cups-1.5.2/systemv/cupstestppd.c cups-1.5.3/systemv/cupstestppd.c --- cups-1.5.2/systemv/cupstestppd.c 2011-10-03 19:32:43.000000000 +0200 +++ cups-1.5.3/systemv/cupstestppd.c 2012-03-19 16:31:53.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: cupstestppd.c 10042 2011-10-03 17:32:43Z mike $" + * "$Id: cupstestppd.c 10362 2012-03-19 15:31:53Z mike $" * * PPD test program for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -1067,7 +1067,7 @@ * Check for PaperDimension... */ - if (size->width == 0.0 && size->length == 0.0) + if (size->width <= 0.0 && size->length <= 0.0) { if (verbose >= 0) { @@ -3120,8 +3120,9 @@ continue; } - else if (warn != 2 && size->name[0] == 'w' && - sscanf(size->name, "w%dh%d", &width, &length) == 2) + + if (warn != 2 && size->name[0] == 'w' && + sscanf(size->name, "w%dh%d", &width, &length) == 2) { /* * Validate device-specific size wNNNhNNN should have proper width and @@ -3262,7 +3263,8 @@ * Check for EnvSizeName as well... */ - snprintf(buf, sizeof(buf), "Env%s", pwg_media->ppd); + if (strncmp(pwg_media->ppd, "Env", 3)) + snprintf(buf, sizeof(buf), "Env%s", pwg_media->ppd); if (strcmp(size->name, buf)) is_ok = 0; @@ -3952,5 +3954,5 @@ /* - * End of "$Id: cupstestppd.c 10042 2011-10-03 17:32:43Z mike $". + * End of "$Id: cupstestppd.c 10362 2012-03-19 15:31:53Z mike $". */ diff -Nru cups-1.5.2/systemv/Dependencies cups-1.5.3/systemv/Dependencies --- cups-1.5.2/systemv/Dependencies 2010-08-10 02:02:02.000000000 +0200 +++ cups-1.5.3/systemv/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,106 +3,111 @@ cancel.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cancel.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h cancel.o: ../cups/language.h ../cups/string-private.h ../config.h -cancel.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -cancel.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -cancel.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -cancel.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -cancel.o: ../cups/thread-private.h +cancel.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +cancel.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +cancel.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cancel.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cancel.o: ../cups/transcode.h ../cups/thread-private.h cupsaccept.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cupsaccept.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h cupsaccept.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -cupsaccept.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -cupsaccept.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -cupsaccept.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -cupsaccept.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -cupsaccept.o: ../cups/transcode.h ../cups/thread-private.h +cupsaccept.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +cupsaccept.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cupsaccept.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cupsaccept.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cupsaccept.o: ../cups/language-private.h ../cups/transcode.h +cupsaccept.o: ../cups/thread-private.h cupsaddsmb.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cupsaddsmb.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h cupsaddsmb.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -cupsaddsmb.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -cupsaddsmb.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -cupsaddsmb.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -cupsaddsmb.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -cupsaddsmb.o: ../cups/transcode.h ../cups/thread-private.h -cupsaddsmb.o: ../cups/adminutil.h +cupsaddsmb.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +cupsaddsmb.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cupsaddsmb.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cupsaddsmb.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cupsaddsmb.o: ../cups/language-private.h ../cups/transcode.h +cupsaddsmb.o: ../cups/thread-private.h ../cups/adminutil.h cupsctl.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cupsctl.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h cupsctl.o: ../cups/language.h ../cups/string-private.h ../config.h -cupsctl.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -cupsctl.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -cupsctl.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -cupsctl.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -cupsctl.o: ../cups/thread-private.h ../cups/adminutil.h +cupsctl.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +cupsctl.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +cupsctl.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cupsctl.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cupsctl.o: ../cups/transcode.h ../cups/thread-private.h ../cups/adminutil.h cupstestdsc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cupstestdsc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h cupstestdsc.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -cupstestdsc.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -cupstestdsc.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -cupstestdsc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -cupstestdsc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -cupstestdsc.o: ../cups/transcode.h ../cups/thread-private.h +cupstestdsc.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +cupstestdsc.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cupstestdsc.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cupstestdsc.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cupstestdsc.o: ../cups/language-private.h ../cups/transcode.h +cupstestdsc.o: ../cups/thread-private.h cupstestppd.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h cupstestppd.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h cupstestppd.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -cupstestppd.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -cupstestppd.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -cupstestppd.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -cupstestppd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -cupstestppd.o: ../cups/transcode.h ../cups/thread-private.h ../cups/dir.h -cupstestppd.o: ../cups/ppd-private.h ../cups/raster.h ../cups/ppd.h +cupstestppd.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +cupstestppd.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +cupstestppd.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +cupstestppd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cupstestppd.o: ../cups/language-private.h ../cups/transcode.h +cupstestppd.o: ../cups/thread-private.h ../cups/dir.h ../cups/ppd-private.h +cupstestppd.o: ../cups/raster.h ../cups/ppd.h lp.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lp.o: ../cups/language.h ../cups/string-private.h ../config.h -lp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lp.o: ../cups/thread-private.h +lp.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lp.o: ../cups/transcode.h ../cups/thread-private.h lpadmin.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpadmin.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpadmin.o: ../cups/language.h ../cups/string-private.h ../config.h -lpadmin.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpadmin.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpadmin.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpadmin.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpadmin.o: ../cups/thread-private.h +lpadmin.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpadmin.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpadmin.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpadmin.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpadmin.o: ../cups/transcode.h ../cups/thread-private.h lpinfo.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpinfo.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpinfo.o: ../cups/language.h ../cups/string-private.h ../config.h -lpinfo.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpinfo.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpinfo.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpinfo.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpinfo.o: ../cups/thread-private.h +lpinfo.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpinfo.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpinfo.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpinfo.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpinfo.o: ../cups/transcode.h ../cups/thread-private.h lpmove.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpmove.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpmove.o: ../cups/language.h ../cups/string-private.h ../config.h -lpmove.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpmove.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpmove.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpmove.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpmove.o: ../cups/thread-private.h +lpmove.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpmove.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpmove.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpmove.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpmove.o: ../cups/transcode.h ../cups/thread-private.h lpoptions.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpoptions.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h lpoptions.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -lpoptions.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -lpoptions.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -lpoptions.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -lpoptions.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -lpoptions.o: ../cups/transcode.h ../cups/thread-private.h +lpoptions.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +lpoptions.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +lpoptions.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +lpoptions.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lpoptions.o: ../cups/language-private.h ../cups/transcode.h +lpoptions.o: ../cups/thread-private.h lppasswd.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lppasswd.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lppasswd.o: ../cups/language.h ../cups/string-private.h ../config.h -lppasswd.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lppasswd.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lppasswd.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lppasswd.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +lppasswd.o: ../cups/debug-private.h ../cups/versioning.h +lppasswd.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +lppasswd.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +lppasswd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lppasswd.o: ../cups/language-private.h ../cups/transcode.h lppasswd.o: ../cups/thread-private.h ../cups/md5-private.h lpstat.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h lpstat.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h lpstat.o: ../cups/language.h ../cups/string-private.h ../config.h -lpstat.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -lpstat.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -lpstat.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -lpstat.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -lpstat.o: ../cups/thread-private.h +lpstat.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +lpstat.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +lpstat.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpstat.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpstat.o: ../cups/transcode.h ../cups/thread-private.h diff -Nru cups-1.5.2/templates/help-header.tmpl cups-1.5.3/templates/help-header.tmpl --- cups-1.5.2/templates/help-header.tmpl 2008-10-06 19:09:28.000000000 +0200 +++ cups-1.5.3/templates/help-header.tmpl 2012-03-21 05:09:04.000000000 +0100 @@ -43,7 +43,7 @@

If you are new to CUPS, read the "Overview of CUPS" page. Veteran users should read the "What's New in CUPS -1.4" page.

+1.5" page.

The CUPS home page also provides many resources including user discussion forums, answers diff -Nru cups-1.5.2/test/Dependencies cups-1.5.3/test/Dependencies --- cups-1.5.2/test/Dependencies 2010-11-12 03:12:14.000000000 +0100 +++ cups-1.5.3/test/Dependencies 2012-02-06 22:10:58.000000000 +0100 @@ -3,17 +3,18 @@ ippserver.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ippserver.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ippserver.o: ../cups/array.h ../cups/language.h ../cups/string-private.h -ippserver.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h -ippserver.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h -ippserver.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h -ippserver.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h -ippserver.o: ../cups/transcode.h ../cups/thread-private.h +ippserver.o: ../config.h ../cups/debug-private.h ../cups/versioning.h +ippserver.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h +ippserver.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h +ippserver.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ippserver.o: ../cups/language-private.h ../cups/transcode.h +ippserver.o: ../cups/thread-private.h ipptool.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ipptool.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h ipptool.o: ../cups/language.h ../cups/string-private.h ../config.h -ipptool.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h -ipptool.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h -ipptool.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h -ipptool.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h -ipptool.o: ../cups/thread-private.h ../cups/file-private.h -ipptool.o: ../cups/cups-private.h +ipptool.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h +ipptool.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h +ipptool.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ipptool.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ipptool.o: ../cups/transcode.h ../cups/thread-private.h +ipptool.o: ../cups/file-private.h ../cups/cups-private.h diff -Nru cups-1.5.2/test/get-jobs.test cups-1.5.3/test/get-jobs.test --- cups-1.5.2/test/get-jobs.test 2011-04-20 23:16:08.000000000 +0200 +++ cups-1.5.3/test/get-jobs.test 2012-02-06 19:55:39.000000000 +0100 @@ -1,9 +1,9 @@ # -# "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $" +# "$Id: get-jobs.test 10233 2012-02-06 18:55:39Z mike $" # # Get list of not-completed jobs. # -# Copyright 2007-2010 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 2001-2006 by Easy Software Products. All rights reserved. # # These coded instructions, statements, and computer programs are the @@ -32,6 +32,7 @@ ATTR uri printer-uri $uri ATTR keyword requested-attributes job-id,job-state,job-name,job-originating-user-name,job-media-sheets,job-media-sheets-completed,job-impressions,job-impressions-completed + ATTR name requesting-user-name $user # What statuses are OK? STATUS successful-ok @@ -49,5 +50,5 @@ # -# End of "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $". +# End of "$Id: get-jobs.test 10233 2012-02-06 18:55:39Z mike $". # diff -Nru cups-1.5.2/test/Makefile cups-1.5.3/test/Makefile --- cups-1.5.2/test/Makefile 2011-09-15 00:38:58.000000000 +0200 +++ cups-1.5.3/test/Makefile 2012-03-01 01:05:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10001 2011-09-14 22:38:58Z mike $" +# "$Id: Makefile 10317 2012-03-01 00:05:55Z mike $" # # IPP test makefile for CUPS. # @@ -20,20 +20,13 @@ # Sample test files. # -TESTFILES = \ +DATAFILES = \ color.jpg \ - create-printer-subscription.test \ document-a4.pdf \ document-a4.ps \ document-letter.pdf \ document-letter.ps \ - get-completed-jobs.test \ - get-jobs.test \ gray.jpg \ - ipp-1.1.test \ - ipp-2.0.test \ - ipp-2.1.test \ - ipp-2.2.test \ onepage-a4.pdf \ onepage-a4.ps \ onepage-letter.pdf \ @@ -42,6 +35,15 @@ testfile.pdf \ testfile.ps \ testfile.txt +TESTFILES = \ + create-printer-subscription.test \ + get-completed-jobs.test \ + get-jobs.test \ + get-printer-attributes.test \ + ipp-1.1.test \ + ipp-2.0.test \ + ipp-2.1.test \ + ipp-2.2.test OBJS = \ ippserver.o \ ipptool.o @@ -102,6 +104,9 @@ install-data: echo Installing sample ipptool files in $(DATADIR)/ipptool... $(INSTALL_DIR) -m 755 $(DATADIR)/ipptool + for file in $(DATAFILES); do \ + $(INSTALL_COMPDATA) $$file $(DATADIR)/ipptool; \ + done for file in $(TESTFILES); do \ $(INSTALL_DATA) $$file $(DATADIR)/ipptool; \ done @@ -140,6 +145,14 @@ # uninstall: + echo Uninstalling sample ipptool files from $(DATADIR)/ipptool... + for file in $(DATAFILES); do \ + $(RM) $(DATADIR)/ipptool/$$file; \ + done + for file in $(TESTFILES); do \ + $(RM) $(DATADIR)/ipptool/$$file; \ + done + -$(RMDIR) $(DATADIR)/ipptool # @@ -188,5 +201,5 @@ # -# End of "$Id: Makefile 10001 2011-09-14 22:38:58Z mike $". +# End of "$Id: Makefile 10317 2012-03-01 00:05:55Z mike $". # diff -Nru cups-1.5.2/test/print-job.test cups-1.5.3/test/print-job.test --- cups-1.5.2/test/print-job.test 2010-08-09 23:52:01.000000000 +0200 +++ cups-1.5.3/test/print-job.test 2012-02-06 19:55:39.000000000 +0100 @@ -12,6 +12,7 @@ ATTR language attributes-natural-language en ATTR uri printer-uri $uri ATTR name requesting-user-name $user + ATTR mimeMediaType document-format $filetype GROUP job-attributes-tag ATTR integer copies 1 diff -Nru cups-1.5.2/test/run-stp-tests.sh cups-1.5.3/test/run-stp-tests.sh --- cups-1.5.2/test/run-stp-tests.sh 2011-10-26 00:39:56.000000000 +0200 +++ cups-1.5.3/test/run-stp-tests.sh 2012-05-15 16:04:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: run-stp-tests.sh 10090 2011-10-25 22:39:56Z mike $" +# "$Id: run-stp-tests.sh 10464 2012-05-15 14:04:18Z mike $" # # Perform the complete set of IPP compliance tests specified in the # CUPS Software Test Plan. @@ -485,7 +485,7 @@ echo " $valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log 2>&1 &" echo "" -if test `uname` = Darwin -a "x$valgrind" = x; then +if test `uname` = Darwin -a "x$valgrind" = x -a -f /usr/lib/libgmalloc.dylib; then DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib \ $valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log 2>&1 & else @@ -870,5 +870,5 @@ fi # -# End of "$Id: run-stp-tests.sh 10090 2011-10-25 22:39:56Z mike $" +# End of "$Id: run-stp-tests.sh 10464 2012-05-15 14:04:18Z mike $" #