im.pidgin.pidgin: 02cdca0429e4b007dd4141fef54f11c8e13a9b91

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 02cdca0429e4b007dd4141fef54f11c8e13a9b91
Ancestor: a3aa7176d1ffa01e5c4181b2d9d3b93ecc73448e
Author: nosnilmot at pidgin.im
Date: 2007-11-10T15:49:57
Branch: im.pidgin.pidgin

Renamed entries:
        libpurple/purple.h to libpurple/purple.h.in
Modified files:
        configure.ac libpurple/Makefile.am libpurple/purple.h.in
        libpurple/win32/global.mak libpurple/win32/targets.mak

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/Makefile.am	9e5a504585a9d137ca5657a55c2322e5238d1168
+++ libpurple/Makefile.am	8f401b067bea264d540c6498bc4d02f362716ffe
@@ -6,6 +6,7 @@ EXTRA_DIST = \
 		purple-send \
 		purple-send-async \
 		purple-url-handler \
+		purple.h.in \
 		purple.pc.in \
 		purple-uninstalled.pc.in \
 		version.h.in \
@@ -134,7 +135,7 @@ purple_coreheaders = \
 	xmlnode.h \
 	whiteboard.h
 
-BUILT_SOURCES = version.h
+BUILT_SOURCES = purple.h version.h
 
 if ENABLE_DBUS
 
============================================================
--- 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>
============================================================
--- libpurple/win32/global.mak	c4c087d8b7548c482fd150da840d50044f284fde
+++ libpurple/win32/global.mak	daf08cdcb7d29a33dec71f91aad35ab7fbb84616
@@ -48,6 +48,7 @@ PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRA
 PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
 PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
 PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll
+PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h
 PURPLE_VERSION_H := $(PURPLE_TOP)/version.h
 PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll
 PURPLE_PERL_DLL := $(PURPLE_PERL_TOP)/perl.dll
============================================================
--- libpurple/win32/targets.mak	3f8b98127ed0eebeb91bc31da4414ea297610918
+++ libpurple/win32/targets.mak	da0e8859f490cbdef7c9d0b559ee6ad206a6dc33
@@ -8,6 +8,9 @@ $(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).m
 $(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).mingw $(PIDGIN_TREE_TOP)/configure.ac
 	sed -e 's/@VERSION@/$(PIDGIN_VERSION)/' $@.mingw > $@
 
+$(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in
+	sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/; $@.in > $@
+
 $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
 	cp $@.in $@
 	awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \