Changeset 82149f4

Timestamp:

2023-03-04T19:59:09Z (14 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

50d0a72

Parents:

709f41f

git-author:

Petr Vaněk <arkamar@…> (04-03-23 19:59:09)

git-committer:

GitHub <noreply@…> (04-03-23 19:59:09)

Message:

Fixes related to external-json-parser (#165)

• configure: append conditionally json-parser to pc file

json-parser needs to be appended to Requires section of pkg-config file
when bitlbee is configured to use external-json-parser. This change is
needed for external plugins like bitlbee-steam.

• Makefile: do not install json.h when system json-parser is used

install-dev target should not install bundled json.h when bitlbee is
configured to use external-json-parser.

• Use correct json.h header file with respect to external_json_parser value

The preprocessor must include correct json.h header file with respect to
external_json_parser value, otherwise function prototypes and other
definitions do not need to correspond with object used for linking.

The state before this commit is that local version lib/json.h is used
always for compilation and external_json_parser variable controls if
local lib/json.o or global libjsonparser.so will be linked.

In order to fix this problem, #include directives in lib/json_util.h and
lib/oauth2.c were changed from "json.h" to <json.h> and preprocessor -I
flags were moved after conditional json-parser flags, which is enough
for solving the issue. Additionally, USE_EXTERNAL_JSON_PARSER macro is
exported when external-json-parser is used and it is used in lib/json.h
to trigger an error message, which should prevent similar mistakes in
future.

Files:

• Makefile (modified) (1 diff)
• configure (modified) (4 diffs)
• lib/json.h (modified) (1 diff)
• lib/json_util.h (modified) (1 diff)
• lib/oauth2.c (modified) (1 diff)

Makefile

@@ -11 +11 @@
 # Program variables
 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_cap.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) auth.o $(AUTH_OBJS) unix.o conf.o log.o
-headers = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
+allheaders = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
+ifeq ($(EXTERNAL_JSON_PARSER),1)
+headers = $(filter-out $(_SRCDIR_)lib/json.h,$(allheaders))
+else
+headers = $(allheaders)
+endif
 subdirs = lib protocols
 

configure

@@ -330 +330 @@
 
 echo "CFLAGS=$CFLAGS $CPPFLAGS" >> Makefile.settings
-echo CFLAGS+=-I"${srcdir}" -I"${srcdir}"/lib -I"${srcdir}"/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H -D_GNU_SOURCE >> Makefile.settings
@@ -421 +420 @@
     # shellcheck disable=SC2129
     echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings
+    echo "CFLAGS+=-DUSE_EXTERNAL_JSON_PARSER" >> Makefile.settings
     echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings
     echo "LDFLAGS_TESTS+=$(pkg-config --libs json-parser)" >> Makefile.settings
 fi
 
+echo CFLAGS+=-I"${srcdir}" -I"${srcdir}"/lib -I"${srcdir}"/protocols -I. >> Makefile.settings
 
 detect_gnutls()
@@ -868 +869 @@
 esac
 
+pkgconfigrequires='glib-2.0'
+if [ "$external_json_parser" = '1' ]; then
+        pkgconfigrequires="$pkgconfigrequires json-parser"
+fi
+
 cat <<EOF >bitlbee.pc
 prefix=$prefix
@@ -877 +883 @@
 Name: bitlbee
 Description: IRC to IM gateway
-Requires: glib-2.0
+Requires: $pkgconfigrequires
 Version: $BITLBEE_VERSION
 Libs: $pkgconfiglibs

lib/json.h

@@ -29 +29 @@
  */
 
+#ifdef USE_EXTERNAL_JSON_PARSER
+#error Bitlbee was configured to use system json-parser, this header file should not be used.
+#endif
+
 #ifndef _JSON_H
 #define _JSON_H

lib/json_util.h

@@ -22 +22 @@
 ****************************************************************************/
 
-#include "json.h"
+#include <json.h>
 
 #define JSON_O_FOREACH(o, k, v) \

lib/oauth2.c

@@ -42 +42 @@
 #include "oauth2.h"
 #include "oauth.h"
-#include "json.h"
+#include <json.h>
 #include "json_util.h"
 #include "url.h"