glibmm r811 - in branches/glibmm-2-18: . build_shared examples scripts tests tools/extra_defs_gen

[daniel svn gnome org]

Author: daniel
Date: Thu Mar 26 13:32:38 2009
New Revision: 811
URL: http://svn.gnome.org/viewvc/glibmm?rev=811&view=rev

Log:
Use DK_ARG_ENABLE_WARNINGS() to replace custom M4 macro

* scripts/dk-warn.m4: New file defining DK_ARG_ENABLE_WARNINGS().
* scripts/macros.m4: Remove the old GTKMM_ARG_ENABLE_WARNINGS().
* configure.in: Use new macro DK_ARG_ENABLE_WARNINGS() to set the
Makefile variable $(GLIBMM_WXXFLAGS).
* build_shared/Makefile_build.am_fragment (all_includes): Prepend
$(GLIBMM_WXXFLAGS).
* tools/extra_defs_gen/Makefile.am (INCLUDES): ditto,
* examples/Makefile.am_fragment (all_includes): ditto,
* tests/Makefile.am_fragment (INCLUDES): ditto.


Added:
   branches/glibmm-2-18/scripts/dk-warn.m4
      - copied unchanged from r809, /trunk/scripts/dk-warn.m4
Modified:
   branches/glibmm-2-18/   (props changed)
   branches/glibmm-2-18/ChangeLog
   branches/glibmm-2-18/build_shared/Makefile_build.am_fragment
   branches/glibmm-2-18/configure.in
   branches/glibmm-2-18/examples/Makefile.am_fragment
   branches/glibmm-2-18/scripts/macros.m4
   branches/glibmm-2-18/tests/Makefile.am_fragment
   branches/glibmm-2-18/tools/extra_defs_gen/Makefile.am

Modified: branches/glibmm-2-18/build_shared/Makefile_build.am_fragment
==============================================================================
--- branches/glibmm-2-18/build_shared/Makefile_build.am_fragment	(original)
+++ branches/glibmm-2-18/build_shared/Makefile_build.am_fragment	Thu Mar 26 13:32:38 2009
@@ -29,7 +29,7 @@
 all_includes	= -I$(top_builddir)/$(sublib_topdir)		-I$(top_srcdir)/$(sublib_topdir)	\
 		  -I$(top_builddir)/glib -I$(top_srcdir)/glib -I$(top_builddir) \
 		  -I$(top_builddir)/gio -I$(top_srcdir)/gio \
-		  $(sublib_cflags) $(GTHREAD_CFLAGS)
+		  $(GLIBMM_WXXFLAGS) $(sublib_cflags) $(GTHREAD_CFLAGS)
 
 dist_sources	= $(files_all_built_cc) $(files_all_extra_cc) $(files_all_built_h) $(files_all_extra_h)
 DISTFILES	= $(DIST_COMMON) $(dist_sources) $(TEXINFOS) $(EXTRA_DIST)

Modified: branches/glibmm-2-18/configure.in
==============================================================================
--- branches/glibmm-2-18/configure.in	(original)
+++ branches/glibmm-2-18/configure.in	Thu Mar 26 13:32:38 2009
@@ -199,7 +199,7 @@
   fi
 fi
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 AC_CXX_BOOL(,config_error=yes)
 AC_CXX_NAMESPACES(,config_error=yes)
@@ -243,18 +243,23 @@
 GLIBMM_ARG_ENABLE_DEBUG_REFCOUNTING()
 
 # Evaluate the --enable-warnings=level option.
-GTKMM_ARG_ENABLE_WARNINGS()
+DK_ARG_ENABLE_WARNINGS([GLIBMM_WXXFLAGS],
+                       [-Wall],
+                       [-pedantic -Wall -Wextra])
 
 # Add an --enable-use-deprecations configure option:
 AC_ARG_ENABLE(deprecations,
               [AC_HELP_STRING([--enable-use-deprecations],
                               [warn about deprecated usages [default=no]])],,
               [enable_deprecations=no])
-              
-if test "x$enable_use_deprecations" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
+
+AS_IF([test "x$enable_use_deprecations" = xyes],
+[
+DISABLE_DEPRECATED_CFLAGS='-DG_DISABLE_DEPRECATED'
+],[
+DISABLE_DEPRECATED_CFLAGS=
+])
+AC_SUBST([DISABLE_DEPRECATED_CFLAGS])
 
 #Offer the ability to omit some API from the library, 
 #to reduce the code size:

Modified: branches/glibmm-2-18/examples/Makefile.am_fragment
==============================================================================
--- branches/glibmm-2-18/examples/Makefile.am_fragment	(original)
+++ branches/glibmm-2-18/examples/Makefile.am_fragment	Thu Mar 26 13:32:38 2009
@@ -6,7 +6,8 @@
 
 all_includes	= -I$(top_builddir)/glib -I$(top_srcdir)/glib	\
 		  -I$(top_builddir)/gio	-I$(top_srcdir)/gio	\
-		  $(GLIBMM_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS)
+		  $(GLIBMM_WXXFLAGS) $(GLIBMM_CFLAGS)	\
+		  $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS)
 
 DEFS			= @DEFS@
 DEFAULT_INCLUDES	=

Modified: branches/glibmm-2-18/scripts/macros.m4
==============================================================================
--- branches/glibmm-2-18/scripts/macros.m4	(original)
+++ branches/glibmm-2-18/scripts/macros.m4	Thu Mar 26 13:32:38 2009
@@ -70,65 +70,3 @@
   }
   fi
 ])
-
-
-## GTKMM_ARG_ENABLE_WARNINGS()
-##
-## Provide the --enable-warnings configure argument, set to 'minimum'
-## by default.
-##
-AC_DEFUN([GTKMM_ARG_ENABLE_WARNINGS],
-[
-  AC_ARG_ENABLE([warnings],
-      [  --enable-warnings=[[none|minimum|maximum|hardcore]]
-                          Control compiler pickyness.  [[default=minimum]]],
-      [gtkmm_enable_warnings="$enableval"],
-      [gtkmm_enable_warnings='minimum'])
-
-  AC_MSG_CHECKING([for compiler warning flags to use])
-
-  gtkmm_warning_flags=''
-
-  case "$gtkmm_enable_warnings" in
-    minimum|yes) gtkmm_warning_flags='-Wall -Wno-long-long';;
-    maximum)     gtkmm_warning_flags='-pedantic -W -Wall -Wno-long-long';;
-    hardcore)    gtkmm_warning_flags='-pedantic -W -Wall -Wno-long-long -Werror';;
-  esac
-
-  gtkmm_use_flags=''
-
-  if test "x$gtkmm_warning_flags" != "x"
-  then
-    echo 'int foo() { return 0; }' > conftest.cc
-
-    for flag in $gtkmm_warning_flags
-    do
-      # Test whether the compiler accepts the flag.  GCC doesn't bail
-      # out when given an unsupported flag but prints a warning, so
-      # check the compiler output instead.
-      gtkmm_cxx_out="`$CXX $flag -c conftest.cc 2>&1`"
-      rm -f conftest.$OBJEXT
-      test "x${gtkmm_cxx_out}" = "x" && \
-        gtkmm_use_flags="${gtkmm_use_flags:+$gtkmm_use_flags }$flag"
-    done
-
-    rm -f conftest.cc
-    gtkmm_cxx_out=''
-  fi
-
-  if test "x$gtkmm_use_flags" != "x"
-  then
-    for flag in $gtkmm_use_flags
-    do
-      case " $CXXFLAGS " in
-        *" $flag "*) ;; # don't add flags twice
-        *)           CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$flag";;
-      esac
-    done
-  else
-    gtkmm_use_flags='none'
-  fi
-
-  AC_MSG_RESULT([$gtkmm_use_flags])
-])
-

Modified: branches/glibmm-2-18/tests/Makefile.am_fragment
==============================================================================
--- branches/glibmm-2-18/tests/Makefile.am_fragment	(original)
+++ branches/glibmm-2-18/tests/Makefile.am_fragment	Thu Mar 26 13:32:38 2009
@@ -1,7 +1,7 @@
 INCLUDES = \
 	-I$(top_builddir)/glib	-I$(top_srcdir)/glib	\
 	-I$(top_builddir)/gio	-I$(top_srcdir)/gio	\
-	$(GLIBMM_CFLAGS) $(GTHREAD_CFLAGS)
+	$(GLIBMM_WXXFLAGS) $(GLIBMM_CFLAGS) $(GTHREAD_CFLAGS)
 
 LIBS =	$(top_builddir)/glib/glibmm/libglibmm-2.4.la \
 	$(top_builddir)/gio/giomm/libgiomm-2.4.la \

Modified: branches/glibmm-2-18/tools/extra_defs_gen/Makefile.am
==============================================================================
--- branches/glibmm-2-18/tools/extra_defs_gen/Makefile.am	(original)
+++ branches/glibmm-2-18/tools/extra_defs_gen/Makefile.am	Thu Mar 26 13:32:38 2009
@@ -21,7 +21,7 @@
 # Build the generate_properties_defs utility executable.
 # This is not used to build the rest of glibmm.
 
-INCLUDES = $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
+INCLUDES = $(GLIBMM_WXXFLAGS) $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
 LIBS = $(GLIBMM_LIBS) $(GIOMM_LIBS)
 
 noinst_PROGRAMS = generate_extra_defs generate_defs_gio