Mercurial > pidgin
diff configure.ac @ 18119:59aec2d6ec43
propagate from branch 'im.pidgin.pidgin.2.1.0' (head 86fd5e0d8b80a9da3103e850c97f1e04a2333961)
to branch 'im.pidgin.pidgin' (head 999df812d342023b977c17afda10ed0238f1f80d)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 16 Jun 2007 19:48:23 +0000 |
| parents | 40d51793f2d7 |
| children | 2b8460b599ea |
line wrap: on
line diff
--- a/configure.ac Sat Jun 16 19:44:59 2007 +0000 +++ b/configure.ac Sat Jun 16 19:48:23 2007 +0000 @@ -47,7 +47,7 @@ m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [1]) m4_define([purple_micro_version], [0]) -m4_define([purple_version_suffix], [devel]) +m4_define([purple_version_suffix], []) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) @@ -56,7 +56,7 @@ m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [0]) m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], [devel]) +m4_define([gnt_version_suffix], []) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix])) @@ -142,7 +142,7 @@ dnl If we don't have msgfmt, then po/ is going to fail -- ensure that dnl AM_GLIB_GNU_GETTEXT found it. -if test x$MSGFMT = xno -o x$GMSGFMT = x +if test x$MSGFMT = xno then AC_ERROR([ @@ -2104,6 +2104,8 @@ pidgin/pixmaps/tray/16/scalable/Makefile pidgin/pixmaps/tray/22/Makefile pidgin/pixmaps/tray/22/scalable/Makefile + pidgin/pixmaps/tray/32/Makefile + pidgin/pixmaps/tray/48/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/gestures/Makefile