[Opensrf-commits] r1376 - in trunk: . bin

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-07-28 09:44:45 -0400 (Mon, 28 Jul 2008)
New Revision: 1376

Modified:
   trunk/bin/osrf_config.in
   trunk/configure.ac
Log:

This patch removes the remaining autotools bits for objson, in particular giving 
the user the choice of whether to build legacy json.





Modified: trunk/bin/osrf_config.in
===================================================================
--- trunk/bin/osrf_config.in	2008-07-28 03:55:01 UTC (rev 1375)
+++ trunk/bin/osrf_config.in	2008-07-28 13:44:45 UTC (rev 1376)
@@ -21,16 +21,12 @@
 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 {

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-07-28 03:55:01 UTC (rev 1375)
+++ trunk/configure.ac	2008-07-28 13:44:45 UTC (rev 1376)
@@ -80,19 +80,6 @@
 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 @@
         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})