diff configure.ac @ 19239:829b00936eef

propagate from branch 'im.pidgin.pidgin' (head ee3cab184ee92cf36b4f36013402605653820416) to branch 'im.pidgin.soc.2007.msimprpl' (head 9bcb047516948fbfd4148f735e07e6ea2d96e164)
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Mon, 13 Aug 2007 03:58:49 +0000
parents eeaf5afc8940 afdb0b020d40
children 6d94101c7d22
line wrap: on
line diff
--- a/configure.ac	Mon Aug 13 01:36:30 2007 +0000
+++ b/configure.ac	Mon Aug 13 03:58:49 2007 +0000
@@ -54,9 +54,9 @@
 
 m4_define([gnt_lt_current], [1])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [0])
+m4_define([gnt_minor_version], [1])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_suffix], [devel])
 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]))
@@ -2090,6 +2090,8 @@
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
+AM_CONDITIONAL(PURPLE_AVAILABLE, true)
+
 AC_OUTPUT([Makefile
 		   Doxyfile
 		   doc/Makefile
@@ -2168,7 +2170,6 @@
 		   pidgin/plugins/perl/Makefile
 		   pidgin/plugins/perl/common/Makefile.PL
 		   pidgin/plugins/ticker/Makefile
-		   pidgin/sounds/Makefile
 		   libpurple/example/Makefile
 		   libpurple/gconf/Makefile
 		   libpurple/purple.pc
@@ -2202,6 +2203,8 @@
 		   libpurple/protocols/zephyr/Makefile
 		   libpurple/tests/Makefile
 		   libpurple/version.h
+		   share/Makefile
+		   share/sounds/Makefile
 		   finch/Makefile
 		   finch/libgnt/Makefile
 		   finch/libgnt/gnt.pc