Author: cazfi
Date: Thu May 14 23:19:31 2015
New Revision: 29083
URL: http://svn.gna.org/viewcvs/freeciv?rev=29083&view=rev
Log:
Separated new --enable-json configure option from --enable-fcweb
See patch #6071
Modified:
trunk/configure.ac
trunk/m4/web-client.m4
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=29083&r1=29082&r2=29083&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu May 14 23:19:31 2015
@@ -261,6 +261,8 @@
dnl checks for MagickWand mapimg support
dnl sets MAPIMG_WAND_CFLAGS, MAPIMG_WAND_LIBS
FC_MAPIMG_MAGICKWAND
+
+FC_WEB_OPTIONS
AC_ARG_ENABLE([fcweb],
AS_HELP_STRING([--enable-fcweb], [build fcweb version of server [false]]),
Modified: trunk/m4/web-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/web-client.m4?rev=29083&r1=29082&r2=29083&view=diff
==============================================================================
--- trunk/m4/web-client.m4 (original)
+++ trunk/m4/web-client.m4 Thu May 14 23:19:31 2015
@@ -6,14 +6,26 @@
if test "x$fcweb" = "xtrue" ; then
AC_DEFINE([FREECIV_WEB], [1], [Build freeciv-web version])
+ fi
+])
- AC_CHECK_LIB([jansson], [json_object_set_new],
-[SERVER_LIBS="${SERVER_LIBS} -ljansson"],
+AC_DEFUN([FC_WEB_OPTIONS],
+[
+AC_ARG_ENABLE([json],
+ AS_HELP_STRING([--enable-json], [enable json network protocol]),
+[case "${enableval}" in
+ yes|no) json_enabled=${enableval} ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-json]) ;;
+esac], [json_enabled=no])
+
+if test "x$json_enabled" = "xyes" ; then
+ AC_CHECK_LIB([jansson], [json_object_set_new],
+[LIBS="${LIBS} -ljansson"],
[AC_MSG_ERROR([cannot find libjansson])])
- AC_CHECK_HEADER([jansson.h], [],
+ AC_CHECK_HEADER([jansson.h], [],
[AC_MSG_ERROR([libjansson found but not jansson.h])])
- AC_DEFINE([FREECIV_JSON_CONNECTION], [1], [jansson network protocol in
use])
- fi
+ AC_DEFINE([FREECIV_JSON_CONNECTION], [1], [jansson network protocol in use])
+fi
])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
