diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-28 13:50:51 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-28 13:50:51 +0000 |
| commit | bb3d4a427f8bd28a83896e499b64755534de02c5 (patch) | |
| tree | 055fbae1a2d058c533d2a81bdb25f8b8da992838 /configure.ac | |
| parent | 949324dbc3515e2cebced4a1a410c725896f4a6e (diff) | |
| parent | 55f7253966837f86aa68eb56ed8df534c6484ac6 (diff) | |
| download | telepathy-glib-bb3d4a427f8bd28a83896e499b64755534de02c5.tar.gz | |
Merge branch 'telepathy-glib-0.18' into telepathy-glib-0.20
Conflicts:
NEWS
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 74bc8107f..e32e381ac 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_INIT([Telepathy-GLib], [tp_glib_version], AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.11 -Wno-portability]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AM_SILENT_RULES |