Changeset ed165fe


Ignore:
Timestamp:
2005-11-28T22:04:50Z (14 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
2983f5e
Parents:
cfcc587 (diff), f712188 (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:

Merge required fix from integration

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • bitlbee.h

    rcfcc587 red165fe  
    3535#define MAX_STRING 128
    3636
     37#if HAVE_CONFIG_H
    3738#include "config.h"
     39#endif
    3840
    3941#include <fcntl.h>
  • configure

    rcfcc587 red165fe  
    123123
    124124echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
     125
     126echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
    125127
    126128if [ -n "$CC" ]; then
Note: See TracChangeset for help on using the changeset viewer.