Using the generic marshaller from GLib requires GLib >= 2.30
Add a configure check and be explicit instead of using NULL.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646521
https://bugzilla.gnome.org/show_bug.cgi?id=662682
Michael Biebl
12 years ago
| 121 | 121 |
POLKIT_AGENT_REQUIRED=0.97
|
| 122 | 122 |
POLKIT_GOBJECT_REQUIRED=0.97
|
| 123 | 123 |
GTK_REQUIRED=3.0.0
|
|
124 |
GLIB_REQUIRED=2.30
|
| 124 | 125 |
|
| 125 | 126 |
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
|
| 126 | 127 |
AC_SUBST(GTK_CFLAGS)
|
| 127 | 128 |
AC_SUBST(GTK_LIBS)
|
|
129 |
|
|
130 |
PKG_CHECK_MODULES(GLIB, glib2.0 >= $GLIB_REQUIRED)
|
|
131 |
AC_SUBST(GLIB_CFLAGS)
|
|
132 |
AC_SUBST(GLIB_LIBS)
|
| 128 | 133 |
|
| 129 | 134 |
PKG_CHECK_MODULES(POLKIT_AGENT, polkit-agent-1 >= $POLKIT_AGENT_REQUIRED)
|
| 130 | 135 |
AC_SUBST(POLKIT_AGENT_CFLAGS)
|
| 23 | 23 |
|
| 24 | 24 |
polkit_gnome_authentication_agent_1_CFLAGS = \
|
| 25 | 25 |
$(GTK_CFLAGS) \
|
|
26 |
$(GLIB_CFLAGS) \
|
| 26 | 27 |
$(GCONF_CFLAGS) \
|
| 27 | 28 |
$(POLKIT_AGENT_CFLAGS) \
|
| 28 | 29 |
$(POLKIT_GOBJECT_CFLAGS) \
|
|
| 34 | 35 |
|
| 35 | 36 |
polkit_gnome_authentication_agent_1_LDADD = \
|
| 36 | 37 |
$(GTK_LIBS) \
|
|
38 |
$(GLIB_LIBS) \
|
| 37 | 39 |
$(GCONF_LIBS) \
|
| 38 | 40 |
$(POLKIT_AGENT_LIBS) \
|
| 39 | 41 |
$(POLKIT_GOBJECT_LIBS) \
|
| 136 | 136 |
0, /* class offset */
|
| 137 | 137 |
NULL, /* accumulator */
|
| 138 | 138 |
NULL, /* accumulator data */
|
| 139 | |
NULL, /* use generic marshaller */
|
|
139 |
g_cclosure_marshal_generic,
|
| 140 | 140 |
G_TYPE_NONE,
|
| 141 | 141 |
2,
|
| 142 | 142 |
G_TYPE_BOOLEAN,
|