diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 94 |
1 files changed, 59 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 775b50a0..5e893eff 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 34) -m4_define(gi_micro_version, 0) +m4_define(gi_minor_version, 39) +m4_define(gi_micro_version, 90) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) @@ -17,11 +17,15 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) +# Used in docs/reference/version.xml +GI_VERSION=gi_version +AC_SUBST(GI_VERSION) + # Check for Win32 AC_CANONICAL_HOST case "$host" in @@ -37,6 +41,7 @@ AM_CONDITIONAL(OS_WIN32, [test "x$os_win32" = "xyes"]) # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_MKDIR_P # Initialize libtool LT_PREREQ([2.2]) @@ -123,31 +128,25 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.29.7]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], have_gio_unix=true, have_gio_unix=false) AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue) -AC_ARG_ENABLE(tests, - AS_HELP_STRING([--disable-tests], [disable test libraries]), - enable_tests=$enableval, - enable_tests=maybe) +# Prefer cairo-gobject if we have it +AC_ARG_WITH(cairo, + AS_HELP_STRING([--with-cairo], [Use cairo @<:@default=maybe@:>@]), + [], [with_cairo=maybe]) -AS_IF([test x${enable_tests} != xno], [ +AS_IF([test x${with_cairo} != xno], [ PKG_CHECK_MODULES(CAIRO, [cairo cairo-gobject], have_cairo=yes, have_cairo=no) - AS_IF([test x$have_cairo != xyes], [ - AS_IF([ test x$enable_tests = xmaybe ], [ - enable_tests=no - ], [ - AC_MSG_ERROR([Tests enabled but cairo not found; pass --disable-tests or install cairo]) - ]) - ], [ - enable_tests=yes + AS_IF([ test x$have_cairo = xno && test x$with_cairo = xyes ], [ + AC_MSG_ERROR([cairo enabled but not found]) ]) ]) -AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests != xno) +AM_CONDITIONAL(HAVE_CAIRO, test x$have_cairo = xyes) case "$host" in *-*-darwin*) @@ -172,7 +171,7 @@ AC_SUBST(CAIRO_GIR_PACKAGE) PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gio-2.0]) dnl libffi -PKG_CHECK_MODULES(FFI, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no) +PKG_CHECK_MODULES(FFI, [libffi >= 3.0.0 ], have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no) FFI_PC_CFLAGS="" FFI_PC_LIBS="" FFI_PC_PACKAGES="" @@ -234,7 +233,7 @@ GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS" # gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have # it on it's own line. m4_ifdef([GTK_DOC_CHECK], [ -GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) +GTK_DOC_CHECK([1.19], [--flavour no-tmpl]) ],[ AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) ]) @@ -252,7 +251,7 @@ AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull]) AC_CHECK_FUNCS([backtrace backtrace_symbols]) # Python -AM_PATH_PYTHON([2.5]) +AM_PATH_PYTHON([2.6]) case "$host" in *-*-mingw*) # Change backslashes to forward slashes in pyexecdir to avoid @@ -267,10 +266,16 @@ fi dnl Not enabled by default until 3.6 cycle when we can propose mako as dnl an external dependency -AC_ARG_ENABLE(doctool,[ --enable-doctool enable g-ir-doctool ], enable_doctool=$enableval,enable_doctool=no) -if test x$enable_doctool != xno; then - AM_CHECK_PYMOD(mako,,,[AC_MSG_ERROR(Could not find python module: mako)]) -fi +AC_ARG_ENABLE(doctool,[ --disable-doctool disable g-ir-doctool ],,enable_doctool=auto) +AS_IF([ test x$enable_doctool != xno], [ + AM_CHECK_PYMOD(mako,,have_python_mako=yes,have_python_mako=no) +]) +AS_IF([ test x$enable_doctool = xauto && test x$have_python_mako = xyes ], + [ enable_doctool=yes ], + [ test x$enable_doctool = xauto && test x$have_python_mako = xno ], + [ enable_doctool=no ], + [ test x$enable_doctool = xyes && test x$have_python_mako = xno ], + [ AC_MSG_ERROR([Python mako module not found]) ]) AM_CONDITIONAL(BUILD_DOCTOOL, test x$enable_doctool != xno) # Glib documentation @@ -286,26 +291,45 @@ AM_CONDITIONAL(WITH_GLIBSRC, test x"$GLIBSRC" != x) AC_SUBST(GLIBSRC) AC_MSG_RESULT([$GLIBSRC]) +dnl +dnl Check for -Bsymbolic-functions linker flag used to avoid +dnl intra-library PLT jumps, if available. +dnl +AC_ARG_ENABLE(Bsymbolic, + [AS_HELP_STRING([--disable-Bsymbolic], + [avoid linking with -Bsymbolic])],, + [SAVED_LDFLAGS="${LDFLAGS}" + AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) + LDFLAGS=-Wl,-Bsymbolic-functions + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main (void) { return 0; }]])], + [AC_MSG_RESULT(yes) + enable_Bsymbolic=yes], + [AC_MSG_RESULT(no) + enable_Bsymbolic=no]) + LDFLAGS="${SAVED_LDFLAGS}"]) + +if test "x${enable_Bsymbolic}" = "xyes"; then + EXTRA_LINK_FLAGS=-Wl,-Bsymbolic-functions +fi +AC_SUBST(EXTRA_LINK_FLAGS) AC_CONFIG_FILES([ Makefile -m4/Makefile tests/Makefile tests/offsets/Makefile tests/scanner/Makefile +tests/scanner/annotationparser/Makefile tests/repository/Makefile tests/warn/Makefile -tests/doctool/Makefile docs/Makefile docs/reference/Makefile +docs/reference/version.xml gobject-introspection-1.0.pc -gobject-introspection-no-export-1.0.pc]) +gobject-introspection-no-export-1.0.pc +config.h.win32 +build/Makefile +build/win32/Makefile +build/win32/vs9/Makefile +build/win32/vs10/Makefile]) AC_OUTPUT - -echo " - gobject-introspection $VERSION - =============== - - tests: ${enable_tests} -" |