← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dbus-python/saucy-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Simon McVittie
  • Date: 2013-05-08 08:58:16 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20130508085816-nn1mkskqmjuzn9u6
Tags: 1.2.0-1
http://bugs.debian.org/707139
https://launchpad.net/bugs/846044
* Check for sysconfig EXT_SUFFIX (for Python 3.3), falling back to SO if
  not found (for Python 3.2) (Closes: #707139)
* New upstream release
  - Unicode in exceptions works better (LP: #846044)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
5
5
m4_define(dbus_python_released, 1)
6
6
dnl The dbus-python version number (must actually be numeric at the moment)
7
7
m4_define(dbus_python_major_version, 1)
8
 
m4_define(dbus_python_minor_version, 1)
9
 
m4_define(dbus_python_micro_version, 1)
 
8
m4_define(dbus_python_minor_version, 2)
 
9
m4_define(dbus_python_micro_version, 0)
10
10
 
11
11
m4_define(dbus_python_maybe_datestamp,
12
12
          m4_esyscmd([if test x]dbus_python_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
29
29
AC_SUBST(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version)
30
30
 
31
31
AC_CONFIG_SRCDIR([_dbus_bindings/module.c])
32
 
AM_CONFIG_HEADER(config.h)
 
32
AC_CONFIG_HEADERS(config.h)
33
33
 
34
34
AM_INIT_AUTOMAKE([1.9 -Wno-portability])
35
35
 
36
36
AC_CANONICAL_BUILD
37
37
AC_CANONICAL_HOST
38
38
 
 
39
# mingw32, mingw-w64 are native Windows; for our purposes, Cygwin isn't
 
40
AC_MSG_CHECKING([for native Windows host])
 
41
case "$host" in
 
42
        (*-*-mingw*)
 
43
                windows=yes
 
44
                ;;
 
45
        (*)
 
46
                windows=no
 
47
                ;;
 
48
esac
 
49
AC_MSG_RESULT([$windows])
 
50
AM_CONDITIONAL([WINDOWS], [test "x$windows" = xyes])
 
51
 
39
52
AC_DISABLE_STATIC
40
53
 
41
54
dnl XXXX hack to kill off all the libtool tags ...
45
58
 
46
59
AC_PROG_LIBTOOL
47
60
AM_PROG_CC_C_O
 
61
AC_C_INLINE
48
62
 
49
63
AM_PATH_PYTHON([2.6])
50
64
 
154
168
AM_CONDITIONAL([ENABLE_API_DOCS], [test "$enable_api_docs" != no])
155
169
AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_html_docs" != no])
156
170
 
157
 
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.4])
 
171
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.6])
158
172
PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.70])
159
173
 
160
 
dbuspy_save_CFLAGS="$CFLAGS"
161
 
dbuspy_save_LIBS="$LIBS"
162
 
CFLAGS="$CFLAGS $DBUS_CFLAGS"
163
 
LIBS="$CFLAGS $DBUS_LIBS"
164
 
AC_CHECK_TYPES([DBusBasicValue], [], [], [#include <dbus/dbus.h>])
165
 
AC_CHECK_FUNCS([dbus_validate_utf8])
166
 
CFLAGS="$dbuspy_save_CFLAGS"
167
 
LIBS="$dbuspy_save_LIBS"
168
 
 
169
174
TP_COMPILER_WARNINGS([CFLAGS_WARNINGS], [test] dbus_python_released [= 0],
170
175
  [all \
171
176
   extra \