Changeset c289b6f


Ignore:
Timestamp:
2009-11-19T23:00:56Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
e5e795d
Parents:
c48a033 (diff), 36cf9fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging in head. I want to roll a 1.2.4-2 that fixes the libresolv issues.
Having the include files fixed is a nice extra.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • account.c

    rc48a033 rc289b6f  
    2727#include "bitlbee.h"
    2828#include "account.h"
     29#include "chat.h"
    2930
    3031account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
  • bitlbee.h

    rc48a033 rc289b6f  
    129129#include "account.h"
    130130#include "nick.h"
    131 #include "chat.h"
    132131#include "conf.h"
    133132#include "log.h"
  • chat.c

    rc48a033 rc289b6f  
    2525
    2626#include "bitlbee.h"
     27#include "chat.h"
    2728
    2829struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel )
  • chat.h

    rc48a033 rc289b6f  
    2424*/
    2525
     26#ifndef _CHAT_H
     27#define _CHAT_H
     28
    2629struct chat
    2730{
     
    4548
    4649int chat_join( irc_t *irc, struct chat *c, const char *password );
     50
     51#endif
  • configure

    rc48a033 rc289b6f  
    267267detect_ldap()
    268268{
    269         TMPFILE=`mktemp`
     269        TMPFILE=$(mktemp)
    270270        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
    271271                cat<<EOF>>Makefile.settings
     
    280280                ret=0
    281281        fi
     282}
     283
     284RESOLV_TESTCODE='
     285#include <arpa/nameser.h>
     286#include <resolv.h>
     287
     288int main()
     289{
     290        ns_initparse( NULL, 0, NULL );
     291        ns_parserr( NULL, ns_s_an, 0, NULL );
     292}
     293'
     294
     295detect_resolv_dynamic()
     296{
     297        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
     298        if [ "$?" = "0" ]; then
     299                echo 'EFLAGS+=-lresolv' >> Makefile.settings
     300                return 0
     301        fi
     302
     303        return 1
     304}
     305
     306detect_resolv_static()
     307{
     308        for i in $systemlibdirs; do
     309                if [ -f $i/libresolv.a ]; then
     310                        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
     311                        if [ "$?" = "0" ]; then
     312                                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
     313                                return 0
     314                        fi
     315                fi
     316        done
     317
     318        return 1
    282319}
    283320
     
    349386echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
    350387
    351 for i in $systemlibdirs; do
    352         if [ -f $i/libresolv.a ]; then
    353                 echo '#define HAVE_RESOLV_A' >> config.h
    354                 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
    355                 break
    356         fi
    357 done
     388if detect_resolv_dynamic || detect_resolv_static; then
     389        echo '#define HAVE_RESOLV_A' >> config.h
     390fi
    358391
    359392STORAGES="text xml"
  • doc/user-guide/misc.xml

    rc48a033 rc289b6f  
    7777
    7878<para>
    79 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.
     79Some 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.
    8080</para>
    8181
  • irc_commands.c

    rc48a033 rc289b6f  
    2727#include "bitlbee.h"
    2828#include "ipc.h"
     29#include "chat.h"
    2930
    3031static void irc_cmd_pass( irc_t *irc, char **cmd )
  • lib/misc.c

    rc48a033 rc289b6f  
    4646#endif
    4747
     48#include "md5.h"
    4849#include "ssl_client.h"
    4950
  • protocols/jabber/jabber.h

    rc48a033 rc289b6f  
    2727#include <glib.h>
    2828
     29#include "bitlbee.h"
     30#include "md5.h"
    2931#include "xmltree.h"
    30 #include "bitlbee.h"
    3132
    3233extern GSList *jabber_connections;
  • protocols/nogaim.c

    rc48a033 rc289b6f  
    3333
    3434#define BITLBEE_CORE
     35#include <ctype.h>
     36
    3537#include "nogaim.h"
    36 #include <ctype.h>
     38#include "chat.h"
    3739
    3840static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
  • protocols/nogaim.h

    rc48a033 rc289b6f  
    3939#define _NOGAIM_H
    4040
     41#include <stdint.h>
     42
    4143#include "bitlbee.h"
    4244#include "account.h"
    4345#include "proxy.h"
    4446#include "query.h"
    45 #include "md5.h"
    4647
    4748#define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
  • root_commands.c

    rc48a033 rc289b6f  
    2929#include "bitlbee.h"
    3030#include "help.h"
     31#include "chat.h"
    3132
    3233#include <string.h>
  • storage_xml.c

    rc48a033 rc289b6f  
    2929#include "arc.h"
    3030#include "md5.h"
     31#include "chat.h"
    3132
    3233#if GLIB_CHECK_VERSION(2,8,0)
Note: See TracChangeset for help on using the changeset viewer.