diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | doc/reference/Makefile.am | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 1f01bacf5..89c652481 100644 --- a/configure.ac +++ b/configure.ac @@ -70,36 +70,24 @@ AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC -AC_PROG_CXX - AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) -# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it -# doesn't exist) - -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])]) -AC_LANG_POP([C++]) - IT_PROG_INTLTOOL([0.40.0]) PKG_PROG_PKG_CONFIG GNOME_DEBUG_CHECK GNOME_COMPILE_WARNINGS([maximum]) -GNOME_CXX_WARNINGS GNOME_MAINTAINER_MODE_DEFINES MORE_WARN_FLAGS= DEPRECATION_FLAGS= -GECKO_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" if test "$enable_maintainer_mode" = "yes"; then AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour]) enable_debug=yes DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" - GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $GECKO_WARN_CXXFLAGS" fi GLIB_REQUIRED=2.18.0 @@ -457,10 +445,8 @@ AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS" AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS" -AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $GECKO_WARN_CXXFLAGS" AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_CFLAGS]) -AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_LDFLAGS]) # ******************************* diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index e3d99693a..23d85b46c 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -161,10 +161,10 @@ DOC_OVERRIDES = if GTK_DOC_USE_LIBTOOL GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) else GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) endif # We set GPATH here; this gives us semantics for GNU make |