From 02dfdd06f76055113b6bfa7dfadbb0d4a6d12fa1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 16 Oct 2012 12:25:24 +0000
Subject: [PATCH]

---
 config.status  | 19 ++++++++-----------
 configure      | 42 ++++++++++++++++++++++--------------------
 configure.ac   |  6 +-----
 po/Makefile.in |  6 +++---
 4 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/config.status b/config.status
index c47908c..cdd4a85 100755
--- a/config.status
+++ b/config.status
@@ -432,7 +432,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/jporsini/work/wpitchoune/svnpub/gtask/trunk'
+ac_pwd='/home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -616,8 +616,6 @@ S["CPPCHECK_FALSE"]="#"
 S["CPPCHECK_TRUE"]=""
 S["HAVE_CPPCHECK"]="yes"
 S["HELP2MAN"]="help2man"
-S["JSON_FALSE"]="#"
-S["JSON_TRUE"]=""
 S["JSON_LIBS"]="-ljson  "
 S["JSON_CFLAGS"]="-I/usr/include/json  "
 S["GTK_LIBS"]="-lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0  "
@@ -687,12 +685,12 @@ S["mkdir_p"]="/bin/mkdir -p"
 S["MKDIR_P"]="/bin/mkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
 S["STRIP"]=""
-S["install_sh"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/install-sh"
-S["MAKEINFO"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/missing --run makeinfo"
-S["AUTOHEADER"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/missing --run autoheader"
-S["AUTOMAKE"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/missing --run automake-1.11"
-S["AUTOCONF"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/missing --run autoconf"
-S["ACLOCAL"]="${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/missing --run aclocal-1.11"
+S["install_sh"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/install-sh"
+S["MAKEINFO"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/missing --run makeinfo"
+S["AUTOHEADER"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/missing --run autoheader"
+S["AUTOMAKE"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/missing --run automake-1.11"
+S["AUTOCONF"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/missing --run autoconf"
+S["ACLOCAL"]="${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/missing --run aclocal-1.11"
 S["VERSION"]="0.0.x"
 S["PACKAGE"]="gtask"
 S["CYGPATH_W"]="echo"
@@ -708,8 +706,7 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"gtask\\\" -DPACKAGE_TARNAME=\\\"gtask\\\" -DPACKAGE_VERSION=\\\"0.0.x\\\" -DPACKAGE_STRING=\\\"gtask\\ 0.0.x\\\" -DPACKAGE_BUGREPORT=\\\"jeanfi@gmai"\
-"l.com\\\" -DPACKAGE_URL=\\\"http://wpitchoune.net/gtask\\\" -DPACKAGE=\\\"gtask\\\" -DVERSION=\\\"0.0.x\\\" -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1 -DH"\
-"AVE_JSON=1"
+"l.com\\\" -DPACKAGE_URL=\\\"http://wpitchoune.net/gtask\\\" -DPACKAGE=\\\"gtask\\\" -DVERSION=\\\"0.0.x\\\" -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
 S["libdir"]="${exec_prefix}/lib"
diff --git a/configure b/configure
index 52614bb..f296517 100755
--- a/configure
+++ b/configure
@@ -595,8 +595,6 @@ CPPCHECK_FALSE
 CPPCHECK_TRUE
 HAVE_CPPCHECK
 HELP2MAN
-JSON_FALSE
-JSON_TRUE
 JSON_LIBS
 JSON_CFLAGS
 GTK_LIBS
@@ -6652,30 +6650,38 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JSON_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Remote monitoring disabled" >&5
-$as_echo "$as_me: WARNING: \"Remote monitoring disabled" >&2;}
+	as_fn_error $? "Package requirements (json) were not met:
+
+$JSON_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables JSON_CFLAGS
+and JSON_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Remote monitoring disabled" >&5
-$as_echo "$as_me: WARNING: \"Remote monitoring disabled" >&2;}
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables JSON_CFLAGS
+and JSON_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
 	JSON_LIBS=$pkg_cv_JSON_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-$as_echo "#define HAVE_JSON 1" >>confdefs.h
-
 fi
- if test -n "$JSON_LIBS"; then
-  JSON_TRUE=
-  JSON_FALSE='#'
-else
-  JSON_TRUE='#'
-  JSON_FALSE=
-fi
-
 
 
 
@@ -6932,10 +6938,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${JSON_TRUE}" && test -z "${JSON_FALSE}"; then
-  as_fn_error $? "conditional \"JSON\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${CPPCHECK_TRUE}" && test -z "${CPPCHECK_FALSE}"; then
   as_fn_error $? "conditional \"CPPCHECK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 8883d10..dd31058 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,7 @@ AC_SUBST(GTK_LIBS)
 
 # Check JSON
 JSON_LIBS=
-PKG_CHECK_MODULES(JSON, 
-  json, 
-  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], 
-  [AC_MSG_WARN("Remote monitoring disabled, json missing")])
-AM_CONDITIONAL(JSON, test -n "$JSON_LIBS")
+PKG_CHECK_MODULES(JSON, json)
 AC_SUBST(JSON_CFLAGS)
 AC_SUBST(JSON_LIBS)
 
diff --git a/po/Makefile.in b/po/Makefile.in
index b93dffa..b94b43d 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/gtask/trunk/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/gtask/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 
-- 
2.7.4