Changeset 0b9daac for lib/misc.c

Timestamp:

2015-02-20T23:16:08Z (9 years ago)

Author:

dequis <dx@…>

Parents:

5ebff60

git-author:

dequis <dx@…> (27-12-14 04:06:45)

git-committer:

dequis <dx@…> (20-02-15 23:16:08)

Message:

Reorganize include files to avoid conflicts with other libs

• Change all header includes to be relative to the project root
• Remove -I${includedir} from bitlbee.pc Cflags
• Install lib and protocols headers to their own directories. So now it is:

/usr/include/bitlbee/*.h
/usr/include/bitlbee/lib/*.h
/usr/include/bitlbee/protocols/*.h

This breaks backwards compatibility of third party plugins, but now
they don't have to do ambiguous includes like #include <proxy.h>

This also fixes trac ticket 1170 - conflicts when libproxy and liboauth
are installed at the same time bitlbee is built, which the macports
project ran into several times.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -32 +32 @@
 
 #define BITLBEE_CORE
-#include "nogaim.h"
-#include "base64.h"
-#include "md5.h"
+#include "protocols/nogaim.h"
+#include "lib/base64.h"
+#include "lib/md5.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -47 +47 @@
 #endif
 
-#include "md5.h"
-#include "ssl_client.h"
+#include "lib/md5.h"
+#include "lib/ssl_client.h"
 
 void strip_linefeed(gchar *text)