Changeset 952 for trunk/zoo-project/zoo-kernel

Timestamp:

Sep 6, 2019, 2:07:14 PM (5 years ago)

Author:

djay

Message:

Fix callback activation

Location:

trunk/zoo-project/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -42 +42 @@
 
 service_json.o: service_json.c
-        g++ -fPIC ${JSON_CFLAGS} ${CFLAGS} -c service_json.c
+        g++ -fPIC ${XML2CFLAGS} ${JSON_CFLAGS} ${CFLAGS} -c service_json.c
 
 service_callback.o: service_callback.c

trunk/zoo-project/zoo-kernel/configure.ac

@@ -74 +74 @@
 if test "x$JSON_DIR" != "x" && test "x$CALLBACK_ACTIVATED" == "xyes"
 then
-        JSON_CPPFLAGS="-I$JSON_DIR/include/json-c/"
+        JSON_CPPFLAGS="-DUSE_JSON -I$JSON_DIR/include/json-c/"
         JSON_LDFLAGS="-L$JSON_DIR/lib -ljson-c"
         CPPFLAGS_SAVE="$CPPFLAGS"
@@ -87 +87 @@
         JSON_FILE="service_json.o"
         JSON_ENABLED="-DJSON"
-        CALLBACK_FILE="service_callback.o"
-        CALLBACK_USE="-DUSE_CALLBACK"
+        if test "x$CALLBACK_ACTIVATED" == "xyes"
+        then
+                CALLBACK_FILE="service_callback.o"
+                CALLBACK_USE="-DUSE_CALLBACK"
+        fi
 fi
 AC_SUBST([JSON_CPPFLAGS])