diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 4 |
3 files changed, 13 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2004-05-07 Christian Persch <chpe@cvs.gnome.org> + * configure.in: + * embed/mozilla/Makefile.am: + + Suppress some warnings for C++ code. + +2004-05-07 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * embed/mozilla/EventContext.h: diff --git a/configure.in b/configure.in index 414f520b1..818691ef0 100644 --- a/configure.in +++ b/configure.in @@ -51,7 +51,6 @@ AC_SUBST(AM_CXXFLAGS) GNOME_DEBUG_CHECK GNOME_COMPILE_WARNINGS(error) -GNOME_CXX_WARNINGS(yes, yes) dnl ****************************** dnl Nautilus View checking @@ -106,7 +105,7 @@ AC_SUBST(LIBBONOBO_IDL) BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" AC_SUBST(BONOBO_ACTIVATION_IDL) -PKG_CHECK_MODULES(MOZILLA_COMPONENT, mozilla-gtkmozembed) +PKG_CHECK_MODULES(MOZILLA_COMPONENT, mozilla-gtkmozembed mozilla-xpcom) AC_SUBST(MOZILLA_COMPONENT_CFLAGS) AC_SUBST(MOZILLA_COMPONENT_LIBS) @@ -210,6 +209,8 @@ AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/pipnss/nsIX509Cert.h], [AC_DEFINE(HAVE_MOZILLA_PSM, 1, [Define if you have the mozilla psm headers installed])]) +MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" +AC_SUBST(MOZILLA_WARN_CXXFLAGS) dnl ******************************* dnl Internationalization diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index b7d9d8cde..063d16d1b 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -38,11 +38,13 @@ INCLUDES = \ -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DALLOW_PRIVATE_API \ + -DALLOW_PRIVATE_STRINGS \ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h if MAINTAINER_MODE INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CXXFLAGS) + -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(MOZILLA_WARN_CXXFLAGS) endif noinst_LTLIBRARIES = libephymozillaembed.la |