Mercurial > pidgin.yaz
comparison configure.ac @ 26020:8bfa1f01f035
merge of 'a4aa548f12b557cc419b1567e6902eb124d0cf06'
and 'c2b27ebb3760df28827d2fd1b391386a894cf952'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sun, 19 Oct 2008 04:40:59 +0000 |
parents | bb99ee66120e |
children | 46387cbfaf85 |
comparison
equal
deleted
inserted
replaced
26014:bd598b606ca4 | 26020:8bfa1f01f035 |
---|---|
44 # Make sure to update finch/libgnt/configure.ac with libgnt version changes. | 44 # Make sure to update finch/libgnt/configure.ac with libgnt version changes. |
45 # | 45 # |
46 m4_define([purple_lt_current], [5]) | 46 m4_define([purple_lt_current], [5]) |
47 m4_define([purple_major_version], [2]) | 47 m4_define([purple_major_version], [2]) |
48 m4_define([purple_minor_version], [5]) | 48 m4_define([purple_minor_version], [5]) |
49 m4_define([purple_micro_version], [1]) | 49 m4_define([purple_micro_version], [2]) |
50 m4_define([purple_version_suffix], [vv-devel]) | 50 m4_define([purple_version_suffix], [vv-devel]) |
51 m4_define([purple_version], | 51 m4_define([purple_version], |
52 [purple_major_version.purple_minor_version.purple_micro_version]) | 52 [purple_major_version.purple_minor_version.purple_micro_version]) |
53 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) | 53 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) |
54 | 54 |
55 m4_define([gnt_lt_current], [5]) | 55 m4_define([gnt_lt_current], [5]) |
56 m4_define([gnt_major_version], [2]) | 56 m4_define([gnt_major_version], [2]) |
57 m4_define([gnt_minor_version], [5]) | 57 m4_define([gnt_minor_version], [5]) |
58 m4_define([gnt_micro_version], [1]) | 58 m4_define([gnt_micro_version], [2]) |
59 m4_define([gnt_version_suffix], [vv-devel]) | 59 m4_define([gnt_version_suffix], [vv-devel]) |
60 m4_define([gnt_version], | 60 m4_define([gnt_version], |
61 [gnt_major_version.gnt_minor_version.gnt_micro_version]) | 61 [gnt_major_version.gnt_minor_version.gnt_micro_version]) |
62 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix])) | 62 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix])) |
63 | 63 |
142 ;; | 142 ;; |
143 *) | 143 *) |
144 ;; | 144 ;; |
145 esac | 145 esac |
146 | 146 |
147 ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lo lt mk my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW" | 147 ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu id it ja ka kn ko ku lo lt mk my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW" |
148 AM_GLIB_GNU_GETTEXT | 148 AM_GLIB_GNU_GETTEXT |
149 | 149 |
150 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that | 150 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that |
151 dnl AM_GLIB_GNU_GETTEXT found it. | 151 dnl AM_GLIB_GNU_GETTEXT found it. |
152 | 152 |
1291 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60], [ | 1291 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60], [ |
1292 AC_SUBST(DBUS_CFLAGS) | 1292 AC_SUBST(DBUS_CFLAGS) |
1293 AC_SUBST(DBUS_LIBS) | 1293 AC_SUBST(DBUS_LIBS) |
1294 enable_dbus=yes | 1294 enable_dbus=yes |
1295 ], [ | 1295 ], [ |
1296 enable_dbus=no | |
1296 if test "x$force_deps" = "xyes" ; then | 1297 if test "x$force_deps" = "xyes" ; then |
1297 AC_MSG_ERROR([ | 1298 AC_MSG_ERROR([ |
1298 D-Bus development headers not found. | 1299 D-Bus development headers not found. |
1299 Use --disable-dbus if you do not need D-Bus support. | 1300 Use --disable-dbus if you do not need D-Bus support. |
1300 ]) | 1301 ]) |
1301 fi]) | 1302 fi]) |
1303 fi | |
1302 | 1304 |
1303 dnl Check for NetworkManager.h; if we don't have it, oh well | 1305 dnl Check for NetworkManager.h; if we don't have it, oh well |
1306 if test "x$enable_dbus" = "xyes" ; then | |
1304 if test "x$enable_nm" = "xyes" ; then | 1307 if test "x$enable_nm" = "xyes" ; then |
1305 PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager], [ | 1308 PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ |
1306 AC_SUBST(NETWORKMANAGER_CFLAGS) | 1309 AC_SUBST(NETWORKMANAGER_CFLAGS) |
1307 AC_SUBST(NETWORKMANAGER_LIBS) | 1310 AC_SUBST(NETWORKMANAGER_LIBS) |
1308 AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) | 1311 AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) |
1309 ], [ | 1312 ], [ |
1313 enable_nm=no | |
1310 if test "x$force_deps" = "xyes" ; then | 1314 if test "x$force_deps" = "xyes" ; then |
1311 AC_MSG_ERROR([ | 1315 AC_MSG_ERROR([ |
1312 NetworkManager development headers not found. | 1316 NetworkManager development headers not found. |
1313 Use --disable-nm if you do not need NetworkManager support. | 1317 Use --disable-nm if you do not need NetworkManager support. |
1314 ]) | 1318 ]) |
2428 pidgin.apspec | 2432 pidgin.apspec |
2429 pidgin/Makefile | 2433 pidgin/Makefile |
2430 pidgin/pidgin.pc | 2434 pidgin/pidgin.pc |
2431 pidgin/pidgin-uninstalled.pc | 2435 pidgin/pidgin-uninstalled.pc |
2432 pidgin/pixmaps/Makefile | 2436 pidgin/pixmaps/Makefile |
2433 pidgin/pixmaps/buddy_icons/qq/Makefile | |
2434 pidgin/pixmaps/emotes/default/24/Makefile | 2437 pidgin/pixmaps/emotes/default/24/Makefile |
2435 pidgin/pixmaps/emotes/none/Makefile | 2438 pidgin/pixmaps/emotes/none/Makefile |
2436 pidgin/plugins/Makefile | 2439 pidgin/plugins/Makefile |
2437 pidgin/plugins/cap/Makefile | 2440 pidgin/plugins/cap/Makefile |
2438 pidgin/plugins/gestures/Makefile | 2441 pidgin/plugins/gestures/Makefile |