diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 630a237..b050aff 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl The dbus-python version number m4_define(dbus_python_major_version, 1) m4_define(dbus_python_minor_version, 2) dnl Micro version is odd for non-releases -m4_define(dbus_python_micro_version, 16) +m4_define(dbus_python_micro_version, 18) AC_INIT([dbus-python], dbus_python_major_version.dbus_python_minor_version.dbus_python_micro_version, @@ -77,6 +77,7 @@ AC_ARG_VAR([PYTHON_INCLUDES], [deprecated form of PYTHON_CPPFLAGS]) AS_IF([test -n "$PYTHON_INCLUDES"], [PYTHON_CPPFLAGS="$PYTHON_CPPFLAGS $PYTHON_INCLUDES"]) +AS_IF([test -z "$PYTHON_VERSION" && test -z "$PYTHON"], [PYTHON_VERSION=3]) AX_PYTHON_DEVEL([>= '2.7']) AM_PATH_PYTHON @@ -132,6 +133,7 @@ AX_COMPILER_FLAGS([WARN_CFLAGS], dnl AX_COMPILER_FLAGS, and are not const-correct for strings [ \ -Wdeprecated-declarations \ + -Wno-declaration-after-statement \ -Wno-duplicated-branches \ -Wno-inline \ -Wno-redundant-decls \ @@ -141,6 +143,7 @@ AX_COMPILER_FLAGS([WARN_CFLAGS], dnl AX_COMPILER_FLAGS doesn't order the compiler flags correctly to be able dnl to disable flags that it would normally enable WARN_CFLAGS="$(echo "${WARN_CFLAGS}" | ${SED} \ + -e s/-Wdeclaration-after-statement// \ -e s/-Wduplicated-branches// \ -e s/-Winline// \ -e s/-Wredundant-decls// \ |