[genius] Thu Apr 27 18:30:33 2017 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit d71927fb9b1c3f97f2fc10e7051019523e70a7db
Author: Jiri (George) Lebl <jiri lebl gmail com>
Date:   Thu Apr 27 18:31:49 2017 -0500

    Thu Apr 27 18:30:33 2017  Jiri (George) Lebl <jirka 5z com>
    
        * configure.ac, src/Makefile.am: extra warning flags are handled
          differently now

 ChangeLog       |    5 +++
 configure.ac    |   86 +++++++++++++++++++++++++++---------------------------
 src/Makefile.am |    3 +-
 3 files changed, 49 insertions(+), 45 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e7ea07a..1057e09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 18:30:33 2017  Jiri (George) Lebl <jirka 5z com>
+
+       * configure.ac, src/Makefile.am: extra warning flags are handled
+         differently now
+
 Wed Apr 26 21:11:54 2017  Jiri (George) Lebl <jirka 5z com>
 
        * src/genius.c: make genius show the HTML version of the manual in
diff --git a/configure.ac b/configure.ac
index 7232b55..92847ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,52 +190,54 @@ dnl ******************************
 dnl More compiler warnings
 dnl ******************************
 
-AC_ARG_ENABLE(more-warnings,
-[  --enable-more-warnings  Maximum compiler warnings],
-set_more_warnings="$enableval",[
-if test -f $srcdir/.git/config; then
-       is_cvs_version=true
-       set_more_warnings=yes
-else
-       set_more_warnings=no
-fi
-])
-warning_flags=
-realsave_CFLAGS="$CFLAGS"
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-       AC_MSG_RESULT(yes)
-       warning_flags="-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs 
-Wpointer-arith"
-       CFLAGS="$warning_flags $CFLAGS"
-
-       for option in -Wno-sign-compare; do
-               SAVE_CFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS $option"
-               AC_MSG_CHECKING([whether gcc understands $option])
-               AC_TRY_COMPILE([], [],
-                       has_option=yes,
-                       has_option=no,)
-               CFLAGS="$SAVE_CFLAGS"
-               AC_MSG_RESULT($has_option)
-               if test $has_option = yes; then
-                 warning_flags="$warning_flags $option"
-               fi
-               unset has_option
-               unset SAVE_CFLAGS
-       done
-       unset option
-else
-       AC_MSG_RESULT(no)
-fi
-CFLAGS="$realsave_CFLAGS"
-EXTRA_WARNING_CFLAGS="$warning_flags"
+dnl Warnings done above
+
+#AC_ARG_ENABLE(more-warnings,
+#[  --enable-more-warnings  Maximum compiler warnings],
+#set_more_warnings="$enableval",[
+#if test -f $srcdir/.git/config; then
+#      is_cvs_version=true
+#      set_more_warnings=yes
+#else
+#      set_more_warnings=no
+#fi
+#])
+#warning_flags=
+#realsave_CFLAGS="$CFLAGS"
+#AC_MSG_CHECKING(for more warnings)
+#if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+#      AC_MSG_RESULT(yes)
+#      warning_flags="-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs 
-Wpointer-arith"
+#      CFLAGS="$warning_flags $CFLAGS"
+#
+#      for option in -Wno-sign-compare; do
+#              SAVE_CFLAGS="$CFLAGS"
+#              CFLAGS="$CFLAGS $option"
+#              AC_MSG_CHECKING([whether gcc understands $option])
+#              AC_TRY_COMPILE([], [],
+#                      has_option=yes,
+#                      has_option=no,)
+#              CFLAGS="$SAVE_CFLAGS"
+#              AC_MSG_RESULT($has_option)
+#              if test $has_option = yes; then
+#                warning_flags="$warning_flags $option"
+#              fi
+#              unset has_option
+#              unset SAVE_CFLAGS
+#      done
+#      unset option
+#else
+#      AC_MSG_RESULT(no)
+#fi
+#CFLAGS="$realsave_CFLAGS"
+#EXTRA_WARNING_CFLAGS="$warning_flags"
 #      -DG_DISABLE_DEPRECATED \
 #      -DGDK_PIXBUF_DISABLE_DEPRECATED \
 #      -DGDK_DISABLE_DEPRECATED \
 #      -DGTK_DISABLE_DEPRECATED \
 #      -DGNOME_DISABLE_DEPRECATED \
-
-AC_SUBST(EXTRA_WARNING_CFLAGS)
+#
+#AC_SUBST(EXTRA_WARNING_CFLAGS)
 
 dnl wordexp check, we use glob otherwise but that's not perfect
 dnl warn the user, we do this on the end so that the user notices
@@ -305,6 +307,4 @@ Configuration:
        Compiler:                    ${CC} 
        GNOME frontend:              ${use_gnome}
        Using GtkSourceView:         ${use_gtksourceview}
-
-       Extra Compiler Warnings:     ${EXTRA_WARNING_CFLAGS}
 "
diff --git a/src/Makefile.am b/src/Makefile.am
index e7a6094..f58eb68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,7 @@ AM_CPPFLAGS = \
        $(BINRELOC_CFLAGS)                                      \
        $(GMP_INCLUDEDIR)                                       \
        $(GENIUS_CFLAGS)                                        \
-       $(GSV_CFLAGS)                                           \
-       $(EXTRA_WARNING_CFLAGS)
+       $(GSV_CFLAGS)
 
 AM_CFLAGS = $(PGO_CFLAGS)