Changeset da0202a

Timestamp:

2022-08-22T14:38:38Z (2 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

b9572c1

Parents:

b82ba4a

git-author:

Jelmer Vernooij <jelmer@…> (30-08-20 20:52:36)

git-committer:

Jelmer Vernooij <jelmer@…> (22-08-22 14:38:38)

Message:

Support using system libjsonparser.

Files:

• configure (modified) (4 diffs)
• lib/Makefile (modified) (1 diff)
• tests/Makefile (modified) (1 diff)

configure

@@ -48 +48 @@
 
 events=glib
+external_json_parser=auto
 ssl=auto
 
@@ -155 +156 @@
 --ssl=...       SSL library to use (gnutls, nss, openssl, auto)
                                                         $ssl
+--external_json_parser=0/1/auto Use External JSON parser $external_json_parser
 
 
@@ -404 +406 @@
 fi
 echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
+
+if [ "$external_json_parser" = "auto" ]; then
+        if pkg-config --exists json-parser; then
+                external_json_parser=1
+        else
+                external_json_parser=0
+        fi
+fi
+echo "EXTERNAL_JSON_PARSER=$external_json_parser" >> Makefile.settings
+if [ "$external_json_parser" = "1" ]; then
+    echo "CFLAGS+=$(pkg-config --cflags 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
+
 
 detect_gnutls()
@@ -995 +1012 @@
 
 echo '  Using python: '$PYTHON
+
+if [ "$external_json_parser" = "1" ]; then
+    echo '  Using system JSON parser.'
+else
+    echo '  Using bundled JSON parser.'
+fi
+
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl

lib/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
+objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
+
+ifneq ($(EXTERNAL_JSON_PARSER),1)
+objects += json.o
+endif
 
 LFLAGS += -r

tests/Makefile

@@ -3 +3 @@
 _SRCDIR_ := $(_SRCDIR_)tests/
 endif
+
+LFLAGS += $(LDFLAGS_TESTS)
 
 CFLAGS += $(shell pkg-config --cflags check)