im.pidgin.pidgin: b681959692589499c04b181e1db18edf0d6b2dc5

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: b681959692589499c04b181e1db18edf0d6b2dc5
Ancestor: a46b79950d450e6900b01177b341bcaae425a9c4
Author: nosnilmot at pidgin.im
Date: 2007-11-10T15:23:56
Branch: im.pidgin.pidgin

Renamed entries:
        libpurple/purple.h to libpurple/purple.h.in
Modified files:
        configure.ac libpurple/purple.h.in

ChangeLog: 

Make purple.h a generated file so plugins can just include this and never
worry about defining PURPLE_PLUGINS ever again (unless they build libpurple
without plugin support, which would be stupid)


-------------- next part --------------
============================================================
--- configure.ac	6ece0cc3ee44a86e02735caf41b41a472e55ee32
+++ configure.ac	32dca2b9c9d1d0ed073e0e0498dff401762a17dc
@@ -2003,9 +2003,12 @@ if test "x$enable_plugins" = "xyes" ; th
 if test "x$enable_plugins" = "xyes" ; then
 	AC_DEFINE(PURPLE_PLUGINS, 1, [Define if plugins are enabled.])
 	AM_CONDITIONAL(PLUGINS, true)
+	PLUGINS_DEFINE="#define PURPLE_PLUGINS 1"
 else
 	AM_CONDITIONAL(PLUGINS, false)
+	PLUGINS_DEFINE="#undef PURPLE_PLUGINS"
 fi
+AC_SUBST(PLUGINS_DEFINE)
 
 dnl #######################################################################
 dnl # Check for Cyrus-SASL (for Jabber)
@@ -2272,6 +2275,7 @@ AC_OUTPUT([Makefile
 		   libpurple/protocols/yahoo/Makefile
 		   libpurple/protocols/zephyr/Makefile
 		   libpurple/tests/Makefile
+		   libpurple/purple.h
 		   libpurple/version.h
 		   share/Makefile
 		   share/sounds/Makefile
============================================================
--- libpurple/purple.h	e46e2bccd87202c1c5064a2871a24229e8127d64
+++ libpurple/purple.h.in	fa8f42e42870cf455eec913ce0343215cdbed2c4
@@ -1,10 +1,9 @@
 /**
  * @file purple.h  Header files and defines
  * This file contains all the necessary preprocessor directives to include
  * libpurple's headers and other preprocessor directives required for plugins
  * or UIs to build.  Inlcuding this file eliminates the need to directly
- * include any other libpurple files.  It will still be necessary for plugins
- * to define @c PURPLE_PLUGINS before including this header.
+ * include any other libpurple files.
  *
  * @ingroup core libpurple
  */
@@ -29,9 +28,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_H
-#define _PURPLE_H
 
+#ifndef _PURPLE_PURPLE_H_
+#define _PURPLE_PURPLE_H_
+
+#include <glib.h>
+
 #ifndef G_GNUC_NULL_TERMINATED
 #	if     __GNUC__ >= 4
 #		define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
@@ -40,6 +42,8 @@
 #	endif
 #endif
 
+ at PLUGINS_DEFINE@
+
 #include <account.h>
 #include <accountopt.h>
 #include <blist.h>