← Back to branch summary

~ubuntu-branches/ubuntu/maverick/telepathy-glib/maverick

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Simon McVittie
  • Date: 2010-06-14 17:42:08 UTC
  • mfrom: (1.6.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100614174208-7b6teypo8jnx5uux
Tags: 0.11.7-1
* New upstream version
  - requires gobject-introspection 0.6.13
  - new ABI, API

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
11
11
 
12
12
m4_define([tp_glib_major_version], [0])
13
13
m4_define([tp_glib_minor_version], [11])
14
 
m4_define([tp_glib_micro_version], [6])
 
14
m4_define([tp_glib_micro_version], [7])
15
15
m4_define([tp_glib_nano_version], [0])
16
16
 
17
17
# If library source has changed since last release, increment revision
26
26
# (we don't guarantee that we won't add ABI then remove it again, if it was
27
27
# never seen in a release).
28
28
 
29
 
m4_define([tp_glib_lt_current], [38])
 
29
m4_define([tp_glib_lt_current], [39])
30
30
m4_define([tp_glib_lt_revision], [0])
31
 
m4_define([tp_glib_lt_age], [38])
 
31
m4_define([tp_glib_lt_age], [39])
32
32
 
33
33
# Some magic
34
34
m4_define([tp_glib_base_version],
57
57
# pkg-config 0.21 adds CFLAGS from Requires.private, which we need
58
58
PKG_PROG_PKG_CONFIG([0.21])
59
59
 
60
 
GOBJECT_INTROSPECTION_CHECK([0.6.11])
 
60
GOBJECT_INTROSPECTION_CHECK([0.6.13])
61
61
GTK_DOC_CHECK([1.15])
62
62
 
63
63
LT_CURRENT=tp_glib_lt_current
221
221
fi
222
222
AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test $HAVE_LD_VERSION_SCRIPT = yes])
223
223
 
 
224
dnl Check for C++ compiler, for syntax checking
 
225
AC_PROG_CXX
 
226
AC_LANG_PUSH([C++])
 
227
_TP_OLD_LIBS="$LIBS"
 
228
LIBS="$GLIB_LIBS"
 
229
_TP_OLD_CXXFLAGS="$CXXFLAGS"
 
230
CXXFLAGS="$GLIB_CFLAGS"
 
231
AC_LINK_IFELSE(
 
232
  [AC_LANG_PROGRAM(
 
233
     [[#include <gio/gio.h>]],
 
234
     [[g_type_init (); g_object_unref (g_file_new_for_path ("/"));]])
 
235
  ],
 
236
  [tp_cxx_works=yes],
 
237
  [tp_cxx_works=no])
 
238
LIBS="$_TP_OLD_LIBS"
 
239
CXXFLAGS="$_TP_OLD_CXXFLAGS"
 
240
AC_LANG_POP([C++])
 
241
AM_CONDITIONAL([HAVE_CXX], [test $tp_cxx_works = yes])
 
242
 
224
243
AC_OUTPUT( Makefile \
225
244
           docs/Makefile \
226
245
           docs/reference/Makefile \