projects
/
platform
/
upstream
/
at-spi2-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update po/Makevars
[platform/upstream/at-spi2-core.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
c8ed740
..
d2cd901
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-AC_INIT([at-spi2-core], [2.25.
2
], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.25.
3
], [accessibility-atspi@lists.linux-foundation.org])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
@@
-20,14
+20,14
@@
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
-AM_INIT_AUTOMAKE([1.
9 -Wall foreign
no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.
13 -Wall -Wno-portability foreign subdir-objects
no-dist-gzip dist-xz])
# Support silent build rules. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
AM_SILENT_RULES([yes])
# Support silent build rules. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
AM_SILENT_RULES([yes])
-A
C_PROG_CC
+A
M_PROG_CC_C_O
LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
@@
-52,6
+52,10
@@
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
+# Use pkg-config to find the glib-mkenums script
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
+
PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
AC_SUBST(GOBJ_LIBS)
AC_SUBST(GOBJ_CFLAGS)
PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
AC_SUBST(GOBJ_LIBS)
AC_SUBST(GOBJ_CFLAGS)
@@
-142,9
+146,7
@@
else
fi
AC_SUBST(DBUS_SERVICES_DIR)
fi
AC_SUBST(DBUS_SERVICES_DIR)
-AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
+GOBJECT_INTROSPECTION_CHECK([1.32.0])
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
@@
-162,12
+164,14
@@
typedef void *dbind_pointer;])
AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT
typedef struct {char s1;} dbind_struct;])
AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT
typedef struct {char s1;} dbind_struct;])
-GTK_DOC_CHECK([1.
09
])
+GTK_DOC_CHECK([1.
25
])
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
fi
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
fi
+
CPPFLAGS=$orig_CPPFLAGS
CPPFLAGS=$orig_CPPFLAGS
+
AC_CONFIG_FILES([
Makefile
po/Makefile.in
AC_CONFIG_FILES([
Makefile
po/Makefile.in
@@
-181,7
+185,6
@@
AC_CONFIG_FILES([
doc/libatspi/version.xml
test/Makefile
atspi-2.pc
doc/libatspi/version.xml
test/Makefile
atspi-2.pc
- atspi-2-uninstalled.pc
])
AC_OUTPUT
])
AC_OUTPUT