diff options
| -rw-r--r-- | account.c | 1 | ||||
| -rw-r--r-- | bitlbee.h | 1 | ||||
| -rw-r--r-- | chat.c | 1 | ||||
| -rw-r--r-- | chat.h | 5 | ||||
| -rwxr-xr-x | configure | 49 | ||||
| -rw-r--r-- | doc/user-guide/misc.xml | 2 | ||||
| -rw-r--r-- | irc_commands.c | 1 | ||||
| -rw-r--r-- | lib/misc.c | 1 | ||||
| -rw-r--r-- | protocols/jabber/jabber.h | 3 | ||||
| -rw-r--r-- | protocols/nogaim.c | 4 | ||||
| -rw-r--r-- | protocols/nogaim.h | 3 | ||||
| -rw-r--r-- | root_commands.c | 1 | ||||
| -rw-r--r-- | storage_xml.c | 1 |
13 files changed, 60 insertions, 13 deletions
@@ -26,6 +26,7 @@ #define BITLBEE_CORE #include "bitlbee.h" #include "account.h" +#include "chat.h" account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass ) { @@ -128,7 +128,6 @@ #include "commands.h" #include "account.h" #include "nick.h" -#include "chat.h" #include "conf.h" #include "log.h" #include "ini.h" @@ -24,6 +24,7 @@ */ #include "bitlbee.h" +#include "chat.h" struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel ) { @@ -23,6 +23,9 @@ Suite 330, Boston, MA 02111-1307 USA */ +#ifndef _CHAT_H +#define _CHAT_H + struct chat { account_t *acc; @@ -44,3 +47,5 @@ int chat_chancmp( char *a, char *b ); int chat_chanok( char *a ); int chat_join( irc_t *irc, struct chat *c, const char *password ); + +#endif @@ -266,7 +266,7 @@ EOF detect_ldap() { - TMPFILE=`mktemp` + TMPFILE=$(mktemp) if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then cat<<EOF>>Makefile.settings EFLAGS+=-lldap @@ -281,6 +281,43 @@ EOF fi } +RESOLV_TESTCODE=' +#include <arpa/nameser.h> +#include <resolv.h> + +int main() +{ + ns_initparse( NULL, 0, NULL ); + ns_parserr( NULL, ns_s_an, 0, NULL ); +} +' + +detect_resolv_dynamic() +{ + echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null + if [ "$?" = "0" ]; then + echo 'EFLAGS+=-lresolv' >> Makefile.settings + return 0 + fi + + return 1 +} + +detect_resolv_static() +{ + for i in $systemlibdirs; do + if [ -f $i/libresolv.a ]; then + echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null + if [ "$?" = "0" ]; then + echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings + return 0 + fi + fi + done + + return 1 +} + if [ "$ssl" = "auto" ]; then detect_gnutls if [ "$ret" = "0" ]; then @@ -348,13 +385,9 @@ fi; echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in $systemlibdirs; do - if [ -f $i/libresolv.a ]; then - echo '#define HAVE_RESOLV_A' >> config.h - echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings - break - fi -done +if detect_resolv_dynamic || detect_resolv_static; then + echo '#define HAVE_RESOLV_A' >> config.h +fi STORAGES="text xml" diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml index 3102b8b0..68b44e95 100644 --- a/doc/user-guide/misc.xml +++ b/doc/user-guide/misc.xml @@ -76,7 +76,7 @@ Then, just use the ordinary IRC <emphasis>/invite</emphasis> command to invite m </para> <para> -Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat_add</emphasis> for more information. +Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat add</emphasis> for more information. </para> </sect1> diff --git a/irc_commands.c b/irc_commands.c index 044ff62c..74334ee9 100644 --- a/irc_commands.c +++ b/irc_commands.c @@ -26,6 +26,7 @@ #define BITLBEE_CORE #include "bitlbee.h" #include "ipc.h" +#include "chat.h" static void irc_cmd_pass( irc_t *irc, char **cmd ) { @@ -45,6 +45,7 @@ #include <resolv.h> #endif +#include "md5.h" #include "ssl_client.h" void strip_linefeed(gchar *text) diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index ee453144..1180d2b9 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -26,8 +26,9 @@ #include <glib.h> -#include "xmltree.h" #include "bitlbee.h" +#include "md5.h" +#include "xmltree.h" extern GSList *jabber_connections; diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 710b7645..21f7dcb1 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -32,9 +32,11 @@ */ #define BITLBEE_CORE -#include "nogaim.h" #include <ctype.h> +#include "nogaim.h" +#include "chat.h" + static int remove_chat_buddy_silent( struct groupchat *b, const char *handle ); GSList *connections; diff --git a/protocols/nogaim.h b/protocols/nogaim.h index 1e5df503..dc6154e2 100644 --- a/protocols/nogaim.h +++ b/protocols/nogaim.h @@ -38,11 +38,12 @@ #ifndef _NOGAIM_H #define _NOGAIM_H +#include <stdint.h> + #include "bitlbee.h" #include "account.h" #include "proxy.h" #include "query.h" -#include "md5.h" #define BUDDY_ALIAS_MAXLEN 388 /* because MSN names can be 387 characters */ diff --git a/root_commands.c b/root_commands.c index 678ee143..5de616fb 100644 --- a/root_commands.c +++ b/root_commands.c @@ -28,6 +28,7 @@ #include "crypting.h" #include "bitlbee.h" #include "help.h" +#include "chat.h" #include <string.h> diff --git a/storage_xml.c b/storage_xml.c index b78c3661..b6745c75 100644 --- a/storage_xml.c +++ b/storage_xml.c @@ -28,6 +28,7 @@ #include "base64.h" #include "arc.h" #include "md5.h" +#include "chat.h" #if GLIB_CHECK_VERSION(2,8,0) #include <glib/gstdio.h> |