From e480e4f3f84635f1ef20b4f625f31fc85937a434 Mon Sep 17 00:00:00 2001
From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Mon, 28 Jul 2008 13:44:45 +0000
Subject: [PATCH 1/1] This patch removes the remaining autotools bits for
 objson, in particular giving the user the choice of whether to build legacy
 json.

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1376 9efc2488-bf62-4759-914b-345cdb29e865
---
 bin/osrf_config.in |  4 ----
 configure.ac       | 19 -------------------
 2 files changed, 23 deletions(-)

diff --git a/bin/osrf_config.in b/bin/osrf_config.in
index 359a034..70b5c38 100644
--- a/bin/osrf_config.in
+++ b/bin/osrf_config.in
@@ -21,16 +21,12 @@ datarootdir=@datarootdir@
 function showInstalled {
 	 JAVA=@OSRF_INSTALL_JAVA@
 	 PYTHON=@OSRF_INSTALL_PYTHON@
-	 JSON=@OSRF_LEGACY_JSON@
 	 if test "$JAVA" = "true"; then
 	    echo "OSRF_JAVA"
 	 fi
 	 if test "$PYTHON" = "true"; then
 	    echo "OSRF_PYTHON"
 	 fi
-	 if test "$JSON" = "true"; then
-	    echo "OSRF_LEGACY_JSON"
-	 fi
 }
 
 function showAll {
diff --git a/configure.ac b/configure.ac
index 4a5d23e..745208e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,19 +80,6 @@ esac],
 AM_CONDITIONAL([BUILDPYTHON], [test x$OSRF_INSTALL_PYTHON = xtrue])
 AC_SUBST([OSRF_INSTALL_PYTHON])
 
-# create the legacy JSON headers and .so file for backwards compatibility?
-AC_ARG_ENABLE([legacyjson],
-[  --disable-legacyjson    disable the legacy json headers and .so file for backwards compatibility],
-[case "${enableval}" in
-    yes) OSRF_LEGACY_JSON=true ;;
-    no)  OSRF_LEGACY_JSON=false ;;
-  *) AC_MSG_ERROR([please choose another value for --disable-legacyjson (supported values are yes or no)]) ;;
-esac],
-[OSRF_LEGACY_JSON=true])
-
-AM_CONDITIONAL([BUILDJSON], [test x$OSRF_LEGACY_JSON = xtrue])
-AC_SUBST([OSRF_LEGACY_JSON])
-
 # enable debug?
 
 AC_ARG_ENABLE(debug,
@@ -293,12 +280,6 @@ else
         AC_MSG_RESULT([OSRF install python?:            no])
 fi
 
-if test "$OSRF_LEGACY_JSON" = "true" ; then
-        AC_MSG_RESULT([OSRF install legacy json?:       yes])
-else
-        AC_MSG_RESULT([OSRF install legacy json?:	no])
-fi
-
 	AC_MSG_RESULT(Installation directory prefix:		${prefix})
 	AC_MSG_RESULT(Tmp dir location:				${TMP})
 	AC_MSG_RESULT(APXS2 location:				${APXS2})
-- 
2.43.2