[Heroes] heroes ./ChangeLog m4/gccwarn.m4 m4/getoptlong.m4

[Alexandre Duret-Lutz]

CVSROOT:        /cvsroot/heroes
Module name:    heroes
Changes by:     Alexandre Duret-Lutz <address@hidden>   02/11/24 16:02:26

Modified files:
        .              : ChangeLog 
        m4             : gccwarn.m4 getoptlong.m4 

Log message:
        * m4/gccwarn.m4 (CF_GCC_WARNINGS): Remove -Wredundant-decls.  This
        gives warnings in glibc's headers with GCC 2.95.
        * m4/getoptlong.m4: Use AC_CHECK_HEADERS instead of AC_CHECK_HEADER,
        otherwise HAVE_GETOPT_H is never defined.

Patches:
Index: heroes/ChangeLog
diff -u heroes/ChangeLog:1.804 heroes/ChangeLog:1.805
--- heroes/ChangeLog:1.804      Fri Nov 22 15:47:45 2002
+++ heroes/ChangeLog    Sun Nov 24 16:02:26 2002
@@ -1,3 +1,10 @@
+2002-11-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/gccwarn.m4 (CF_GCC_WARNINGS): Remove -Wredundant-decls.  This
+       gives warnings in glibc's headers with GCC 2.95.
+       * m4/getoptlong.m4: Use AC_CHECK_HEADERS instead of AC_CHECK_HEADER,
+       otherwise HAVE_GETOPT_H is never defined.
+
 2002-11-22  Alexandre Duret-Lutz  <address@hidden>
 
        * m4/gccwarn.m4 (CF_GCC_WARNINGS): Add -Wredundant-decls.
Index: heroes/m4/gccwarn.m4
diff -u heroes/m4/gccwarn.m4:1.6 heroes/m4/gccwarn.m4:1.7
--- heroes/m4/gccwarn.m4:1.6    Fri Nov 22 15:47:24 2002
+++ heroes/m4/gccwarn.m4        Sun Nov 24 16:02:26 2002
@@ -7,6 +7,8 @@
 dnl -Wtraditional (combines too many unrelated messages, only a few useful)
 dnl -Wredundant-decls (system headers make this too noisy)
 dnl -pedantic
+dnl -Wunreachable-code (broken, see GCC PR/7827)
+dnl -Wredundant-decls (too many warnings in GLIBC's header with old GCC)
 dnl
 
 AC_DEFUN([ad_GCC_WARNINGS],
@@ -36,8 +38,7 @@
    Winline \
    Wnested-externs \
    Wpointer-arith \
-   Wwrite-strings \
-   Wredundant-decls
+   Wwrite-strings
   do
     CFLAGS="$cf_save_CFLAGS $ac_cv_prog_gcc_warn_flags -$cf_opt"
     if AC_TRY_EVAL(ac_compile); then
Index: heroes/m4/getoptlong.m4
diff -u heroes/m4/getoptlong.m4:1.2 heroes/m4/getoptlong.m4:1.3
--- heroes/m4/getoptlong.m4:1.2 Sat Apr  7 09:52:44 2001
+++ heroes/m4/getoptlong.m4     Sun Nov 24 16:02:26 2002
@@ -10,7 +10,7 @@
 dnl is important.)
 dnl
 dnl @version $Id$
-dnl @author Alexandre Duret-Lutz <address@hidden>
+dnl @author Alexandre Duret-Lutz <address@hidden>
 
 AC_PREREQ(2.49)
 
@@ -18,7 +18,7 @@
  [# clean out junk possibly left behind by a previous configuration
   rm -f lib/getopt.h
   # Check for getopt_long support
-  AC_CHECK_HEADER([getopt.h])
+  AC_CHECK_HEADERS([getopt.h])
   AC_CHECK_FUNCS([getopt_long],,
    [# FreeBSD has a gnugetopt library for this
     AC_CHECK_LIB([gnugetopt],[getopt_long],[AC_DEFINE([HAVE_GETOPT_LONG])],