From 560c28ad38386f8a9579e2a32ddb6a7b903d754b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 23 Mar 2026 16:04:02 +0100
Subject: [PATCH v2 3/4] Remove -Wendif-labels

This has been the default since gcc 4.0.  (Introduced in 3.3, so it
was only available but turned off for a relatively short time.)
---
 configure    | 91 ----------------------------------------------------
 configure.ac |  2 --
 meson.build  |  1 -
 3 files changed, 94 deletions(-)

diff --git a/configure b/configure
index 0d3f634abec..8e0e7483c1d 100755
--- a/configure
+++ b/configure
@@ -5435,97 +5435,6 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wendif-labels, for CFLAGS" >&5
-$as_echo_n "checking whether ${CC} supports -Wendif-labels, for CFLAGS... " >&6; }
-if ${pgac_cv_prog_CC_cflags__Wendif_labels+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  pgac_save_CFLAGS=$CFLAGS
-pgac_save_CC=$CC
-CC=${CC}
-CFLAGS="${CFLAGS} -Wendif-labels"
-ac_save_c_werror_flag=$ac_c_werror_flag
-ac_c_werror_flag=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv_prog_CC_cflags__Wendif_labels=yes
-else
-  pgac_cv_prog_CC_cflags__Wendif_labels=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_c_werror_flag=$ac_save_c_werror_flag
-CFLAGS="$pgac_save_CFLAGS"
-CC="$pgac_save_CC"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Wendif_labels" >&5
-$as_echo "$pgac_cv_prog_CC_cflags__Wendif_labels" >&6; }
-if test x"$pgac_cv_prog_CC_cflags__Wendif_labels" = x"yes"; then
-  CFLAGS="${CFLAGS} -Wendif-labels"
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Wendif-labels, for CXXFLAGS" >&5
-$as_echo_n "checking whether ${CXX} supports -Wendif-labels, for CXXFLAGS... " >&6; }
-if ${pgac_cv_prog_CXX_cxxflags__Wendif_labels+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  pgac_save_CXXFLAGS=$CXXFLAGS
-pgac_save_CXX=$CXX
-CXX=${CXX}
-CXXFLAGS="${CXXFLAGS} -Wendif-labels"
-ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-ac_cxx_werror_flag=yes
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  pgac_cv_prog_CXX_cxxflags__Wendif_labels=yes
-else
-  pgac_cv_prog_CXX_cxxflags__Wendif_labels=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-CXXFLAGS="$pgac_save_CXXFLAGS"
-CXX="$pgac_save_CXX"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CXX_cxxflags__Wendif_labels" >&5
-$as_echo "$pgac_cv_prog_CXX_cxxflags__Wendif_labels" >&6; }
-if test x"$pgac_cv_prog_CXX_cxxflags__Wendif_labels" = x"yes"; then
-  CXXFLAGS="${CXXFLAGS} -Wendif-labels"
-fi
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wmissing-format-attribute, for CFLAGS" >&5
 $as_echo_n "checking whether ${CC} supports -Wmissing-format-attribute, for CFLAGS... " >&6; }
 if ${pgac_cv_prog_CC_cflags__Wmissing_format_attribute+:} false; then :
diff --git a/configure.ac b/configure.ac
index f8327a7020a..2baac5e9da7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -553,8 +553,6 @@ if test "$GCC" = yes -a "$ICC" = no; then
   # On macOS, complain about usage of symbols newer than the deployment target
   PGAC_PROG_CC_CFLAGS_OPT([-Werror=unguarded-availability-new])
   PGAC_PROG_CXX_CFLAGS_OPT([-Werror=unguarded-availability-new])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
-  PGAC_PROG_CXX_CFLAGS_OPT([-Wendif-labels])
   PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])
   PGAC_PROG_CXX_CFLAGS_OPT([-Wmissing-format-attribute])
 
diff --git a/meson.build b/meson.build
index cfd590117dc..ec9188af49e 100644
--- a/meson.build
+++ b/meson.build
@@ -2204,7 +2204,6 @@ common_warning_flags = [
   '-Werror=vla',
   # On macOS, complain about usage of symbols newer than the deployment target
   '-Werror=unguarded-availability-new',
-  '-Wendif-labels',
   '-Wmissing-format-attribute',
   '-Wcast-function-type',
   '-Wshadow=compatible-local',
-- 
2.53.0