pidgin: cd0389d1: When compiling against an external libze...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: cd0389d15f155a498b41fe0f52b2b611afab9d12
Ancestor: a77b2b07db9d98294b9d659d80cef57166099c53
Author: rlaager at pidgin.im
Date: 2008-05-25T00:40:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cd0389d15f155a498b41fe0f52b2b611afab9d12

Renamed entries:
        libpurple/protocols/zephyr/zephyr.h to libpurple/protocols/zephyr/zephyr_internal.h
Modified files:
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/internal.h
        libpurple/protocols/zephyr/zephyr.c

ChangeLog: 

When compiling against an external libzephyr, we need to use its zephyr.h,
not our zephyr.h.  This came from Debian, but I simplified it:
    http://bugs.debian.org/451165

-------------- next part --------------
============================================================
--- libpurple/protocols/zephyr/Makefile.am	c3c7b401feed6ef0512e6db95aa8e001d3e0c7be
+++ libpurple/protocols/zephyr/Makefile.am	bd999a1285b73ad59dee14591f1d14f0f1038ff2
@@ -59,9 +59,9 @@ ZEPHYRSOURCES = \
 	mit-copyright.h \
 	mit-sipb-copyright.h \
 	sysdep.h \
-	zephyr.h \
 	zephyr_err.c \
 	zephyr_err.h \
+	zephyr_internal.h \
 	\
 	zephyr.c
 
============================================================
--- libpurple/protocols/zephyr/internal.h	86f2e30cae99d8942dca384dbaa633699e7f40c2
+++ libpurple/protocols/zephyr/internal.h	61e5d26d07d8365286ae903fec1dc0d457d6bd24
@@ -1,10 +1,14 @@
-
 #ifndef __INTERNAL_H__
 #define __INTERNAL_H__
 
 #include <sysdep.h>
 
-#include <zephyr.h>
+#ifdef LIBZEPHYR_EXT
+#include <zephyr/zephyr.h>
+#else
+#include <zephyr_internal.h>
+#endif
+
 #ifndef WIN32
 #include <netdb.h>
 #endif
============================================================
--- libpurple/protocols/zephyr/zephyr.c	46d9fa4b7205eb47aa18662ec98afd0bed0033ee
+++ libpurple/protocols/zephyr/zephyr.c	aea1b1c7db11574e57dfa320816b27c9ee8823ed
@@ -38,7 +38,6 @@
 #include "privacy.h"
 #include "version.h"
 
-#include "zephyr.h"
 #include "internal.h"
 
 #include <strings.h>