From: Michael R Sweet Date: Wed, 30 Apr 2025 19:25:01 +0000 (-0400) Subject: Make home page another CGI - we'll need it for OAuth login/logout and X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f3a83c709da57f58f4a69853d3ce0910ae417a28;p=thirdparty%2Fcups.git Make home page another CGI - we'll need it for OAuth login/logout and that will allow us to provide whole-server search and simple dashboard alert functionality.. --- diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies index 86971e5a6d..a48a7d38e8 100644 --- a/cgi-bin/Dependencies +++ b/cgi-bin/Dependencies @@ -52,11 +52,8 @@ admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ \ \ \ - \ - \ - \ - ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h \ - ../cups/pwg-private.h ../cups/adminutil.h + ../cups/ppd-private.h ../cups/ppd.h \ + ../cups/raster.h ../cups/pwg-private.h ../cups/adminutil.h classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/base.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ @@ -67,6 +64,11 @@ help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ ../cups/language-private.h ../config.h ../cups/transcode.h \ ../cups/string-private.h ../cups/ipp-private.h +home.o: home.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ + ../cups/base.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ + ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/base.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index f438f78f8d..d4aed83e04 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,7 +1,7 @@ # # CGI makefile for CUPS. # -# Copyright © 2020-2024 by OpenPrinting. +# Copyright © 2020-2025 by OpenPrinting. # Copyright © 2007-2019 by Apple Inc. # Copyright © 1997-2006 by Easy Software Products. # @@ -23,6 +23,7 @@ OBJS = \ admin.o \ classes.o \ help.o \ + home.o \ jobs.o \ printers.o \ testcgi.o \ @@ -32,6 +33,7 @@ CGIS = \ admin.cgi \ classes.cgi \ help.cgi \ + home.cgi \ jobs.cgi \ printers.cgi LIBTARGETS = \ @@ -192,6 +194,16 @@ help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ +# +# home.cgi +# + +home.cgi: home.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a + echo Linking $@... + $(LD_CC) $(ALL_LDFLAGS) -o $@ home.o libcupscgi.a $(LINKCUPS) + $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ + + # # jobs.cgi # diff --git a/cgi-bin/home.c b/cgi-bin/home.c new file mode 100644 index 0000000000..c9cf49d787 --- /dev/null +++ b/cgi-bin/home.c @@ -0,0 +1,85 @@ +/* + * Home page CGI for CUPS. + * + * Copyright © 2025 by OpenPrinting. + * + * Licensed under Apache License v2.0. See the file "LICENSE" for more + * information. + */ + +#include "cgi-private.h" +#include + + +/* + * Local functions... + */ + +static void do_dashboard(void); +static void do_search(char *query); + + +/* + * 'main()' - Main entry for CGI. + */ + +int /* O - Exit status */ +main(void) +{ + char *query; /* Query string, if any */ + + + /* + * Get any form variables... + */ + + cgiInitialize(); + + /* + * Set the web interface section... + */ + + cgiSetVariable("SECTION", "home"); + cgiSetVariable("REFRESH_PAGE", ""); + + /* + * Show the home page... + */ + + cgiStartHTML(cgiText(_("Home"))); + + if ((query = cgiGetVariable("QUERY")) != NULL) + do_search(query); + else + do_dashboard(); + + cgiEndHTML(); + + /* + * Return with no errors... + */ + + return (0); +} + + +/* + * 'do_dashboard()' - Show the home page dashboard... + */ + +static void +do_dashboard(void) +{ + cgiCopyTemplateLang("home.tmpl"); +} + + +/* + * 'do_search()' - Search classes, printers, jobs, and online help. + */ + +static void +do_search(char *query) /* I - Search string */ +{ + +} diff --git a/cgi-bin/template.c b/cgi-bin/template.c index 931e660ce4..71231c4239 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,7 +1,7 @@ /* * CGI template function. * - * Copyright © 2020-2024 by OpenPrinting. + * Copyright © 2020-2025 by OpenPrinting. * Copyright © 2007-2015 by Apple Inc. * Copyright © 1997-2006 by Easy Software Products. * @@ -234,8 +234,11 @@ cgi_copy(FILE *out, /* I - Output file */ */ while ((ch = getc(in)) != EOF) + { if (ch == term) + { break; + } else if (ch == '{') { /* @@ -245,6 +248,7 @@ cgi_copy(FILE *out, /* I - Output file */ uriencode = 0; for (s = name; (ch = getc(in)) != EOF;) + { if (strchr("}]<>=!~ \t\n", ch)) break; else if (s == name && ch == '%') @@ -253,6 +257,7 @@ cgi_copy(FILE *out, /* I - Output file */ break; else if (s < (name + sizeof(name) - 1)) *s++ = (char)ch; + } *s = '\0'; @@ -288,7 +293,9 @@ cgi_copy(FILE *out, /* I - Output file */ *nameptr++ = '\0'; if ((value = cgiGetArray(name + 1, atoi(nameptr) - 1)) != NULL) + { outptr = value; + } else { outval[0] = '\0'; @@ -296,7 +303,9 @@ cgi_copy(FILE *out, /* I - Output file */ } } else if ((value = cgiGetArray(name + 1, element)) != NULL) + { outptr = value; + } else { outval[0] = '\0'; @@ -614,7 +623,10 @@ cgi_copy(FILE *out, /* I - Output file */ getc(in); } else if (out) + { putc(ch, out); + } + } if (ch == EOF) fprintf(stderr, "DEBUG2: %*sReturning at file position %ld on EOF...\n", diff --git a/cgi-bin/var.c b/cgi-bin/var.c index fdc6fa7b57..8bb70513ee 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,7 +1,7 @@ /* * CGI form variable and array functions for CUPS. * - * Copyright © 2020-2024 by OpenPrinting. + * Copyright © 2020-2025 by OpenPrinting. * Copyright © 2007-2019 by Apple Inc. * Copyright © 1997-2005 by Easy Software Products. * @@ -165,6 +165,9 @@ cgiGetArray(const char *name, /* I - Name of array variable */ _cgi_var_t *var; /* Pointer to variable */ + if (!_cups_strncasecmp(name, "ENV:", 4)) + return (getenv(name + 4)); + if ((var = cgi_find_variable(name)) == NULL) return (NULL); @@ -305,6 +308,9 @@ cgiGetVariable(const char *name) /* I - Name of variable */ const _cgi_var_t *var; /* Returned variable */ + if (!_cups_strncasecmp(name, "ENV:", 4)) + return (getenv(name + 4)); + var = cgi_find_variable(name); return ((var == NULL) ? NULL : strdup(var->values[var->nvalues - 1])); diff --git a/configure b/configure index 4a70b5005e..83fd87d629 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for CUPS 2.5b1. +# Generated by GNU Autoconf 2.71 for CUPS 2.5b1. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -17,6 +17,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -25,13 +26,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -103,7 +103,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -133,14 +133,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -148,13 +149,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -172,9 +172,8 @@ 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 case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -187,15 +186,14 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -228,13 +226,12 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -256,7 +253,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -276,8 +273,7 @@ $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 ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -316,6 +312,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -384,12 +388,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -403,14 +406,21 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -484,8 +494,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -534,6 +542,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -545,9 +554,9 @@ 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 -pR'. + # 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 -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -572,12 +581,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1079,7 +1084,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1292,7 +1297,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1308,7 +1313,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1338,8 +1343,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1347,7 +1352,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1397,7 +1402,7 @@ do 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' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1465,7 +1470,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1493,7 +1498,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures CUPS 2.5b1 to adapt to many kinds of systems. +\`configure' configures CUPS 2.5b1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1507,11 +1512,11 @@ Configuration: --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' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1519,10 +1524,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1595,7 +1600,6 @@ Optional Features: --disable-raw-printing do not allow raw printing by default --enable-webif enable the web interface by default, default=no for macOS - --enable-year2038 support timestamps after 2038 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1675,7 +1679,7 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags -Use these variables to override the choices made by 'configure' or to help +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 . @@ -1744,9 +1748,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.5b1 -generated by GNU Autoconf 2.72 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1785,12 +1789,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1824,12 +1827,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1864,12 +1866,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1907,12 +1908,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + 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 @@ -1936,8 +1936,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1945,12 +1945,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1970,15 +1968,15 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + 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 (void); below. */ + which can conflict with char $2 (); below. */ #include #undef $2 @@ -1989,7 +1987,7 @@ else case e in #( #ifdef __cplusplus extern "C" #endif -char $2 (void); +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. */ @@ -2008,13 +2006,11 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext ;; -esac + conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2035,8 +2031,8 @@ printf %s "checking for $2.$3... " >&6; } if eval test \${$4+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -2052,8 +2048,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -2069,15 +2065,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else case e in #( - e) eval "$4=no" ;; -esac +else $as_nop + eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$4 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2110,7 +2103,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by CUPS $as_me 2.5b1, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2356,10 +2349,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2395,7 +2388,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2409,21 +2404,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2451,19 +2431,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2513,6 +2490,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2578,8 +2556,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2601,7 +2577,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -3009,9 +2985,8 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; -esac +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 fi @@ -3039,12 +3014,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -3053,18 +3028,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -3080,11 +3055,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -3114,16 +3089,15 @@ printf %s "checking build system type... " >&6; } if test ${ac_cv_build+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_build_alias=$build_alias +else $as_nop + ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 printf "%s\n" "$ac_cv_build" >&6; } @@ -3150,15 +3124,14 @@ printf %s "checking host system type... " >&6; } if test ${ac_cv_host+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test "x$host_alias" = x; then +else $as_nop + if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 printf "%s\n" "$ac_cv_host" >&6; } @@ -3197,12 +3170,11 @@ then : # No, build local targets LOCALTARGET="local" -else case e in #( - e) +else $as_nop + # Yes, don't build local targets LOCALTARGET="" - ;; -esac + fi @@ -3215,8 +3187,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CODE_SIGN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $CODE_SIGN in +else $as_nop + case $CODE_SIGN in [\\/]* | ?:[\\/]*) ac_cv_path_CODE_SIGN="$CODE_SIGN" # Let the user override the test with a path. ;; @@ -3241,7 +3213,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi CODE_SIGN=$ac_cv_path_CODE_SIGN @@ -3300,8 +3271,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AWK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$AWK"; then +else $as_nop + if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3323,8 +3294,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -3361,8 +3331,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3384,8 +3354,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3407,8 +3376,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3430,8 +3399,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -3466,8 +3434,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3489,8 +3457,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3512,8 +3479,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -3552,8 +3519,7 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3577,8 +3543,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3600,8 +3566,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3627,8 +3592,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3650,8 +3615,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -3689,8 +3653,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3712,8 +3676,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3735,8 +3698,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3758,8 +3721,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -3788,10 +3750,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3863,8 +3825,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$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' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -3884,7 +3846,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -3895,9 +3857,8 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -3906,14 +3867,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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 case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3937,10 +3897,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3950,12 +3910,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3971,8 +3930,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -4012,27 +3969,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4064,18 +4020,16 @@ then : break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -4086,8 +4040,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4104,14 +4058,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -4129,8 +4081,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -4148,8 +4100,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4164,8 +4116,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4182,15 +4134,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -4217,8 +4166,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4235,28 +4184,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -4266,8 +4212,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4284,28 +4230,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -4315,8 +4258,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4333,28 +4276,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -4379,8 +4319,8 @@ if test -z "$CPP"; then if test ${ac_cv_prog_CPP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) # Double quotes because $CC needs to be expanded +else $as_nop + # Double quotes because $CC needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false @@ -4398,10 +4338,9 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : -else case e in #( - e) # Broken: fails on valid input. -continue ;; -esac +else $as_nop + # Broken: fails on valid input. +continue fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -4415,16 +4354,15 @@ if ac_fn_c_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else case e in #( - e) # Passes both tests. +else $as_nop + # Passes both tests. ac_preproc_ok=: -break ;; -esac +break fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : @@ -4433,8 +4371,7 @@ fi done ac_cv_prog_CPP=$CPP - ;; -esac + fi CPP=$ac_cv_prog_CPP else @@ -4457,10 +4394,9 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : -else case e in #( - e) # Broken: fails on valid input. -continue ;; -esac +else $as_nop + # Broken: fails on valid input. +continue fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -4474,26 +4410,24 @@ if ac_fn_c_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else case e in #( - e) # Passes both tests. +else $as_nop + # Passes both tests. ac_preproc_ok=: -break ;; -esac +break fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4527,8 +4461,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CXX+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CXX"; then +else $as_nop + if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4550,8 +4484,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -4577,8 +4510,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CXX+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CXX"; then +else $as_nop + if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4600,8 +4533,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -4661,8 +4593,8 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; } if test ${ac_cv_cxx_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4679,14 +4611,12 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } @@ -4704,8 +4634,8 @@ printf %s "checking whether $CXX accepts -g... " >&6; } if test ${ac_cv_prog_cxx_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag +else $as_nop + ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" @@ -4723,8 +4653,8 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes -else case e in #( - e) CXXFLAGS="" +else $as_nop + CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4739,8 +4669,8 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : -else case e in #( - e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else $as_nop + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4757,15 +4687,12 @@ if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; -esac + ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } @@ -4789,11 +4716,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx11+y} +if test ${ac_cv_prog_cxx_11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cxx_cxx11=no +else $as_nop + ac_cv_prog_cxx_11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4810,39 +4737,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cxx_cxx11" != "xno" && break done rm -f conftest.$ac_ext -CXX=$ac_save_CXX ;; -esac +CXX=$ac_save_CXX fi if test "x$ac_cv_prog_cxx_cxx11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cxx_cxx11" = x +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; -esac + CXX="$CXX $ac_cv_prog_cxx_cxx11" fi ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 ;; -esac + ac_prog_cxx_stdcxx=cxx11 fi fi if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx98+y} +if test ${ac_cv_prog_cxx_98+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cxx_cxx98=no +else $as_nop + ac_cv_prog_cxx_98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4859,28 +4783,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cxx_cxx98" != "xno" && break done rm -f conftest.$ac_ext -CXX=$ac_save_CXX ;; -esac +CXX=$ac_save_CXX fi if test "x$ac_cv_prog_cxx_cxx98" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cxx_cxx98" = x +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; -esac + CXX="$CXX $ac_cv_prog_cxx_cxx98" fi ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 ;; -esac + ac_prog_cxx_stdcxx=cxx98 fi fi @@ -4898,8 +4819,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RANLIB+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$RANLIB"; then +else $as_nop + if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4921,8 +4842,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -4944,8 +4864,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_RANLIB+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_RANLIB"; then +else $as_nop + if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4967,8 +4887,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -5001,8 +4920,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_AR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $AR in +else $as_nop + case $AR in [\\/]* | ?:[\\/]*) ac_cv_path_AR="$AR" # Let the user override the test with a path. ;; @@ -5027,7 +4946,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi AR=$ac_cv_path_AR @@ -5047,8 +4965,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CHMOD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $CHMOD in +else $as_nop + case $CHMOD in [\\/]* | ?:[\\/]*) ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path. ;; @@ -5073,7 +4991,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi CHMOD=$ac_cv_path_CHMOD @@ -5093,8 +5010,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_GZIPPROG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $GZIPPROG in +else $as_nop + case $GZIPPROG in [\\/]* | ?:[\\/]*) ac_cv_path_GZIPPROG="$GZIPPROG" # Let the user override the test with a path. ;; @@ -5119,7 +5036,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi GZIPPROG=$ac_cv_path_GZIPPROG @@ -5145,8 +5061,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_LD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $LD in +else $as_nop + case $LD in [\\/]* | ?:[\\/]*) ac_cv_path_LD="$LD" # Let the user override the test with a path. ;; @@ -5171,7 +5087,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi LD=$ac_cv_path_LD @@ -5191,8 +5106,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_LN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $LN in +else $as_nop + case $LN in [\\/]* | ?:[\\/]*) ac_cv_path_LN="$LN" # Let the user override the test with a path. ;; @@ -5217,7 +5132,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi LN=$ac_cv_path_LN @@ -5237,8 +5151,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_MKDIR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $MKDIR in +else $as_nop + case $MKDIR in [\\/]* | ?:[\\/]*) ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path. ;; @@ -5263,7 +5177,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi MKDIR=$ac_cv_path_MKDIR @@ -5283,8 +5196,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_MV+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $MV in +else $as_nop + case $MV in [\\/]* | ?:[\\/]*) ac_cv_path_MV="$MV" # Let the user override the test with a path. ;; @@ -5309,7 +5222,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi MV=$ac_cv_path_MV @@ -5329,8 +5241,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_RM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $RM in +else $as_nop + case $RM in [\\/]* | ?:[\\/]*) ac_cv_path_RM="$RM" # Let the user override the test with a path. ;; @@ -5355,7 +5267,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi RM=$ac_cv_path_RM @@ -5375,8 +5286,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_RMDIR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $RMDIR in +else $as_nop + case $RMDIR in [\\/]* | ?:[\\/]*) ac_cv_path_RMDIR="$RMDIR" # Let the user override the test with a path. ;; @@ -5401,7 +5312,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi RMDIR=$ac_cv_path_RMDIR @@ -5421,8 +5331,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $SED in +else $as_nop + case $SED in [\\/]* | ?:[\\/]*) ac_cv_path_SED="$SED" # Let the user override the test with a path. ;; @@ -5447,7 +5357,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi SED=$ac_cv_path_SED @@ -5467,8 +5376,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_XDGOPEN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $XDGOPEN in +else $as_nop + case $XDGOPEN in [\\/]* | ?:[\\/]*) ac_cv_path_XDGOPEN="$XDGOPEN" # Let the user override the test with a path. ;; @@ -5493,7 +5402,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi XDGOPEN=$ac_cv_path_XDGOPEN @@ -5512,11 +5420,10 @@ then : CUPS_HTMLVIEW="htmlview" -else case e in #( - e) +else $as_nop + CUPS_HTMLVIEW="$XDGOPEN" - ;; -esac + fi @@ -5560,8 +5467,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PKGCONFIG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PKGCONFIG in +else $as_nop + case $PKGCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. ;; @@ -5586,7 +5493,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PKGCONFIG=$ac_cv_path_PKGCONFIG @@ -5609,8 +5515,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PKGCONFIG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ac_pt_PKGCONFIG in +else $as_nop + case $ac_pt_PKGCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. ;; @@ -5635,7 +5541,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG @@ -5677,21 +5582,15 @@ printf %s "checking for library containing abs... " >&6; } if test ${ac_cv_search_abs+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char abs (void); + builtin and then its argument prototype would still apply. */ +char abs (); int main (void) { @@ -5722,13 +5621,11 @@ done if test ${ac_cv_search_abs+y} then : -else case e in #( - e) ac_cv_search_abs=no ;; -esac +else $as_nop + ac_cv_search_abs=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_abs" >&5 printf "%s\n" "$ac_cv_search_abs" >&6; } @@ -5745,21 +5642,15 @@ printf %s "checking for library containing fmod... " >&6; } if test ${ac_cv_search_fmod+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char fmod (void); + builtin and then its argument prototype would still apply. */ +char fmod (); int main (void) { @@ -5790,13 +5681,11 @@ done if test ${ac_cv_search_fmod+y} then : -else case e in #( - e) ac_cv_search_fmod=no ;; -esac +else $as_nop + ac_cv_search_fmod=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmod" >&5 printf "%s\n" "$ac_cv_search_fmod" >&6; } @@ -5815,21 +5704,15 @@ printf %s "checking for library containing crypt... " >&6; } if test ${ac_cv_search_crypt+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char crypt (void); + builtin and then its argument prototype would still apply. */ +char crypt (); int main (void) { @@ -5860,13 +5743,11 @@ done if test ${ac_cv_search_crypt+y} then : -else case e in #( - e) ac_cv_search_crypt=no ;; -esac +else $as_nop + ac_cv_search_crypt=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 printf "%s\n" "$ac_cv_search_crypt" >&6; } @@ -5882,21 +5763,15 @@ printf %s "checking for library containing getspent... " >&6; } if test ${ac_cv_search_getspent+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char getspent (void); + builtin and then its argument prototype would still apply. */ +char getspent (); int main (void) { @@ -5927,13 +5802,11 @@ done if test ${ac_cv_search_getspent+y} then : -else case e in #( - e) ac_cv_search_getspent=no ;; -esac +else $as_nop + ac_cv_search_getspent=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getspent" >&5 printf "%s\n" "$ac_cv_search_getspent" >&6; } @@ -5963,21 +5836,15 @@ printf %s "checking for library containing mallinfo... " >&6; } if test ${ac_cv_search_mallinfo+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char mallinfo (void); + builtin and then its argument prototype would still apply. */ +char mallinfo (); int main (void) { @@ -6008,13 +5875,11 @@ done if test ${ac_cv_search_mallinfo+y} then : -else case e in #( - e) ac_cv_search_mallinfo=no ;; -esac +else $as_nop + ac_cv_search_mallinfo=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mallinfo" >&5 printf "%s\n" "$ac_cv_search_mallinfo" >&6; } @@ -6048,22 +5913,16 @@ printf %s "checking for systempapername in -lpaper... " >&6; } if test ${ac_cv_lib_paper_systempapername+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lpaper $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char systempapername (void); + builtin and then its argument prototype would still apply. */ +char systempapername (); int main (void) { @@ -6075,14 +5934,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_paper_systempapername=yes -else case e in #( - e) ac_cv_lib_paper_systempapername=no ;; -esac +else $as_nop + ac_cv_lib_paper_systempapername=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_paper_systempapername" >&5 printf "%s\n" "$ac_cv_lib_paper_systempapername" >&6; } @@ -6094,19 +5951,17 @@ printf "%s\n" "#define HAVE_LIBPAPER 1" >>confdefs.h LIBPAPER="-lpaper" -else case e in #( - e) +else $as_nop + LIBPAPER="" - ;; -esac + fi -else case e in #( - e) +else $as_nop + LIBPAPER="" - ;; -esac + fi @@ -6199,21 +6054,15 @@ printf %s "checking for library containing iconv_open... " >&6; } if test ${ac_cv_search_iconv_open+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char iconv_open (void); + builtin and then its argument prototype would still apply. */ +char iconv_open (); int main (void) { @@ -6244,13 +6093,11 @@ done if test ${ac_cv_search_iconv_open+y} then : -else case e in #( - e) ac_cv_search_iconv_open=no ;; -esac +else $as_nop + ac_cv_search_iconv_open=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_iconv_open" >&5 printf "%s\n" "$ac_cv_search_iconv_open" >&6; } @@ -6271,21 +6118,15 @@ printf %s "checking for library containing libiconv_open... " >&6; } if test ${ac_cv_search_libiconv_open+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char libiconv_open (void); + builtin and then its argument prototype would still apply. */ +char libiconv_open (); int main (void) { @@ -6316,13 +6157,11 @@ done if test ${ac_cv_search_libiconv_open+y} then : -else case e in #( - e) ac_cv_search_libiconv_open=no ;; -esac +else $as_nop + ac_cv_search_libiconv_open=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_libiconv_open" >&5 printf "%s\n" "$ac_cv_search_libiconv_open" >&6; } @@ -6491,12 +6330,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_TM_GMTOFF 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6538,12 +6376,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ST_GEN 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6587,8 +6424,8 @@ printf "%s\n" "#define HAVE_LIBUSB 1" >>confdefs.h LIBUSB="$($PKGCONFIG --libs libusb-1.0)" USBQUIRKS="\$(DATADIR)/usb" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if test x$enable_libusb = xyes @@ -6597,8 +6434,7 @@ then : as_fn_error $? "libusb required for --enable-libusb." "$LINENO" 5 fi - ;; -esac + fi fi @@ -6628,22 +6464,16 @@ printf %s "checking for hosts_access in -lwrap... " >&6; } if test ${ac_cv_lib_wrap_hosts_access+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lwrap $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char hosts_access (void); + builtin and then its argument prototype would still apply. */ +char hosts_access (); int main (void) { @@ -6655,14 +6485,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_wrap_hosts_access=yes -else case e in #( - e) ac_cv_lib_wrap_hosts_access=no ;; -esac +else $as_nop + ac_cv_lib_wrap_hosts_access=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_hosts_access" >&5 printf "%s\n" "$ac_cv_lib_wrap_hosts_access" >&6; } @@ -6697,22 +6525,16 @@ printf %s "checking for inflateCopy in -lz... " >&6; } if test ${ac_cv_lib_z_inflateCopy+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char inflateCopy (void); + builtin and then its argument prototype would still apply. */ +char inflateCopy (); int main (void) { @@ -6724,14 +6546,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_inflateCopy=yes -else case e in #( - e) ac_cv_lib_z_inflateCopy=no ;; -esac +else $as_nop + ac_cv_lib_z_inflateCopy=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5 printf "%s\n" "$ac_cv_lib_z_inflateCopy" >&6; } @@ -6747,11 +6567,10 @@ then : fi -else case e in #( - e) +else $as_nop + as_fn_error $? "Required zlib library not found." "$LINENO" 5 - ;; -esac + fi @@ -6797,21 +6616,15 @@ printf %s "checking for library containing acl_init... " >&6; } if test ${ac_cv_search_acl_init+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char acl_init (void); + builtin and then its argument prototype would still apply. */ +char acl_init (); int main (void) { @@ -6842,13 +6655,11 @@ done if test ${ac_cv_search_acl_init+y} then : -else case e in #( - e) ac_cv_search_acl_init=no ;; -esac +else $as_nop + ac_cv_search_acl_init=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_init" >&5 printf "%s\n" "$ac_cv_search_acl_init" >&6; } @@ -6935,12 +6746,11 @@ then : fi -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi fi @@ -6998,11 +6808,10 @@ printf "%s\n" "#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1" >>confdefs.h PKGCONFIG_LIBS_STATIC="-framework SystemConfiguration $PKGCONFIG_LIBS_STATIC" -else case e in #( - e) +else $as_nop + LIBS="$SAVELIBS" - ;; -esac + fi done @@ -7061,11 +6870,10 @@ then : withval=$with_adminkey; default_adminkey="$withval" -else case e in #( - e) +else $as_nop + default_adminkey="default" - ;; -esac + fi @@ -7075,11 +6883,10 @@ then : withval=$with_operkey; default_operkey="$withval" -else case e in #( - e) +else $as_nop + default_operkey="default" - ;; -esac + fi @@ -7097,12 +6904,11 @@ then : CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" -else case e in #( - e) +else $as_nop + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" - ;; -esac + fi if test "x$default_operkey" != xdefault @@ -7110,11 +6916,10 @@ then : CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" - ;; -esac + fi fi @@ -7232,11 +7037,10 @@ then : # Default prefix isn't bound until AC_OUTPUT... realprefix="/usr/local" -else case e in #( - e) +else $as_nop + realprefix="$prefix" - ;; -esac + fi if test "$exec_prefix" = "NONE" @@ -7247,11 +7051,10 @@ then : exec_prefix="/usr" -else case e in #( - e) +else $as_nop + exec_prefix="$realprefix" - ;; -esac + fi fi @@ -7286,11 +7089,10 @@ then : datarootdir="/usr/share" -else case e in #( - e) +else $as_nop + datarootdir="$realprefix/share" - ;; -esac + fi fi @@ -7303,11 +7105,10 @@ then : datadir="/usr/share" -else case e in #( - e) +else $as_nop + datadir="$realprefix/share" - ;; -esac + fi elif test "$datadir" = "\${datarootdir}" @@ -7325,11 +7126,10 @@ then : includedir="/usr/include/libcups2" -else case e in #( - e) +else $as_nop + includedir="$realprefix/include/libcups2" - ;; -esac + fi fi @@ -7351,18 +7151,16 @@ then : localstatedir="/private/var" -else case e in #( - e) +else $as_nop + localstatedir="/var" - ;; -esac + fi -else case e in #( - e) +else $as_nop + localstatedir="$realprefix/var" - ;; -esac + fi fi @@ -7378,18 +7176,16 @@ then : sysconfdir="/private/etc" -else case e in #( - e) +else $as_nop + sysconfdir="/etc" - ;; -esac + fi -else case e in #( - e) +else $as_nop + sysconfdir="$realprefix/etc" - ;; -esac + fi fi @@ -7405,11 +7201,10 @@ then : libdir="$exec_prefix/lib64" -else case e in #( - e) +else $as_nop + libdir="$exec_prefix/lib" - ;; -esac + fi ;; #( *) : @@ -7426,11 +7221,10 @@ then : PKGCONFIG_LIBS="-lcups" -else case e in #( - e) +else $as_nop + PKGCONFIG_LIBS="-L$libdir -lcups" - ;; -esac + fi # Cache data... @@ -7441,11 +7235,10 @@ then : withval=$with_cachedir; cachedir="$withval" -else case e in #( - e) +else $as_nop + cachedir="" - ;; -esac + fi @@ -7457,18 +7250,16 @@ then : CUPS_CACHEDIR="$localstatedir/spool/cups/cache" -else case e in #( - e) +else $as_nop + CUPS_CACHEDIR="$localstatedir/cache/cups" - ;; -esac + fi -else case e in #( - e) +else $as_nop + CUPS_CACHEDIR="$cachedir" - ;; -esac + fi printf "%s\n" "#define CUPS_CACHEDIR \"$CUPS_CACHEDIR\"" >>confdefs.h @@ -7490,11 +7281,10 @@ then : withval=$with_icondir; icondir="$withval" -else case e in #( - e) +else $as_nop + icondir="" - ;; -esac + fi @@ -7503,11 +7293,10 @@ then : ICONDIR="/usr/share/icons" -else case e in #( - e) +else $as_nop + ICONDIR="$icondir" - ;; -esac + fi @@ -7520,11 +7309,10 @@ then : withval=$with_menudir; menudir="$withval" -else case e in #( - e) +else $as_nop + menudir="" - ;; -esac + fi @@ -7533,11 +7321,10 @@ then : MENUDIR="/usr/share/applications" -else case e in #( - e) +else $as_nop + MENUDIR="$menudir" - ;; -esac + fi @@ -7550,11 +7337,10 @@ then : withval=$with_docdir; docdir="$withval" -else case e in #( - e) +else $as_nop + docdir="" - ;; -esac + fi @@ -7564,11 +7350,10 @@ then : CUPS_DOCROOT="$datadir/doc/cups" docdir="$datadir/doc/cups" -else case e in #( - e) +else $as_nop + CUPS_DOCROOT="$docdir" - ;; -esac + fi @@ -7594,11 +7379,10 @@ then : ;; esac -else case e in #( - e) +else $as_nop + CUPS_LOCALEDIR="$localedir" - ;; -esac + fi @@ -7615,11 +7399,10 @@ then : withval=$with_pkgconfpath; pkgconfpath="$withval" -else case e in #( - e) +else $as_nop + pkgconfpath="" - ;; -esac + fi @@ -7628,11 +7411,10 @@ then : CUPS_PKGCONFPATH="$exec_prefix/lib/pkgconfig" -else case e in #( - e) +else $as_nop + CUPS_PKGCONFPATH="$pkgconfpath" - ;; -esac + fi printf "%s\n" "#define CUPS_PKGCONFPATH \"$CUPS_PKGCONFPATH\"" >>confdefs.h @@ -7649,11 +7431,10 @@ then : withval=$with_logdir; logdir="$withval" -else case e in #( - e) +else $as_nop + logdir="" - ;; -esac + fi @@ -7662,11 +7443,10 @@ then : CUPS_LOGDIR="$localstatedir/log/cups" -else case e in #( - e) +else $as_nop + CUPS_LOGDIR="$logdir" - ;; -esac + fi printf "%s\n" "#define CUPS_LOGDIR \"$CUPS_LOGDIR\"" >>confdefs.h @@ -7725,8 +7505,8 @@ then : withval=$with_rundir; CUPS_STATEDIR="$withval" -else case e in #( - e) +else $as_nop + case "$host_os_name" in #( darwin*) : @@ -7740,11 +7520,10 @@ then : CUPS_STATEDIR="/system/volatile/cups" -else case e in #( - e) +else $as_nop + CUPS_STATEDIR="$localstatedir/run/cups" - ;; -esac + fi ;; #( *) : @@ -7755,8 +7534,7 @@ fi *) : ;; esac - ;; -esac + fi @@ -7887,8 +7665,8 @@ fi ;; esac -else case e in #( - e) +else $as_nop + PICFLAG=0 LIBCUPS="lib$cupsbase.a" if test "x$cupsimagebase" != x @@ -7899,8 +7677,7 @@ then : fi DSO=":" DSOXX=":" - ;; -esac + fi @@ -7923,12 +7700,11 @@ then : LINKCUPS="-L../cups -l${cupsbase} \$(LIBS)" EXTLINKCUPS="-lcups \$LIBS" -else case e in #( - e) +else $as_nop + LINKCUPS="-L../cups -l${cupsbase}" EXTLINKCUPS="-lcups" - ;; -esac + fi @@ -7993,11 +7769,10 @@ if test ${enable_libtool_unsupported+y} then : enableval=$enable_libtool_unsupported; -else case e in #( - e) +else $as_nop + enable_libtool_unsupported=no - ;; -esac + fi @@ -8009,12 +7784,11 @@ then : as_fn_error $? "Use '--enable-libtool-unsupported=/path/to/libtool'." "$LINENO" 5 -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libtool is not supported." >&5 printf "%s\n" "$as_me: WARNING: libtool is not supported." >&2;} - ;; -esac + fi LIBTOOL="$enable_libtool_unsupported" @@ -8040,16 +7814,15 @@ fi LINKCUPS="../cups/\$(LIBCUPS)" LINKCUPSIMAGE="../cups/\$(LIBCUPSIMAGE)" -else case e in #( - e) +else $as_nop + LD_CC="\$(CC)" LD_CXX="\$(CXX)" LIBTOOL_CC="" LIBTOOL_CXX="" LIBTOOL_INSTALL="" - ;; -esac + fi @@ -8071,11 +7844,10 @@ then : withval=$with_optim; OPTIM="$withval" -else case e in #( - e) +else $as_nop + OPTIM="" - ;; -esac + fi @@ -8116,11 +7888,10 @@ then : OPTIM="-g" -else case e in #( - e) +else $as_nop + INSTALL_STRIP="-s" - ;; -esac + fi if test x$enable_debug_printfs = xyes @@ -8151,11 +7922,10 @@ fi UNITTESTS="unittests" -else case e in #( - e) +else $as_nop + UNITTESTS="" - ;; -esac + fi @@ -8179,11 +7949,10 @@ then : ARCHFLAGS="" -else case e in #( - e) +else $as_nop + ARCHFLAGS="$with_archflags" - ;; -esac + fi if test -z "$with_ldarchflags" @@ -8191,11 +7960,10 @@ then : LDARCHFLAGS="$ARCHFLAGS" -else case e in #( - e) +else $as_nop + LDARCHFLAGS="$with_ldarchflags" - ;; -esac + fi @@ -8245,14 +8013,13 @@ then : # Don't add _FORTIFY_SOURCE if it is already there -else case e in #( - e) +else $as_nop + # Otherwise use the Fortify enhancements to catch any unbounded # string operations... CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=3" CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=3" - ;; -esac + fi # Default optimization options... @@ -8298,8 +8065,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -fstack-protector" >&5 @@ -8323,17 +8090,15 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8372,12 +8137,11 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8403,12 +8167,11 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; #( @@ -8446,12 +8209,11 @@ then : printf "%s\n" "yes" >&6; } WARNING_OPTIONS="$WARNING_OPTIONS -Wno-$warning" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -8465,8 +8227,8 @@ then : fi -else case e in #( - e) +else $as_nop + # Add vendor-specific compiler options... case $host_os_name in #( sunos* | solaris*) : @@ -8501,8 +8263,7 @@ fi *) : ;; esac - ;; -esac + fi # Add general compiler options per platform... @@ -8553,13 +8314,12 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: -mmacosx-version-min=11.0 -arch x86_64 -arch arm64" >&5 printf "%s\n" "-mmacosx-version-min=11.0 -arch x86_64 -arch arm64" >&6; } -else case e in #( - e) +else $as_nop + # Don't add architecture/min-version flags if debug enabled { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 printf "%s\n" "none" >&6; } - ;; -esac + fi ;; #( *) : @@ -8596,21 +8356,15 @@ printf %s "checking for library containing socket... " >&6; } if test ${ac_cv_search_socket+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char socket (void); + builtin and then its argument prototype would still apply. */ +char socket (); int main (void) { @@ -8641,13 +8395,11 @@ done if test ${ac_cv_search_socket+y} then : -else case e in #( - e) ac_cv_search_socket=no ;; -esac +else $as_nop + ac_cv_search_socket=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 printf "%s\n" "$ac_cv_search_socket" >&6; } @@ -8663,21 +8415,15 @@ printf %s "checking for library containing gethostbyaddr... " >&6; } if test ${ac_cv_search_gethostbyaddr+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyaddr (void); + builtin and then its argument prototype would still apply. */ +char gethostbyaddr (); int main (void) { @@ -8708,13 +8454,11 @@ done if test ${ac_cv_search_gethostbyaddr+y} then : -else case e in #( - e) ac_cv_search_gethostbyaddr=no ;; -esac +else $as_nop + ac_cv_search_gethostbyaddr=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyaddr" >&5 printf "%s\n" "$ac_cv_search_gethostbyaddr" >&6; } @@ -8730,21 +8474,15 @@ printf %s "checking for library containing getifaddrs... " >&6; } if test ${ac_cv_search_getifaddrs+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char getifaddrs (void); + builtin and then its argument prototype would still apply. */ +char getifaddrs (); int main (void) { @@ -8775,13 +8513,11 @@ done if test ${ac_cv_search_getifaddrs+y} then : -else case e in #( - e) ac_cv_search_getifaddrs=no ;; -esac +else $as_nop + ac_cv_search_getifaddrs=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getifaddrs" >&5 printf "%s\n" "$ac_cv_search_getifaddrs" >&6; } @@ -8801,21 +8537,15 @@ printf %s "checking for library containing hstrerror... " >&6; } if test ${ac_cv_search_hstrerror+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char hstrerror (void); + builtin and then its argument prototype would still apply. */ +char hstrerror (); int main (void) { @@ -8846,13 +8576,11 @@ done if test ${ac_cv_search_hstrerror+y} then : -else case e in #( - e) ac_cv_search_hstrerror=no ;; -esac +else $as_nop + ac_cv_search_hstrerror=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_hstrerror" >&5 printf "%s\n" "$ac_cv_search_hstrerror" >&6; } @@ -8872,21 +8600,15 @@ printf %s "checking for library containing __res_init... " >&6; } if test ${ac_cv_search___res_init+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char __res_init (void); + builtin and then its argument prototype would still apply. */ +char __res_init (); int main (void) { @@ -8917,13 +8639,11 @@ done if test ${ac_cv_search___res_init+y} then : -else case e in #( - e) ac_cv_search___res_init=no ;; -esac +else $as_nop + ac_cv_search___res_init=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_init" >&5 printf "%s\n" "$ac_cv_search___res_init" >&6; } @@ -8936,28 +8656,22 @@ then : printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_init" >&5 printf %s "checking for library containing res_9_init... " >&6; } if test ${ac_cv_search_res_9_init+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char res_9_init (void); + builtin and then its argument prototype would still apply. */ +char res_9_init (); int main (void) { @@ -8988,13 +8702,11 @@ done if test ${ac_cv_search_res_9_init+y} then : -else case e in #( - e) ac_cv_search_res_9_init=no ;; -esac +else $as_nop + ac_cv_search_res_9_init=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_init" >&5 printf "%s\n" "$ac_cv_search_res_9_init" >&6; } @@ -9007,28 +8719,22 @@ then : printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_init" >&5 printf %s "checking for library containing res_init... " >&6; } if test ${ac_cv_search_res_init+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char res_init (void); + builtin and then its argument prototype would still apply. */ +char res_init (); int main (void) { @@ -9059,13 +8765,11 @@ done if test ${ac_cv_search_res_init+y} then : -else case e in #( - e) ac_cv_search_res_init=no ;; -esac +else $as_nop + ac_cv_search_res_init=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_init" >&5 printf "%s\n" "$ac_cv_search_res_init" >&6; } @@ -9080,12 +8784,10 @@ printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h fi - ;; -esac + fi - ;; -esac + fi PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $LIBS" @@ -9118,11 +8820,10 @@ then : withval=$with_domainsocket; default_domainsocket="$withval" -else case e in #( - e) +else $as_nop + default_domainsocket="" - ;; -esac + fi @@ -9147,11 +8848,10 @@ then : ;; esac -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket" - ;; -esac + fi CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET" @@ -9160,11 +8860,10 @@ fi printf "%s\n" "#define CUPS_DEFAULT_DOMAINSOCKET \"$CUPS_DEFAULT_DOMAINSOCKET\"" >>confdefs.h -else case e in #( - e) +else $as_nop + CUPS_LISTEN_DOMAINSOCKET="" - ;; -esac + fi @@ -9192,8 +8891,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_KRB5CONFIG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $KRB5CONFIG in +else $as_nop + case $KRB5CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_KRB5CONFIG="$KRB5CONFIG" # Let the user override the test with a path. ;; @@ -9218,7 +8917,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi KRB5CONFIG=$ac_cv_path_KRB5CONFIG @@ -9241,8 +8939,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_KRB5CONFIG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ac_pt_KRB5CONFIG in +else $as_nop + case $ac_pt_KRB5CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_KRB5CONFIG="$ac_pt_KRB5CONFIG" # Let the user override the test with a path. ;; @@ -9267,7 +8965,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ac_pt_KRB5CONFIG=$ac_cv_path_ac_pt_KRB5CONFIG @@ -9311,12 +9008,11 @@ then : printf "%s\n" "yes" >&6; } LIBGSSAPI="$LIBGSSAPI -weak_framework GSS" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi ;; #( sunos* | solaris*) : @@ -9328,22 +9024,16 @@ printf %s "checking for gss_display_status in -lgss... " >&6; } if test ${ac_cv_lib_gss_gss_display_status+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lgss $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char gss_display_status (void); + builtin and then its argument prototype would still apply. */ +char gss_display_status (); int main (void) { @@ -9355,14 +9045,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_gss_gss_display_status=yes -else case e in #( - e) ac_cv_lib_gss_gss_display_status=no ;; -esac +else $as_nop + ac_cv_lib_gss_gss_display_status=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_display_status" >&5 printf "%s\n" "$ac_cv_lib_gss_gss_display_status" >&6; } @@ -9379,18 +9067,16 @@ then : CPPFLAGS="$($KRB5CONFIG --cflags) $CPPFLAGS" LIBGSSAPI="-lgss $($KRB5CONFIG --libs)" -else case e in #( - e) +else $as_nop + LIBGSSAPI="-lgss" - ;; -esac + fi -else case e in #( - e) +else $as_nop + as_fn_error $? "--enable-gssapi specified but GSSAPI library cannot be found." "$LINENO" 5 - ;; -esac + fi LIBS="$SAVELIBS" @@ -9403,16 +9089,15 @@ then : as_fn_error $? "--enable-gssapi specified but krb5-config cannot be found." "$LINENO" 5 -else case e in #( - e) +else $as_nop + printf "%s\n" "#define HAVE_GSSAPI 1" >>confdefs.h CFLAGS="$($KRB5CONFIG --cflags gssapi) $CFLAGS" CPPFLAGS="$($KRB5CONFIG --cflags gssapi) $CPPFLAGS" LIBGSSAPI="$($KRB5CONFIG --libs gssapi)" - ;; -esac + fi ;; #( *) : @@ -9455,8 +9140,8 @@ printf "%s\n" "#define HAVE_GSS_GSSAPI_SPI_H 1" >>confdefs.h fi -else case e in #( - e) +else $as_nop + ac_fn_c_check_header_compile "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" if test "x$ac_cv_header_gssapi_h" = xyes then : @@ -9473,8 +9158,7 @@ printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_H 1" >>confdefs.h fi - ;; -esac + fi SAVELIBS="$LIBS" @@ -9521,12 +9205,11 @@ printf "%s\n" "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -9557,17 +9240,16 @@ printf "%s\n" "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9592,16 +9274,14 @@ printf "%s\n" "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; -esac + fi LIBS="$SAVELIBS" @@ -9615,11 +9295,10 @@ then : withval=$with_gssservicename; default_gssservicename="$withval" -else case e in #( - e) +else $as_nop + default_gssservicename="default" - ;; -esac + fi @@ -9631,18 +9310,16 @@ then : CUPS_DEFAULT_GSSSERVICENAME="host" -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_GSSSERVICENAME="$default_gssservicename" - ;; -esac + fi -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_GSSSERVICENAME="" - ;; -esac + fi @@ -9694,11 +9371,10 @@ then : have_pthread="yes" -else case e in #( - e) +else $as_nop + LIBS="$SAVELIBS" - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -9780,16 +9456,15 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi -else case e in #( - e) +else $as_nop + # Find openssl using legacy library/header checks... SAVELIBS="$LIBS" LIBS="-lcrypto $LIBS" @@ -9799,22 +9474,16 @@ printf %s "checking for SSL_new in -lssl... " >&6; } if test ${ac_cv_lib_ssl_SSL_new+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_new (void); + builtin and then its argument prototype would still apply. */ +char SSL_new (); int main (void) { @@ -9826,14 +9495,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ssl_SSL_new=yes -else case e in #( - e) ac_cv_lib_ssl_SSL_new=no ;; -esac +else $as_nop + ac_cv_lib_ssl_SSL_new=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5 printf "%s\n" "$ac_cv_lib_ssl_SSL_new" >&6; } @@ -9859,8 +9526,7 @@ fi LIBS="$SAVELIBS" - ;; -esac + fi if test $have_tls = 1 @@ -9888,8 +9554,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_LIBGNUTLSCONFIG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $LIBGNUTLSCONFIG in +else $as_nop + case $LIBGNUTLSCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_LIBGNUTLSCONFIG="$LIBGNUTLSCONFIG" # Let the user override the test with a path. ;; @@ -9914,7 +9580,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi LIBGNUTLSCONFIG=$ac_cv_path_LIBGNUTLSCONFIG @@ -9937,8 +9602,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_LIBGNUTLSCONFIG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ac_pt_LIBGNUTLSCONFIG in +else $as_nop + case $ac_pt_LIBGNUTLSCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$ac_pt_LIBGNUTLSCONFIG" # Let the user override the test with a path. ;; @@ -9963,7 +9628,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ac_pt_LIBGNUTLSCONFIG=$ac_cv_path_ac_pt_LIBGNUTLSCONFIG @@ -10009,12 +9673,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_GNUTLS 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi fi @@ -10078,11 +9741,10 @@ printf "%s\n" "$as_me: Using TLSLIBS=\"$TLSLIBS\"" >&6;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using TLSFLAGS=\"$TLSFLAGS\"" >&5 printf "%s\n" "$as_me: Using TLSFLAGS=\"$TLSFLAGS\"" >&6;} -else case e in #( - e) +else $as_nop + as_fn_error $? "No compatible TLS libraries could be found." "$LINENO" 5 - ;; -esac + fi @@ -10123,22 +9785,16 @@ printf %s "checking for dlopen in -ldl... " >&6; } if test ${ac_cv_lib_dl_dlopen+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (void); + builtin and then its argument prototype would still apply. */ +char dlopen (); int main (void) { @@ -10150,14 +9806,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlopen=yes -else case e in #( - e) ac_cv_lib_dl_dlopen=no ;; -esac +else $as_nop + ac_cv_lib_dl_dlopen=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } @@ -10174,22 +9828,16 @@ printf %s "checking for pam_start in -lpam... " >&6; } if test ${ac_cv_lib_pam_pam_start+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char pam_start (void); + builtin and then its argument prototype would still apply. */ +char pam_start (); int main (void) { @@ -10201,14 +9849,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pam_pam_start=yes -else case e in #( - e) ac_cv_lib_pam_pam_start=no ;; -esac +else $as_nop + ac_cv_lib_pam_pam_start=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 printf "%s\n" "$ac_cv_lib_pam_pam_start" >&6; } @@ -10225,22 +9871,16 @@ printf %s "checking for pam_set_item in -lpam... " >&6; } if test ${ac_cv_lib_pam_pam_set_item+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char pam_set_item (void); + builtin and then its argument prototype would still apply. */ +char pam_set_item (); int main (void) { @@ -10252,14 +9892,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pam_pam_set_item=yes -else case e in #( - e) ac_cv_lib_pam_pam_set_item=no ;; -esac +else $as_nop + ac_cv_lib_pam_pam_set_item=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_set_item" >&5 printf "%s\n" "$ac_cv_lib_pam_pam_set_item" >&6; } @@ -10277,22 +9915,16 @@ printf %s "checking for pam_setcred in -lpam... " >&6; } if test ${ac_cv_lib_pam_pam_setcred+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char pam_setcred (void); + builtin and then its argument prototype would still apply. */ +char pam_setcred (); int main (void) { @@ -10304,14 +9936,12 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pam_pam_setcred=yes -else case e in #( - e) ac_cv_lib_pam_pam_setcred=no ;; -esac +else $as_nop + ac_cv_lib_pam_pam_setcred=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_setcred" >&5 printf "%s\n" "$ac_cv_lib_pam_pam_setcred" >&6; } @@ -10355,11 +9985,10 @@ then : PAMLIBS="-lpam -ldl" -else case e in #( - e) +else $as_nop + PAMLIBS="-lpam" - ;; -esac + fi # Find the PAM configuration directory, if any... @@ -10391,11 +10020,10 @@ then : PAMFILE="pam.opendirectory" -else case e in #( - e) +else $as_nop + PAMFILE="pam.securityserver" - ;; -esac + fi ;; #( *) : @@ -10422,8 +10050,8 @@ then : PAMFILE="pam.system" -else case e in #( - e) +else $as_nop + moddir="" for dir in /lib/security /lib64/security /lib/x86_64-linux-gnu/security /var/lib/pam; do if test -d $dir @@ -10446,8 +10074,7 @@ then : PAMMOD="pam_unix.so" fi - ;; -esac + fi if test "x$PAMMOD" = xpam_unix.so @@ -10455,11 +10082,10 @@ then : PAMMODAUTH="$PAMMOD shadow nodelay" -else case e in #( - e) +else $as_nop + PAMMODAUTH="$PAMMOD nodelay" - ;; -esac + fi ;; #( *) : @@ -10480,34 +10106,31 @@ if test ${enable_largefile+y} then : enableval=$enable_largefile; fi -if test "$enable_largefile,$enable_year2038" != no,no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 -printf %s "checking for $CC option to enable large file support... " >&6; } -if test ${ac_cv_sys_largefile_opts+y} + +if test "$enable_largefile" != no; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_CC="$CC" - ac_opt_found=no - for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do - if test x"$ac_opt" != x"none needed" -then : - CC="$ac_save_CC $ac_opt" -fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#ifndef FTYPE -# define FTYPE off_t -#endif - /* Check that FTYPE can represent 2**63 - 1 correctly. - We can't simply define LARGE_FTYPE to be 9223372036854775807, + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) - int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721 - && LARGE_FTYPE % 2147483647 == 1) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int main (void) @@ -10517,88 +10140,142 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test x"$ac_opt" = x"none needed" -then : - # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. - CC="$CC -DFTYPE=ino_t" if ac_fn_c_try_compile "$LINENO" then : - -else case e in #( - e) CC="$CC -D_FILE_OFFSET_BITS=64" - if ac_fn_c_try_compile "$LINENO" -then : - ac_opt='-D_FILE_OFFSET_BITS=64' + break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi fi - ac_cv_sys_largefile_opts=$ac_opt - ac_opt_found=yes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=no; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - test $ac_opt_found = no || break - done - CC="$ac_save_CC" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ - test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;; -esac + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=64; break fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 -printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } - -ac_have_largefile=yes -case $ac_cv_sys_largefile_opts in #( - "none needed") : - ;; #( - "supported through gnulib") : - ;; #( - "support not detected") : - ac_have_largefile=no ;; #( - "-D_FILE_OFFSET_BITS=64") : - -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h - ;; #( - "-D_LARGE_FILES=1") : - -printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h - ;; #( - "-n32") : - CC="$CC -n32" ;; #( - *) : - as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +;; esac - -if test "$enable_year2038" != no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5 -printf %s "checking for $CC option for timestamps after 2038... " >&6; } -if test ${ac_cv_sys_year2038_opts+y} +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_CPPFLAGS="$CPPFLAGS" - ac_opt_found=no - for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do - if test x"$ac_opt" != x"none needed" +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" then : - CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" + ac_cv_sys_large_files=no; break fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; - +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { @@ -10609,47 +10286,25 @@ main (void) _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_year2038_opts="$ac_opt" - ac_opt_found=yes + ac_cv_sys_large_files=1; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - test $ac_opt_found = no || break - done - CPPFLAGS="$ac_save_CPPFLAGS" - test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;; -esac + ac_cv_sys_large_files=unknown + break +done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 -printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } - -ac_have_year2038=yes -case $ac_cv_sys_year2038_opts in #( - "none needed") : - ;; #( - "support not detected") : - ac_have_year2038=no ;; #( - "-D_TIME_BITS=64") : - -printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h - ;; #( - "-D__MINGW_USE_VC2005_COMPAT") : - -printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h - ;; #( - "-U_USE_32_BIT_TIME_T"*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It -will stop working after mid-January 2038. Remove -_USE_32BIT_TIME_T from the compiler flags. -See 'config.log' for more details" "$LINENO" 5; } ;; #( - *) : - as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +;; esac - +rm -rf conftest* + fi fi -fi LARGEFILE="" if test x$enable_largefile != xno @@ -10679,15 +10334,15 @@ printf %s "checking for long long int... " >&6; } if test ${ac_cv_c_long_long+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + if test "$GCC" = yes then : ac_cv_c_long_long="yes" -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10706,18 +10361,15 @@ then : ac_cv_c_long_long="yes" -else case e in #( - e) +else $as_nop + ac_cv_c_long_long="no" - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; -esac + fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_long_long" >&5 printf "%s\n" "$ac_cv_c_long_long" >&6; } @@ -10846,8 +10498,8 @@ printf "%s\n" "#define HAVE_MDNSRESPONDER 1" >>confdefs.h IPPFIND_MAN="ippfind.1" PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $DNSSDLIBS" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if test $with_dnssd = mdnsresponder @@ -10856,8 +10508,7 @@ then : as_fn_error $? "--with-dnssd=mdnsresponder specified but dns_sd library not present." "$LINENO" 5 fi - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext LIBS="$SAVELIBS" @@ -10884,8 +10535,8 @@ then : fi -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Avahi client" >&5 printf %s "checking for Avahi client... " >&6; } if $PKGCONFIG --exists avahi-client @@ -10903,8 +10554,8 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_AVAHI 1" >>confdefs.h -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if test $with_dnssd = avahi @@ -10913,11 +10564,9 @@ then : as_fn_error $? "--with-dnssd=avahi specified but Avahi client not present." "$LINENO" 5 fi - ;; -esac + fi - ;; -esac + fi fi @@ -11009,8 +10658,8 @@ fi LIBS="$SAVELIBS" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsnapd-glib" >&5 printf %s "checking for libsnapd-glib... " >&6; } if $PKGCONFIG --exists snapd-glib glib-2.0 gio-2.0 @@ -11037,15 +10686,13 @@ fi LIBS="$SAVELIBS" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi - ;; -esac + fi fi @@ -11074,11 +10721,10 @@ then : with_ondemand="launchd" -else case e in #( - e) +else $as_nop + with_ondemand="yes" - ;; -esac + fi elif test "x$with_ondemand" = xyes -a $host_os_name = darwin @@ -11111,16 +10757,15 @@ printf "%s\n" "#define HAVE_ONDEMAND 1" >>confdefs.h with_ondemand="launchd" -else case e in #( - e) +else $as_nop + if test $with_ondemand = launchd then : as_fn_error $? "Need launch_activate_socket/liblaunch for launchd support." "$LINENO" 5 fi - ;; -esac + fi ac_fn_c_check_header_compile "$LINENO" "launch.h" "ac_cv_header_launch_h" "$ac_includes_default" @@ -11151,11 +10796,10 @@ then : withval=$with_systemd; SYSTEMD_DIR="$withval" -else case e in #( - e) +else $as_nop + SYSTEMD_DIR="" - ;; -esac + fi @@ -11173,8 +10817,8 @@ then : fi -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5 printf %s "checking for libsystemd... " >&6; } have_systemd="no" @@ -11206,12 +10850,11 @@ then : fi -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi if test $have_systemd = yes @@ -11241,8 +10884,7 @@ then : fi fi - ;; -esac + fi fi @@ -11265,11 +10907,10 @@ then : withval=$with_smfmanifestdir; SMFMANIFESTDIR="$withval" -else case e in #( - e) +else $as_nop + SMFMANIFESTDIR="" - ;; -esac + fi @@ -11281,11 +10922,10 @@ then : withval=$with_rcdir; rcdir="$withval" -else case e in #( - e) +else $as_nop + rcdir="" - ;; -esac + fi @@ -11295,11 +10935,10 @@ then : withval=$with_rclevels; rclevels="$withval" -else case e in #( - e) +else $as_nop + rclevels="2 3 5" - ;; -esac + fi @@ -11309,11 +10948,10 @@ then : withval=$with_rcstart; rcstart="$withval" -else case e in #( - e) +else $as_nop + rcstart="" - ;; -esac + fi @@ -11323,11 +10961,10 @@ then : withval=$with_rcstop; rcstop="$withval" -else case e in #( - e) +else $as_nop + rcstop="" - ;; -esac + fi @@ -11350,19 +10987,17 @@ then : # Others rcdir="/etc" -else case e in #( - e) +else $as_nop + # RedHat, NetBSD rcdir="/etc/rc.d" - ;; -esac + fi -else case e in #( - e) +else $as_nop + rcdir="no" - ;; -esac + fi fi @@ -11431,11 +11066,10 @@ then : INITDDIR="$rcdir" -else case e in #( - e) +else $as_nop + INITDIR="$rcdir" - ;; -esac + fi fi @@ -11447,11 +11081,10 @@ then : withval=$with_xinetd; xinetd="$withval" -else case e in #( - e) +else $as_nop + xinetd="" - ;; -esac + fi XINETD="" @@ -11519,11 +11152,10 @@ then : withval=$with_exe_file_perm; CUPS_EXE_FILE_PERM="$withval" -else case e in #( - e) +else $as_nop + CUPS_EXE_FILE_PERM="755" - ;; -esac + fi @@ -11535,11 +11167,10 @@ then : withval=$with_config_file_perm; CUPS_CONFIG_FILE_PERM="$withval" -else case e in #( - e) +else $as_nop + CUPS_CONFIG_FILE_PERM="640" - ;; -esac + fi @@ -11554,11 +11185,10 @@ then : withval=$with_cupsd_file_perm; CUPS_CUPSD_FILE_PERM="$withval" -else case e in #( - e) +else $as_nop + CUPS_CUPSD_FILE_PERM="700" - ;; -esac + fi @@ -11570,11 +11200,10 @@ then : withval=$with_log_file_perm; CUPS_LOG_FILE_PERM="$withval" -else case e in #( - e) +else $as_nop + CUPS_LOG_FILE_PERM="644" - ;; -esac + fi @@ -11589,11 +11218,10 @@ then : withval=$with_max_log_size; CUPS_MAX_LOG_SIZE="$withval" -else case e in #( - e) +else $as_nop + CUPS_MAX_LOG_SIZE="1m" - ;; -esac + fi @@ -11608,11 +11236,10 @@ then : withval=$with_error_policy; CUPS_ERROR_POLICY="$withval" -else case e in #( - e) +else $as_nop + CUPS_ERROR_POLICY="stop-printer" - ;; -esac + fi @@ -11627,11 +11254,10 @@ then : withval=$with_fatal_errors; CUPS_FATAL_ERRORS="$withval" -else case e in #( - e) +else $as_nop + CUPS_FATAL_ERRORS="config" - ;; -esac + fi @@ -11646,11 +11272,10 @@ then : withval=$with_log_level; CUPS_LOG_LEVEL="$withval" -else case e in #( - e) +else $as_nop + CUPS_LOG_LEVEL="warn" - ;; -esac + fi @@ -11663,9 +11288,8 @@ printf "%s\n" "#define CUPS_DEFAULT_LOG_LEVEL \"$CUPS_LOG_LEVEL\"" >>confdefs.h if test ${with_access_log_level+y} then : withval=$with_access_log_level; CUPS_ACCESS_LOG_LEVEL="$withval" -else case e in #( - e) CUPS_ACCESS_LOG_LEVEL="none" ;; -esac +else $as_nop + CUPS_ACCESS_LOG_LEVEL="none" fi @@ -11683,11 +11307,10 @@ then : CUPS_PAGE_LOG_FORMAT="" -else case e in #( - e) +else $as_nop + CUPS_PAGE_LOG_FORMAT="PageLogFormat" - ;; -esac + fi @@ -11705,11 +11328,10 @@ then : printf "%s\n" "#define CUPS_DEFAULT_SYNC_ON_CLOSE 1" >>confdefs.h -else case e in #( - e) +else $as_nop + CUPS_SYNC_ON_CLOSE="No" - ;; -esac + fi @@ -11727,14 +11349,13 @@ then : printf "%s\n" "#define CUPS_DEFAULT_BROWSING 0" >>confdefs.h -else case e in #( - e) +else $as_nop + CUPS_BROWSING="Yes" printf "%s\n" "#define CUPS_DEFAULT_BROWSING 1" >>confdefs.h - ;; -esac + fi @@ -11745,11 +11366,10 @@ then : withval=$with_local_protocols; default_local_protocols="$withval" -else case e in #( - e) +else $as_nop + default_local_protocols="default" - ;; -esac + fi @@ -11764,25 +11384,22 @@ then : CUPS_BROWSE_LOCAL_PROTOCOLS="dnssd" -else case e in #( - e) +else $as_nop + CUPS_BROWSE_LOCAL_PROTOCOLS="" - ;; -esac + fi -else case e in #( - e) +else $as_nop + CUPS_BROWSE_LOCAL_PROTOCOLS="$default_local_protocols" - ;; -esac + fi -else case e in #( - e) +else $as_nop + CUPS_BROWSE_LOCAL_PROTOCOLS="" - ;; -esac + fi @@ -11804,14 +11421,13 @@ then : printf "%s\n" "#define CUPS_DEFAULT_DEFAULT_SHARED 0" >>confdefs.h -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_SHARED="Yes" printf "%s\n" "#define CUPS_DEFAULT_DEFAULT_SHARED 1" >>confdefs.h - ;; -esac + fi @@ -11822,8 +11438,8 @@ then : withval=$with_cups_user; CUPS_USER="$withval" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default print user" >&5 printf %s "checking for default print user... " >&6; } if test x$host_os_name = xdarwin @@ -11834,11 +11450,10 @@ then : CUPS_USER="lp" -else case e in #( - e) +else $as_nop + CUPS_USER="_lp" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUPS_USER" >&5 printf "%s\n" "$CUPS_USER" >&6; } @@ -11868,16 +11483,14 @@ printf "%s\n" "not found, using \"$CUPS_USER\"" >&6; } fi -else case e in #( - e) +else $as_nop + CUPS_USER="nobody" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no password file, using \"$CUPS_USER\"" >&5 printf "%s\n" "no password file, using \"$CUPS_USER\"" >&6; } - ;; -esac + fi - ;; -esac + fi @@ -11895,8 +11508,8 @@ then : withval=$with_cups_group; CUPS_GROUP="$withval" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default print group" >&5 printf %s "checking for default print group... " >&6; } if test x$host_os_name = xdarwin @@ -11907,11 +11520,10 @@ then : CUPS_GROUP="lp" -else case e in #( - e) +else $as_nop + CUPS_GROUP="_lp" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUPS_GROUP" >&5 printf "%s\n" "$CUPS_GROUP" >&6; } @@ -11942,16 +11554,14 @@ printf "%s\n" "not found, using \"$CUPS_GROUP\"" >&6; } fi -else case e in #( - e) +else $as_nop + CUPS_GROUP="nobody" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no group file, using \"$CUPS_GROUP\"" >&5 printf "%s\n" "no group file, using \"$CUPS_GROUP\"" >&6; } - ;; -esac + fi - ;; -esac + fi @@ -11969,15 +11579,15 @@ then : withval=$with_system_groups; CUPS_SYSTEM_GROUPS="$withval" -else case e in #( - e) +else $as_nop + if test x$host_os_name = xdarwin then : CUPS_SYSTEM_GROUPS="admin" -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default system groups" >&5 printf %s "checking for default system groups... " >&6; } if test -f /etc/group @@ -11994,11 +11604,10 @@ then : CUPS_SYSTEM_GROUPS="$group" -else case e in #( - e) +else $as_nop + CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group" - ;; -esac + fi fi @@ -12011,27 +11620,23 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no groups found, using \"$CUPS_SYSTEM_GROUPS\"" >&5 printf "%s\n" "no groups found, using \"$CUPS_SYSTEM_GROUPS\"" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$CUPS_SYSTEM_GROUPS\"" >&5 printf "%s\n" "\"$CUPS_SYSTEM_GROUPS\"" >&6; } - ;; -esac + fi -else case e in #( - e) +else $as_nop + CUPS_SYSTEM_GROUPS="$GROUP_LIST" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no group file, using \"$CUPS_SYSTEM_GROUPS\"" >&5 printf "%s\n" "no group file, using \"$CUPS_SYSTEM_GROUPS\"" >&6; } - ;; -esac + fi - ;; -esac + fi - ;; -esac + fi @@ -12069,11 +11674,10 @@ then : withval=$with_printcap; default_printcap="$withval" -else case e in #( - e) +else $as_nop + default_printcap="default" - ;; -esac + fi @@ -12100,18 +11704,16 @@ then : ;; esac -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_PRINTCAP="$default_printcap" - ;; -esac + fi -else case e in #( - e) +else $as_nop + CUPS_DEFAULT_PRINTCAP="" - ;; -esac + fi @@ -12126,11 +11728,10 @@ then : withval=$with_max_copies; CUPS_MAX_COPIES="$withval" -else case e in #( - e) +else $as_nop + CUPS_MAX_COPIES="9999" - ;; -esac + fi @@ -12150,11 +11751,10 @@ then : DEFAULT_RAW_PRINTING="" -else case e in #( - e) +else $as_nop + DEFAULT_RAW_PRINTING="#" - ;; -esac + fi @@ -12168,28 +11768,25 @@ then : CUPS_SNMP_ADDRESS="" -else case e in #( - e) +else $as_nop + CUPS_SNMP_ADDRESS="Address $withval" - ;; -esac + fi -else case e in #( - e) +else $as_nop + if test "x$host_os_name" = xdarwin then : CUPS_SNMP_ADDRESS="" -else case e in #( - e) +else $as_nop + CUPS_SNMP_ADDRESS="Address @LOCAL" - ;; -esac + fi - ;; -esac + fi @@ -12200,11 +11797,10 @@ then : withval=$with_snmp_community; CUPS_SNMP_COMMUNITY="Community $withval" -else case e in #( - e) +else $as_nop + CUPS_SNMP_COMMUNITY="Community public" - ;; -esac + fi @@ -12218,11 +11814,10 @@ then : withval=$with_ipp_port; DEFAULT_IPP_PORT="$withval" -else case e in #( - e) +else $as_nop + DEFAULT_IPP_PORT="631" - ;; -esac + fi @@ -12256,12 +11851,11 @@ then : CUPS_WEBIF=No CUPS_DEFAULT_WEBIF=0 -else case e in #( - e) +else $as_nop + CUPS_WEBIF=Yes CUPS_DEFAULT_WEBIF=1 - ;; -esac + fi ;; #( *) : @@ -12293,26 +11887,23 @@ then : EXIT_TIMEOUT="IdleExitTimeout 0" -else case e in #( - e) +else $as_nop + EXIT_TIMEOUT="IdleExitTimeout $withval" - ;; -esac + fi -else case e in #( - e) +else $as_nop + EXIT_TIMEOUT="IdleExitTimeout 60" - ;; -esac + fi -else case e in #( - e) +else $as_nop + EXIT_TIMEOUT="" - ;; -esac + fi @@ -12327,18 +11918,16 @@ then : TIMEOUTSTARTSEC="TimeoutStartSec=infinity" -else case e in #( - e) +else $as_nop + TIMEOUTSTARTSEC="TimeoutStartSec=$withval" - ;; -esac + fi -else case e in #( - e) +else $as_nop + TIMEOUTSTARTSEC="" - ;; -esac + fi @@ -12361,13 +11950,6 @@ then : INSTALL_LANGUAGES="install-languages" UNINSTALL_LANGUAGES="uninstall-languages" for lang in $LANGUAGES; do - if test -f doc/$lang/index.html.in -then : - - LANGFILES="$LANGFILES doc/$lang/index.html" - -fi - if test -f templates/$lang/header.tmpl.in then : @@ -12387,7 +11969,7 @@ fi -ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES" +ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc desktop/cups.desktop scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12399,8 +11981,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -12430,14 +12012,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (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 + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -12498,12 +12080,6 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -# Check whether --enable-year2038 was given. -if test ${enable_year2038+y} -then : - enableval=$enable_year2038; -fi - : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -12533,6 +12109,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -12541,13 +12118,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -12619,7 +12195,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -12648,6 +12224,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -12687,12 +12264,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -12706,12 +12282,11 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -12794,9 +12369,9 @@ 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 -pR'. + # 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 -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -12877,12 +12452,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -12898,7 +12471,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.5b1, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12929,7 +12502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$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. @@ -12963,10 +12536,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ CUPS config.status 2.5b1 -configured by $0, generated by GNU Autoconf 2.72, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13026,8 +12599,8 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: '$1' -Try '$0 --help' for more information.";; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -13035,8 +12608,8 @@ Try '$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -13093,7 +12666,6 @@ do "conf/snmp.conf") CONFIG_FILES="$CONFIG_FILES conf/snmp.conf" ;; "cups.pc") CONFIG_FILES="$CONFIG_FILES cups.pc" ;; "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;; - "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;; "scheduler/cups-lpd.xinetd") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpd.xinetd" ;; "scheduler/cups.sh") CONFIG_FILES="$CONFIG_FILES scheduler/cups.sh" ;; "scheduler/cups.xml") CONFIG_FILES="$CONFIG_FILES scheduler/cups.xml" ;; @@ -13106,7 +12678,7 @@ do "packaging/cups.list") CONFIG_FILES="$CONFIG_FILES packaging/cups.list" ;; "$LANGFILES") CONFIG_FILES="$CONFIG_FILES $LANGFILES" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -13125,7 +12697,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -13149,7 +12721,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -13307,13 +12879,13 @@ 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'. +# 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 +# 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. @@ -13423,7 +12995,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -13445,19 +13017,19 @@ do -) 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 ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$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 + # 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 '` @@ -13581,7 +13153,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -13610,9 +13182,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$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 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index db3e79a092..3e6650686e 100644 --- a/configure.ac +++ b/configure.ac @@ -54,10 +54,6 @@ AS_IF([test "x$LANGUAGES" != x], [ INSTALL_LANGUAGES="install-languages" UNINSTALL_LANGUAGES="uninstall-languages" for lang in $LANGUAGES; do - AS_IF([test -f doc/$lang/index.html.in], [ - LANGFILES="$LANGFILES doc/$lang/index.html" - ]) - AS_IF([test -f templates/$lang/header.tmpl.in], [ LANGFILES="$LANGFILES templates/$lang/header.tmpl" ]) @@ -80,7 +76,6 @@ AC_CONFIG_FILES([ conf/snmp.conf cups.pc desktop/cups.desktop - doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml diff --git a/doc/cups.css b/doc/cups.css index f13e8cb2c4..455f735cd2 100644 --- a/doc/cups.css +++ b/doc/cups.css @@ -27,12 +27,15 @@ .cups-header ul li { float: left; } +.cups-header ul li.right { + float: right; +} .cups-header a { display: block; padding: 18px 30px !important; } .cups-header a.img { - padding: 12px 24px !important; + padding: 16px 24px 8px !important; } .cups-header a:link, .cups-header a:visited { color: white !important; @@ -49,6 +52,10 @@ color: black !important; text-decoration: none !important; } +.cups-header form { + display: block; + padding: 15px 30px !important; +} .cups-body { margin-bottom: 20px; diff --git a/scheduler/client.c b/scheduler/client.c index 9ea59c09cb..8f89b0801a 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -1090,7 +1090,7 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ } } } - else if (!buf[0] && (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/help", 5) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))) + else if (!buf[0] && (!strcmp(con->uri, "/") || !strncmp(con->uri, "/?", 2) || !strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/help", 5) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))) { if (!WebInterface) { @@ -1111,7 +1111,12 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ * Send CGI output... */ - if (!strncmp(con->uri, "/admin", 6)) + if (!strcmp(con->uri, "/") || !strncmp(con->uri, "/?", 2)) + { + cupsdSetStringf(&con->command, "%s/cgi-bin/home.cgi", ServerBin); + cupsdSetString(&con->options, strchr(con->uri + 1, '?')); + } + else if (!strncmp(con->uri, "/admin", 6)) { cupsdSetStringf(&con->command, "%s/cgi-bin/admin.cgi", ServerBin); cupsdSetString(&con->options, strchr(con->uri + 6, '?')); @@ -1302,13 +1307,18 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ } } } - else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/printers", 9) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/help", 5) || !strncmp(con->uri, "/jobs", 5)) + else if (!strcmp(con->uri, "/") || !strncmp(con->uri, "/?", 2) || !strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/printers", 9) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/help", 5) || !strncmp(con->uri, "/jobs", 5)) { /* * CGI request... */ - if (!strncmp(con->uri, "/admin", 6)) + if (!strcmp(con->uri, "/") || !strncmp(con->uri, "/?", 2)) + { + cupsdSetStringf(&con->command, "%s/cgi-bin/home.cgi", ServerBin); + cupsdSetString(&con->options, strchr(con->uri + 1, '?')); + } + else if (!strncmp(con->uri, "/admin", 6)) { cupsdSetStringf(&con->command, "%s/cgi-bin/admin.cgi", ServerBin); cupsdSetString(&con->options, strchr(con->uri + 6, '?')); @@ -1497,7 +1507,7 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ break; } - if (!buf[0] && (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/help", 5) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))) + if (!buf[0] && (!strcmp(con->uri, "/") || !strncmp(con->uri, "/?", 2) || !strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/help", 5) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))) { /* * CGI output... @@ -2745,7 +2755,15 @@ get_file(cupsd_client_t *con, /* I - Client connection */ filename[0] = '\0'; language[0] = '\0'; - if (!strncmp(con->uri, "/help", 5) && (con->uri[5] == '/' || !con->uri[5])) + if (!strcmp(con->uri, "/") || !strncmp(con->uri, "/?", 2)) + { + /* + * The homepage/dashboard is served by the home.cgi program... + */ + + return (NULL); + } + else if (!strncmp(con->uri, "/help", 5) && (con->uri[5] == '/' || !con->uri[5])) { /* * All help files are served by the help.cgi program... @@ -3435,6 +3453,7 @@ pipe_command(cupsd_client_t *con, /* I - Client connection */ envp[envc ++] = auth_type; envp[envc ++] = lang; + envp[envc ++] = "CUPS_VERSION=" CUPS_SVERSION; envp[envc ++] = "REDIRECT_STATUS=1"; envp[envc ++] = "GATEWAY_INTERFACE=CGI/1.1"; envp[envc ++] = server_name; diff --git a/templates/Makefile b/templates/Makefile index ba4919a58c..aa38ea401f 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,11 +1,10 @@ # # Template makefile for CUPS. # -# Copyright © 2020-2024 by OpenPrinting. -# Copyright 2007-2017 by Apple Inc. -# Copyright 1993-2007 by Easy Software Products. +# Copyright © 2020-2025 by OpenPrinting. # -# Licensed under Apache License v2.0. See the file "LICENSE" for more information. +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # include ../Makedefs @@ -39,6 +38,7 @@ FILES = \ help-header.tmpl \ help-trailer.tmpl \ help-printable.tmpl \ + home.tmpl \ job-cancel.tmpl \ job-hold.tmpl \ job-move.tmpl \ diff --git a/doc/da/index.html.in b/templates/da/home.tmpl similarity index 64% rename from doc/da/index.html.in rename to templates/da/home.tmpl index e7ae9f6690..3b9fdf2898 100644 --- a/doc/da/index.html.in +++ b/templates/da/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Hjem - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af OpenPrinting til Linux® og andre UNIX®-lignende styresystemer. CUPS uses IPP Everywhere™ to support printing to local and network printers

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

CUPS-programmeringsmanual

Filter- og backendprogrammering

-
-
-
Ophavsret © 2021-2025 OpenPrinting. Alle rettigheder forbeholdt.
- - diff --git a/doc/de/index.html.in b/templates/de/home.tmpl similarity index 63% rename from doc/de/index.html.in rename to templates/de/home.tmpl index 10faa7fe91..fa09b12d61 100644 --- a/doc/de/index.html.in +++ b/templates/de/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Startseite - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

OpenPrinting CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch OpenPrinting für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt IPP Everywhere™ zur Unterstützung lokaler und Netzwerkdrucker.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

CUPS Programming Manual

Filter und Backend Programmierung

-
-
-
Copyright © 2021-2025 OpenPrinting. Alle Rechte vorbehalten.
- - diff --git a/doc/es/index.html.in b/templates/es/home.tmpl similarity index 65% rename from doc/es/index.html.in rename to templates/es/home.tmpl index 955c7f37ca..ff33eed396 100644 --- a/doc/es/index.html.in +++ b/templates/es/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Inicio - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por OpenPrinting para macOS® y otros sistemas operativos tipo UNIX®. CUPS uses IPP Everywhere™ to support printing to local and network printers.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

CUPS Programming Manual

Programación de filtros y programas de conexión

-
-
-
Derechos de autor © 2021-2025 OpenPrinting. Todos los derechos reservados.
- - diff --git a/doc/fr/index.html.in b/templates/fr/home.tmpl similarity index 64% rename from doc/fr/index.html.in rename to templates/fr/home.tmpl index 98b770586f..fa8a52e1d5 100644 --- a/doc/fr/index.html.in +++ b/templates/fr/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Home - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

OpenPrinting CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

Le système d'impression open source basé sur des normes, développé par OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ pour prendre en charge l'impression vers des imprimantes locales et de réseau.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

Manuel de programmation CUPS

Filter and Backend Programming

-
-
-
Copyright © 2021-2025 OpenPrinting. All rights reserved.
- - diff --git a/templates/header.tmpl.in b/templates/header.tmpl.in index 71883fa29e..c8423d0c9d 100644 --- a/templates/header.tmpl.in +++ b/templates/header.tmpl.in @@ -24,18 +24,20 @@ } } --> - {title} - CUPS @CUPS_VERSION@ + {title} - {ENV:CUPS_VERSION}
diff --git a/doc/index.html.in b/templates/home.tmpl similarity index 63% rename from doc/index.html.in rename to templates/home.tmpl index a29a847d98..2a5c174336 100644 --- a/doc/index.html.in +++ b/templates/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Home - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

OpenPrinting CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

The standards-based, open source printing system developed by OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ to support printing to local and network printers.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

CUPS Programming Manual

Filter and Backend Programming

-
-
-
Copyright © 2021-2025 OpenPrinting. All rights reserved.
- - diff --git a/doc/ja/index.html.in b/templates/ja/home.tmpl similarity index 63% rename from doc/ja/index.html.in rename to templates/ja/home.tmpl index 1780bb4a04..29dd3900e5 100644 --- a/doc/ja/index.html.in +++ b/templates/ja/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - ホーム - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

CUPS は、macOS® およびその他の UNIX ® ç³» OS のために、Apple Inc. によって開発された標準ベースのオープンソース印刷システムです。

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

CUPS Programming Manual

フィルタとバックエンドのプログラミング

-
-
-
Copyright © 2021-2025 OpenPrinting. All rights reserved.
- - diff --git a/doc/pl/index.html.in b/templates/pl/home.tmpl similarity index 63% rename from doc/pl/index.html.in rename to templates/pl/home.tmpl index fc8af0a9f6..a0ab17fae7 100644 --- a/doc/pl/index.html.in +++ b/templates/pl/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Start - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

OpenPrinting CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

Oparty na standardach i otwartych źródłach system wydruku stworzony przez OpenPrinting na Linux® i inne systemy typu Unix®. CUPS używa IPP Everywhere™ do drukowania na lokalnych i sieciowych drukarkach.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

Podręcznik programowania CUPS

Programowanie filtrów i zadań serwera

-
-
-
Prawa autorskie © 2021-2025 OpenPrinting. Wszystkie prawa zastrzeżone.
- - diff --git a/doc/pt_BR/index.html.in b/templates/pt_BR/home.tmpl similarity index 65% rename from doc/pt_BR/index.html.in rename to templates/pt_BR/home.tmpl index 0fedb81802..48ecdb3f00 100644 --- a/doc/pt_BR/index.html.in +++ b/templates/pt_BR/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Início - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela OpenPrinting para Linux® e outros sistemas operacionais similares ao UNIX®. CUPS uses IPP Everywhere™ to support printing to local and network printers.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

CUPS Programming Manual

Programação de filtros e backend

-
-
-
Copyright © 2021-2025 OpenPrinting. Todos os direitos reservados.
- - diff --git a/doc/ru/index.html.in b/templates/ru/home.tmpl similarity index 66% rename from doc/ru/index.html.in rename to templates/ru/home.tmpl index 8f3ad10498..f6fa7c486b 100644 --- a/doc/ru/index.html.in +++ b/templates/ru/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Home - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

OpenPrinting CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией OpenPrinting для операционной системы Linux® и других UNIX®-подобных операционных систем. CUPS uses IPP Everywhere™ to support printing to local and network printers

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -52,9 +31,4 @@

CUPS для разработчиков

CUPS Programming Manual

Разработка фильтров и модулей

-
-
-
-
Copyright © 2021-2025 OpenPrinting. All Rights Reserved.
- - +
diff --git a/doc/sv/index.html.in b/templates/sv/home.tmpl similarity index 64% rename from doc/sv/index.html.in rename to templates/sv/home.tmpl index 103ded90d2..5da914020e 100644 --- a/doc/sv/index.html.in +++ b/templates/sv/home.tmpl @@ -1,29 +1,4 @@ - - - - - - - - - - Hem - CUPS @CUPS_VERSION@ - - -
- -
-
-
-

CUPS @CUPS_VERSION@

+

{ENV:CUPS_VERSION}

Det standardbaserade utskriftssystemet med öppen källkod som utvecklats av OpenPrinting för Linux® och andra Unix®-liknande operativsystem. CUPS använder IPP Everywhere™ för att ge stöd för utskrifter till lokala skrivare och nätverksskrivare.

@@ -33,6 +8,10 @@
+ {#alert_title=0?:

Alerts:

+ }
@@ -53,8 +32,3 @@

Programmeringsmanual för CUPS

Programmering av filter och backend

-
-
-
Copyright © 2021-2025 OpenPrinting. All rights reserved.
- - diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index 587705d7e6..81467535a3 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -71,6 +71,7 @@ buildPhases = ( ); dependencies = ( + 2707C9652DC29A9F00F0EA95 /* PBXTargetDependency */, 27C3E96E2DB04B5800A6ABBF /* PBXTargetDependency */, 27C3E9702DB04B5800A6ABBF /* PBXTargetDependency */, 273B1EC2226B3F2600428143 /* PBXTargetDependency */, @@ -191,6 +192,9 @@ 270696521CADF3E200FFE5FB /* language.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEB133305BB00FCA411 /* language.h */; settings = {ATTRIBUTES = (Public, ); }; }; 270696551CADF3E200FFE5FB /* transcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F07133305BB00FCA411 /* transcode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 2706965B1CAE1A9A00FFE5FB /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F09133305BB00FCA411 /* util.c */; }; + 2707C95D2DC29A4A00F0EA95 /* libcupscgi2_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 724FA76B1CC03AF60092477B /* libcupscgi2_static.a */; }; + 2707C95E2DC29A4A00F0EA95 /* libcups2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups2.dylib */; }; + 2707C9672DC29B0F00F0EA95 /* home.c in Sources */ = {isa = PBXBuildFile; fileRef = 2707C9662DC29B0F00F0EA95 /* home.c */; }; 270CCDBC135E3D3E00007BE2 /* testmime.c in Sources */ = {isa = PBXBuildFile; fileRef = 270CCDBB135E3D3E00007BE2 /* testmime.c */; }; 270D02191D707E0200EA9403 /* libcups_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72A4332F155844CF002E172D /* libcups_static.a */; }; 270D021A1D707E0200EA9403 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E5136B64AF00836530 /* CoreFoundation.framework */; }; @@ -1141,6 +1145,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 2707C9592DC29A4A00F0EA95 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 72BF96371333042100B1EAD7 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 72220EAD1333047D00FCA411; + remoteInfo = libcups; + }; + 2707C9642DC29A9F00F0EA95 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 72BF96371333042100B1EAD7 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 2707C9572DC29A4A00F0EA95; + remoteInfo = home.cgi; + }; 270CCDB1135E3CDE00007BE2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 72BF96371333042100B1EAD7 /* Project object */; @@ -2593,6 +2611,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 2707C95F2DC29A4A00F0EA95 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; 270CCDA5135E3C9E00007BE2 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -3461,6 +3488,8 @@ /* Begin PBXFileReference section */ 2706965A1CADF3E200FFE5FB /* libcups2_ios.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libcups2_ios.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 2707C9632DC29A4A00F0EA95 /* home.cgi */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = home.cgi; sourceTree = BUILT_PRODUCTS_DIR; }; + 2707C9662DC29B0F00F0EA95 /* home.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = home.c; sourceTree = ""; }; 270B267E17F5C06700C8A3A9 /* tls-gnutls.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "tls-gnutls.c"; path = "../cups/tls-gnutls.c"; sourceTree = ""; }; 270CCDA7135E3C9E00007BE2 /* testmime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testmime; sourceTree = BUILT_PRODUCTS_DIR; }; 270CCDBB135E3D3E00007BE2 /* testmime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testmime.c; path = ../scheduler/testmime.c; sourceTree = ""; }; @@ -3950,6 +3979,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 2707C95C2DC29A4A00F0EA95 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2707C95D2DC29A4A00F0EA95 /* libcupscgi2_static.a in Frameworks */, + 2707C95E2DC29A4A00F0EA95 /* libcups2.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 270CCDA4135E3C9E00007BE2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -5506,6 +5544,7 @@ 275CEA422CC840EE008FBB27 /* testclock */, 27C3E95B2DB04AC500A6ABBF /* cups-x509 */, 27C3E9672DB04ACE00A6ABBF /* cups-oauth */, + 2707C9632DC29A4A00F0EA95 /* home.cgi */, ); name = Products; sourceTree = ""; @@ -5799,6 +5838,7 @@ 727EF033192E3498001EF690 /* help-index.c */, 727EF034192E3498001EF690 /* help-index.h */, 727EF035192E3498001EF690 /* help.c */, + 2707C9662DC29B0F00F0EA95 /* home.c */, 727EF036192E3498001EF690 /* html.c */, 727EF037192E3498001EF690 /* ipp-var.c */, 727EF038192E3498001EF690 /* jobs.c */, @@ -5808,7 +5848,8 @@ 727EF040192E3498001EF690 /* var.c */, ); name = "cgi-bin"; - sourceTree = ""; + path = "../cgi-bin"; + sourceTree = SOURCE_ROOT; }; 72BF96351333042100B1EAD7 = { isa = PBXGroup; @@ -6077,6 +6118,24 @@ productReference = 2706965A1CADF3E200FFE5FB /* libcups2_ios.a */; productType = "com.apple.product-type.library.dynamic"; }; + 2707C9572DC29A4A00F0EA95 /* home.cgi */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2707C9602DC29A4A00F0EA95 /* Build configuration list for PBXNativeTarget "home.cgi" */; + buildPhases = ( + 2707C95A2DC29A4A00F0EA95 /* Sources */, + 2707C95C2DC29A4A00F0EA95 /* Frameworks */, + 2707C95F2DC29A4A00F0EA95 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 2707C9582DC29A4A00F0EA95 /* PBXTargetDependency */, + ); + name = home.cgi; + productName = cupsaddsmb; + productReference = 2707C9632DC29A4A00F0EA95 /* home.cgi */; + productType = "com.apple.product-type.tool"; + }; 270CCDA6135E3C9E00007BE2 /* testmime */ = { isa = PBXNativeTarget; buildConfigurationList = 270CCDAF135E3C9E00007BE2 /* Build configuration list for PBXNativeTarget "testmime" */; @@ -7992,6 +8051,7 @@ 724379461333FEA9009631B9 /* dnssd */, 2712871E1CC140BE00E517C7 /* genstrings */, 271285DA1CC12DDF00E517C7 /* gziptoany */, + 2707C9572DC29A4A00F0EA95 /* home.cgi */, 724378FC1333E43E009631B9 /* ipp */, 273B1E9A226B3E4800428143 /* ippevepcl */, 726AD6F6135E88F0002C930D /* ippeveprinter */, @@ -8124,6 +8184,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 2707C95A2DC29A4A00F0EA95 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2707C9672DC29B0F00F0EA95 /* home.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 270CCDA3135E3C9E00007BE2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -9143,6 +9211,16 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 2707C9582DC29A4A00F0EA95 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 72220EAD1333047D00FCA411 /* libcups2 */; + targetProxy = 2707C9592DC29A4A00F0EA95 /* PBXContainerItemProxy */; + }; + 2707C9652DC29A9F00F0EA95 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 2707C9572DC29A4A00F0EA95 /* home.cgi */; + targetProxy = 2707C9642DC29A9F00F0EA95 /* PBXContainerItemProxy */; + }; 270CCDB2135E3CDE00007BE2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 270CCDA6135E3C9E00007BE2 /* testmime */; @@ -10225,6 +10303,30 @@ }; name = Release; }; + 2707C9612DC29A4A00F0EA95 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; + DEAD_CODE_STRIPPING = YES; + GCC_C_LANGUAGE_STANDARD = c99; + INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 2707C9622DC29A4A00F0EA95 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; + DEAD_CODE_STRIPPING = YES; + GCC_C_LANGUAGE_STANDARD = c99; + INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 270CCDAD135E3C9E00007BE2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -12919,6 +13021,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 2707C9602DC29A4A00F0EA95 /* Build configuration list for PBXNativeTarget "home.cgi" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2707C9612DC29A4A00F0EA95 /* Debug */, + 2707C9622DC29A4A00F0EA95 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 270CCDAF135E3C9E00007BE2 /* Build configuration list for PBXNativeTarget "testmime" */ = { isa = XCConfigurationList; buildConfigurations = (