In my previous patch, all of the objson code was removed from OpenSRF,
including the autotools bits that compiled objson. This patch removes the
remaining autotools bits, in particular giving the user the choice of whether
to build legacy json.
-b
--
Bill Erickson
| VP, Software Development & Integration
| Equinox Software, Inc. / The Evergreen Experts
| phone: 877-OPEN-ILS (673-6457)
| email: [EMAIL PROTECTED]
| web: http://esilibrary.com
Index: configure.ac
===================================================================
--- configure.ac (revision 1375)
+++ configure.ac (working copy)
@@ -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})
Index: bin/osrf_config.in
===================================================================
--- bin/osrf_config.in (revision 1375)
+++ bin/osrf_config.in (working copy)
@@ -21,16 +21,12 @@
function showInstalled {
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
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 {
