From c5501ab5f667db3c5bbf8c12153de050967a18dc Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Sun, 1 Jun 2014 20:14:56 +0800
Subject: [PATCH] fix configure options:

1. fix --enable-json
2. fix --enable-graphviz
---
 configure.ac | 73 +++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 41 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4d8ca0bf..de6d24de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,20 +22,9 @@ AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr])
 
 PKG_PROG_PKG_CONFIG
 
-AC_ARG_ENABLE(graphviz,
-              AS_HELP_STRING([--enable-graphviz],
-                             [enable graphviz support]),
-              , enable_graphviz=unset)
-if test "x$enable_graphviz" != "xunset" ; then
-   PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
-   AC_SUBST(GVC_DEPS_CFLAGS)
-   AC_SUBST(GVC_DEPS_LIBS)
-fi
 
-AC_ARG_ENABLE(debug,
-              AS_HELP_STRING([--enable-debug],
-                             [enable debug]),
-              , enable_debug=unset)
+
+
 
 AC_ARG_WITH([malloc],
     AS_HELP_STRING([--without-malloc], [Use the default malloc]))
@@ -72,50 +61,52 @@ AM_CONDITIONAL(USE_JEMALLOC, test "x$have_jemalloc" = "xyes")
 # AM_CONDITIONAL(USE_JEMALLOC, test "x$found_jemalloc" = "xyes")
 # AC_DEFINE(USE_JEMALLOC, test "x$found_jemalloc" = "xyes" , "use jemalloc")
 
-AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = "xyes")
-AM_CONDITIONAL(ENABLE_JSON, test "x$enable_json" = "xyes")
-AM_CONDITIONAL(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes")
-
-AC_DEFINE(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes", "whether graphviz is enable")
-AC_DEFINE(ENABLE_JSON, test "x$enable_json" = "xyes", "whether json is enable")
 
 PKG_CHECK_MODULES(DEPS, [libpcre])
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
 
-AC_ARG_ENABLE(json,
-              AS_HELP_STRING([--enable-json],
-                             [enable json encoder]),
-              , enable_json=unset)
+AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[enable debug]))
+if test "x$enable_debug" = "xyes"; then
+   AC_DEFINE(ENABLE_DEBUG, 1, "debug")
+fi
+AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = "xyes")
+
 
 
-if test "x$enable_json" != "xunset" ; then
-PKG_CHECK_MODULES(JSONC, [json-c])
-AC_SUBST(JSONC_CFLAGS)
-AC_SUBST(JSONC_LIBS)
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--enable-graphviz],[enable graphviz support]))
+if test "x$enable_graphviz" = "xyes" ; then
+   PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
+   AC_SUBST(GVC_DEPS_CFLAGS)
+   AC_SUBST(GVC_DEPS_LIBS)
+   AC_DEFINE(ENABLE_GRAPHVIZ, 1, "whether graphviz is enable")
+fi
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes")
+
+
+
+
+AC_ARG_ENABLE(json, AS_HELP_STRING([--enable-json],[enable json encoder]))
+if test "x$enable_json" = "xyes"; then
+    AC_DEFINE(ENABLE_JSON, 1, [enable json])
 fi
+AM_CONDITIONAL(ENABLE_JSON, test "x$enable_json" = "xyes")
 
 
 # This does not work because configure does not look into /opt/local/include...
 # AC_CHECK_HEADERS([check.h],[ enable_check=yes ],[ enable_check=unset ])
-AC_ARG_ENABLE(check,
-              AS_HELP_STRING([--enable-check],
-                             [enable unit testing]),
-              , enable_check=unset)
-
-if test "x$enable_check" != "xunset" ; then
-# AM_PATH_CHECK
-PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
-  ifdef([AM_PATH_CHECK],
-  [AM_PATH_CHECK(,[have_check="yes"])],
-  AC_MSG_WARN([Check not found; cannot run unit tests!])
-  [have_check="no"])]
-])
+AC_ARG_ENABLE(check, AS_HELP_STRING([--enable-check], [enable unit testing]))
+if test "$enable_check" = "xyes"; then
+    PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
+        ifdef([AM_PATH_CHECK],
+        [AM_PATH_CHECK(,[have_check="yes"])],
+        AC_MSG_WARN([Check not found; cannot run unit tests!])
+        [have_check="no"])]
+    ])
 fi
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
-
 AC_CONFIG_FILES([
   r3.pc
   Makefile