diff options
| author | Patrick Welche <prlw1@cam.ac.uk> | 2011-05-14 17:57:42 +0100 |
|---|---|---|
| committer | Patrick Welche <prlw1@cam.ac.uk> | 2011-05-14 17:57:42 +0100 |
| commit | 377ef7c311a5a3b1718bf4474612c5a47db11fd0 (patch) | |
| tree | 9c12d486783e4f2489ccd7e2e7f91b6b281b805d | |
| parent | a97f76c0e6fd75d262c22831d75e833a1e2b2aea (diff) | |
| download | at-spi2-core-377ef7c311a5a3b1718bf4474612c5a47db11fd0.tar.gz | |
Build fixes.
- atspi-application.h makes use of DBusConnection* .
- -Werror-implicit-function-declaration doesn't contain an equal sign in
my copy of gcc, and is gcc specific.
- The default behaviour of AC_CHECK_LIB glib-2.0 is to add -lglib-2.0 to
LIBS which can then cause the search for a dlopen function to fail
because the flags to find libglib aren't included. Solution is to
tell AC_CHECK_LIB to do nothing(!)
| -rw-r--r-- | atspi/Makefile.am | 3 | ||||
| -rw-r--r-- | atspi/atspi-application.h | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | dbind/Makefile.am | 3 | ||||
| -rw-r--r-- | registryd/Makefile.am | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/atspi/Makefile.am b/atspi/Makefile.am index c02981a9..8a264301 100644 --- a/atspi/Makefile.am +++ b/atspi/Makefile.am @@ -6,8 +6,7 @@ libatspi_la_CFLAGS = $(DBUS_CFLAGS) \ $(DBIND_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/registryd \ - -I$(top_srcdir) \ - -Werror=implicit-function-declaration + -I$(top_srcdir) libatspi_la_LIBADD = $(DBUS_LIBS) \ $(GOBJ_LIBS) \ diff --git a/atspi/atspi-application.h b/atspi/atspi-application.h index 1e0dd797..bb159783 100644 --- a/atspi/atspi-application.h +++ b/atspi/atspi-application.h @@ -25,7 +25,7 @@ #ifndef _ATSPI_APPLICATION_H_ #define _ATSPI_APPLICATION_H_ -#include "glib-object.h" +#include <dbus/dbus.h> #include "atspi-accessible.h" diff --git a/configure.ac b/configure.ac index 9e920c6f..b3374be5 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ AC_SUBST(DBUS_CFLAGS) PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0]) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [], +AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [:], [AC_MSG_ERROR([The version of glib-2.0 found does not define ] [g_ptr_array_new_with_free_func. Please upgrade glib.])], [$GLIB_LIBS]) @@ -189,6 +189,9 @@ DBIND_CHECK_ALIGNOF(dbind_struct) GTK_DOC_CHECK([1.09]) +if test "x$GCC" = xyes; then + CFLAGS="$CFLAGS -Werror-implicit-function-declaration" +fi CPPFLAGS=$orig_CPPFLAGS AC_CONFIG_FILES([Makefile po/Makefile.in xml/Makefile diff --git a/dbind/Makefile.am b/dbind/Makefile.am index 0ca43c05..debea205 100644 --- a/dbind/Makefile.am +++ b/dbind/Makefile.am @@ -5,8 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(WARN_CFLAGS) \ $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -Werror=implicit-function-declaration + $(GLIB_CFLAGS) libdbind_la_SOURCES = \ dbind-config.h \ diff --git a/registryd/Makefile.am b/registryd/Makefile.am index 688e0459..a3276588 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -7,8 +7,7 @@ at_spi2_registryd_CFLAGS = \ $(GOBJ_CFLAGS) \ $(ATK_CFLAGS) \ -I$(top_srcdir) \ - -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\" \ - -Werror=implicit-function-declaration + -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\" at_spi2_registryd_LDADD = \ ../atspi/libatspi.la \ |