From 3e6d147e459eff817df7fbc8ac37f71ab319879b Mon Sep 17 00:00:00 2001 From: dbs Date: Mon, 12 Oct 2009 00:25:15 +0000 Subject: [PATCH] Chop chopchop out of the default make / install target chopchop is a basic XMPP server that is not used in production, so let's not bother with building and installing it in the default configuration. We introduce a new configure option, --enable-chopchop, for those who do want to build and install chopchop. git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1815 9efc2488-bf62-4759-914b-345cdb29e865 --- configure.ac | 20 ++++++++++++++++++++ src/Makefile.am | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8bdf183..da5a58a 100644 --- a/configure.ac +++ b/configure.ac @@ -108,6 +108,20 @@ esac], AM_CONDITIONAL([BUILDPYTHON], [test x$OSRF_INSTALL_PYTHON = xtrue]) AC_SUBST([OSRF_INSTALL_PYTHON]) +# enable chopchop, the basic XMPP server + +AC_ARG_ENABLE([chopchop], +[ --enable-chopchop build and install chopchop, a basic XMPP server], +[case "${enableval}" in + yes) OSRF_INSTALL_CHOPCHOP=true ;; + no) OSRF_INSTALL_CHOPCHOP=false ;; + *) AC_MSG_ERROR([please choose another value for --enable-chopchop (supported values are yes or no)]) ;; +esac], +[OSRF_INSTALL_CHOPCHOP=false]) + +AM_CONDITIONAL([BUILDCHOPCHOP], [test x$OSRF_INSTALL_CHOPCHOP = xtrue]) +AC_SUBST([OSRF_INSTALL_CHOPCHOP]) + # enable debug? AC_ARG_ENABLE(debug, @@ -312,6 +326,12 @@ else AC_MSG_RESULT([OSRF install python?: no]) fi +if test "$OSRF_INSTALL_CHOPCHOP" = "true" ; then + AC_MSG_RESULT([OSRF install chopchop?: yes]) +else + AC_MSG_RESULT([OSRF install chopchop?: no]) +fi + AC_MSG_RESULT(Installation directory prefix: ${prefix}) AC_MSG_RESULT(Tmp dir location: ${TMP}) AC_MSG_RESULT(APXS2 location: ${APXS2}) diff --git a/src/Makefile.am b/src/Makefile.am index 99b2ccd..9dabbaf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,12 +40,16 @@ js_SCRIPTS = javascript/DojoSRF.js javascript/JSON_v0.js javascript/JSON_v1.js j endif if BUILDCORE -MAYBE_CORE = libopensrf c-apps router srfsh jserver gateway perl +MAYBE_CORE = libopensrf c-apps router srfsh gateway perl dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl bin_SCRIPTS = @top_srcdir@/bin/osrf_config @top_srcdir@/bin/osrf_ctl.sh dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example endif +if BUILDCHOPCHOP +MAYBE_CHOPCHOP = jserver +endif + SUBDIRS = $(MAYBE_CORE) $(MAYBE_PY) $(MAYBE_JA) install-exec-local: -- 2.43.2