From: Michael R Sweet <msweet@msweet.org>
Date: Thu, 4 Mar 2021 20:10:05 +0000 (-0500)
Subject: Fix builds.
X-Git-Tag: v2.4b1~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b64381e9c5935a20daea3e10c74b6e8874d28427;p=thirdparty%2Fcups.git

Fix builds.
---

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 154cf7cb8f..6c8744a727 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -350,7 +350,7 @@ CUPS_DEFAULT_SYSTEM_AUTHKEY=""
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""
 
-AS_CASE([host_os_name], [darwin*], [
+AS_CASE([$host_os_name], [darwin*], [
     BACKLIBS="$BACKLIBS -framework IOKit"
     SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices"
     LIBS="-framework CoreFoundation -framework Security $LIBS"
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index f764282b76..9120720ba6 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -171,10 +171,10 @@ AS_IF([test -n "$GCC"], [
     ])
 
     dnl Show all standard warnings + unused variables when compiling...
-    WARNINGS="-Wall -Wunused"
+    WARNING_OPTIONS="-Wall -Wunused"
 
     dnl Drop some not-useful/unreliable warnings...
-    for warning in char-subscripts format-truncation format-y2k switch unused-result; do
+    for warning in char-subscripts deprecated-declarations format-truncation format-y2k switch unused-result; do
 	AC_MSG_CHECKING([whether compiler supports -Wno-$warning])
 
 	OLDCFLAGS="$CFLAGS"
@@ -182,7 +182,7 @@ AS_IF([test -n "$GCC"], [
 
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
 	    AC_MSG_RESULT(yes)
-	    WARNINGS="$WARNINGS -Wno-$warning"
+	    WARNING_OPTIONS="$WARNINGS -Wno-$warning"
         ], [
 	    AC_MSG_RESULT(no)
 	])
@@ -192,7 +192,7 @@ AS_IF([test -n "$GCC"], [
 
     dnl Maintainer mode enables -Werror...
     AS_IF([test x$enable_maintainer = xyes], [
-	WARNINGS="$WARNINGS -Werror"
+	WARNING_OPTIONS="$WARNING_OPTIONS -Werror"
     ])
 ], [
     # Add vendor-specific compiler options...
@@ -215,7 +215,6 @@ AS_IF([test -n "$GCC"], [
 	echo "variables before running configure."
 	echo ""
 	echo "https://github.com/openprinting/cups"
-	;;
     ])
 ])
 
diff --git a/configure b/configure
index d6c41e9c3b..848e118bb6 100755
--- a/configure
+++ b/configure
@@ -6873,7 +6873,7 @@ CUPS_DEFAULT_SYSTEM_AUTHKEY=""
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""
 
-case host_os_name in #(
+case $host_os_name in #(
   darwin*) :
 
     BACKLIBS="$BACKLIBS -framework IOKit"
@@ -8035,9 +8035,9 @@ esac
 
 fi
 
-        WARNINGS="-Wall -Wunused"
+        WARNING_OPTIONS="-Wall -Wunused"
 
-        for warning in char-subscripts format-truncation format-y2k switch unused-result; do
+        for warning in char-subscripts deprecated-declarations format-truncation format-y2k switch unused-result; do
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-$warning" >&5
 printf %s "checking whether compiler supports -Wno-$warning... " >&6; }
 
@@ -8060,7 +8060,7 @@ then :
 
 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	    WARNINGS="$WARNINGS -Wno-$warning"
+	    WARNING_OPTIONS="$WARNINGS -Wno-$warning"
 
 else $as_nop
 
@@ -8076,7 +8076,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
         if test x$enable_maintainer = xyes
 then :
 
-	WARNINGS="$WARNINGS -Werror"
+	WARNING_OPTIONS="$WARNING_OPTIONS -Werror"
 
 fi
 
@@ -8112,7 +8112,6 @@ fi
 	echo "variables before running configure."
 	echo ""
 	echo "https://github.com/openprinting/cups"
-	;;
      ;; #(
   *) :
      ;;