@@ -59,8 +59,6 @@ AC_PROG_CXX
5959AC_STDC_HEADERS
6060AM_PROG_LIBTOOL
6161AC_PROG_SED
62- AC_PATH_PROG ( [ GLIB_GENMARSHAL] , [ glib-genmarshal] )
63- AC_PATH_PROG ( [ GLIB_MKENUMS] , [ glib-mkenums] )
6462
6563MATE_MAINTAINER_MODE_DEFINES
6664MATE_COMPILE_WARNINGS
@@ -113,6 +111,34 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
113111
114112PKG_CHECK_MODULES([ SHELL_CORE] ,[ libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 x11] )
115113
114+ # ***************
115+ # Build utilities
116+ # ***************
117+
118+ AC_ARG_VAR ( [ GLIB_GENMARSHAL] ,[ the glib-genmarschal programme] )
119+ AC_PATH_PROG ( [ GLIB_GENMARSHAL] ,[ glib-genmarshal] ,[ ] )
120+ if test -z "$GLIB_GENMARSHAL"; then
121+ AC_MSG_ERROR ( [ glib-genmarshal not found] )
122+ fi
123+
124+ AC_ARG_VAR ( [ GLIB_MKENUMS] ,[ the glib-mkenums programme] )
125+ AC_PATH_PROG ( [ GLIB_MKENUMS] ,[ glib-mkenums] ,[ ] )
126+ if test -z "$GLIB_MKENUMS"; then
127+ AC_MSG_ERROR ( [ glib-mkenums not found] )
128+ fi
129+
130+ AC_ARG_VAR ( [ GLIB_COMPILE_RESOURCES] ,[ the glib-compile-resources programme] )
131+ AC_PATH_PROG ( [ GLIB_COMPILE_RESOURCES] ,[ glib-compile-resources] ,[ ] )
132+ if test -z "$GLIB_COMPILE_RESOURCES"; then
133+ AC_MSG_ERROR ( [ glib-compile-resources not found] )
134+ fi
135+
136+ AC_ARG_VAR ( [ XMLLINT] ,[ the xmllint programme] )
137+ AC_PATH_PROG ( [ XMLLINT] ,[ xmllint] ,[ ] )
138+ if test -z "$XMLLINT"; then
139+ AC_MSG_ERROR ( [ xmllint not found] )
140+ fi
141+
116142# Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
117143# cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
118144# so we need check for that explicity.
0 commit comments