pidgin.win32.autotools: 2342f69e: Remove some unneeded inline defines and ...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 2342f69e8f4327128df0582acb24e14a6245a939
Parent:   3c0410c0587e0a6d5eddc5eaa667d434bd1d77d8
Author:   datallah at pidgin.im
Date:     11/03/10 18:29:05
Branch:   im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/2342f69e8f4327128df0582acb24e14a6245a939

Changelog: 

Remove some unneeded inline defines and switch LIBDIR to be FINCH_LIBDIR,
PIDGIN_LIBDIR, or PURPLE_LIBDIR as appropriate.
What is still remaning is the LIBDIR used in the NSS SSL plugin, but I'm not
even sure that is really ever used.

Changes against parent 3c0410c0587e0a6d5eddc5eaa667d434bd1d77d8

  patched  finch/Makefile.am
  patched  finch/finch.c
  patched  libpurple/Makefile.am
  patched  libpurple/example/Makefile.am
  patched  libpurple/plugin.c
  patched  libpurple/plugins/perl/Makefile.am
  patched  libpurple/win32/win32dep.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkmain.c
  patched  pidgin/win32/gtkwin32dep.h

-------------- next part --------------
============================================================
--- libpurple/win32/win32dep.h	758980a937e7a1223576f23ece3428fd8b1cf36b
+++ libpurple/win32/win32dep.h	01e4d3984fb601deca471b44b045854e13a7a169
@@ -83,8 +83,8 @@ long wpurple_get_tz_offset(void);
  */
 #undef PURPLE_DATADIR
 #define PURPLE_DATADIR wpurple_share_dir()
-#undef LIBDIR
-#define LIBDIR wpurple_lib_dir()
+#undef PURPLE_LIBDIR
+#define PURPLE_LIBDIR wpurple_lib_dir()
 #undef LOCALEDIR
 #define LOCALEDIR wpurple_locale_dir()
 /* TODO: SYSCONFDIR should be the allusers AppData? */
============================================================
--- libpurple/plugins/perl/Makefile.am	f6ce9c2c8d2c10a84d5a4cbc6abad19624768912
+++ libpurple/plugins/perl/Makefile.am	300ef5105a7797e93048a7af5cf5b3fe70323a9c
@@ -161,7 +161,6 @@ AM_CPPFLAGS = \
 	fi
 
 AM_CPPFLAGS = \
-	-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
============================================================
--- libpurple/plugin.c	1dea199e1aa5529847ce92d2b4a557a5d91069f2
+++ libpurple/plugin.c	6de540dd7f2996b1bb35ebbedbf220625ea175ae
@@ -1182,7 +1182,7 @@ purple_plugins_init(void) {
 purple_plugins_init(void) {
 	void *handle = purple_plugins_get_handle();
 
-	purple_plugins_add_search_path(LIBDIR);
+	purple_plugins_add_search_path(PURPLE_LIBDIR);
 
 	purple_signal_register(handle, "plugin-load",
 						 purple_marshal_VOID__POINTER,
============================================================
--- pidgin/gtkmain.c	2e60724b0762acc35eb208d9ff24167a49b0b4dd
+++ pidgin/gtkmain.c	5b6ac1fda26180988d4bd8a7f7df0dc3bb490825
@@ -854,7 +854,7 @@ int main(int argc, char *argv[])
 		g_mkdir(search_path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(search_path);
 	g_free(search_path);
-	purple_plugins_add_search_path(LIBDIR);
+	purple_plugins_add_search_path(PIDGIN_LIBDIR);
 
 	if (!purple_core_init(PIDGIN_UI)) {
 		fprintf(stderr,
============================================================
--- finch/finch.c	dcee1fe9c9089e8148968f37a3b14dd4c21c4ee3
+++ finch/finch.c	e782912d60efcb1bf3f8186c622a27519f1395a0
@@ -367,7 +367,7 @@ init_libpurple(int argc, char **argv)
 	purple_plugins_add_search_path(path);
 	g_free(path);
 
-	purple_plugins_add_search_path(LIBDIR);
+	purple_plugins_add_search_path(FINCH_LIBDIR);
 
 	if (!purple_core_init(FINCH_UI))
 	{
============================================================
--- finch/Makefile.am	cfc891f73c4c9203662444b9b8dfeb14bee3282c
+++ finch/Makefile.am	13131f31a1c072962d563f07f75b12c43f806804
@@ -78,7 +78,7 @@ AM_CPPFLAGS = \
 
 AM_CPPFLAGS = \
 	-DPURPLE_DATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)/finch/\" \
+	-DFINCH_LIBDIR=\"$(libdir)/finch/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DSTANDALONE \
============================================================
--- libpurple/Makefile.am	88a33f0f83ceaed776ba7fc81d6442c225482929
+++ libpurple/Makefile.am	c0ad30b642c36285faaa31ce349ca4c07da7a441
@@ -353,7 +353,7 @@ AM_CPPFLAGS = \
 
 AM_CPPFLAGS = \
 	-DPURPLE_DATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
+	-DPURPLE_LIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	$(GLIB_CFLAGS) \
============================================================
--- pidgin/Makefile.am	86c932088b01efdba231c660112f1d2ebc3e5c43
+++ pidgin/Makefile.am	1fafa67a1d0fc5e510b621c79f193967c8b3de85
@@ -5,14 +5,8 @@ EXTRA_DIST = \
 		Makefile.mingw \
 		pidgin.pc.in \
 		pidgin-uninstalled.pc.in \
-		win32/MinimizeToTray.c \
 		win32/pidgin_dll_rc.rc.in \
 		win32/pidgin_exe_rc.rc.in \
-		win32/gtkdocklet-win32.c \
-		win32/gtkwin32dep.c \
-		win32/untar.c \
-		win32/winpidgin.c \
-		win32/wspell.c \
 		win32/nsis/generate_gtk_zip.sh \
 		win32/nsis/rpm2zip.sh \
 		win32/nsis/pixmaps/pidgin-header.bmp \
@@ -26,10 +20,16 @@ EXTRA_DIST += \
 		
 if !OS_WIN32
 EXTRA_DIST += \
+		win32/MinimizeToTray.c \
 		win32/MinimizeToTray.h \
+		win32/gtkdocklet-win32.c \
+		win32/gtkwin32dep.c \
 		win32/gtkwin32dep.h \
 		win32/resource.h \
+		win32/untar.c \
 		win32/untar.h \
+		win32/winpidgin.c \
+		win32/wspell.c \
 		win32/wspell.h
 endif
 
@@ -38,11 +38,7 @@ pkgconfig_DATA = pidgin.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pidgin.pc
 
-if OS_WIN32
 SUBDIRS = . pixmaps plugins
-else
-SUBDIRS = pixmaps plugins
-endif
 
 bin_PROGRAMS = pidgin
 
@@ -225,7 +221,7 @@ AM_CPPFLAGS = \
 
 AM_CPPFLAGS = \
 	-DPURPLE_DATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)/pidgin/\" \
+	-DPIDGIN_LIBDIR=\"$(libdir)/pidgin/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_builddir)/libpurple \
============================================================
--- pidgin/win32/gtkwin32dep.h	39319af22d0da87cd9ba14c8f2001e40c23c4d15
+++ pidgin/win32/gtkwin32dep.h	369d96d82ca73d8c4ac47469484152b9ebde8c02
@@ -25,7 +25,11 @@
 #include <windows.h>
 #include <gtk/gtk.h>
 #include "conversation.h"
+#include "win32dep.h"
 
+#undef PIDGIN_LIBDIR
+#define PIDGIN_LIBDIR PURPLE_LIBDIR
+
 HINSTANCE winpidgin_dll_hinstance(void);
 HINSTANCE winpidgin_exe_hinstance(void);
 
============================================================
--- libpurple/example/Makefile.am	5360d07aa01b1edc21121fcb883786c21eca2d07
+++ libpurple/example/Makefile.am	23e83f269768acb411773c046149079f0bcbffec
@@ -11,8 +11,6 @@ AM_CPPFLAGS = \
 	$(top_builddir)/libpurple/libpurple.la
 
 AM_CPPFLAGS = \
-	-DPURPLE_DATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DSTANDALONE \