[Opensrf-commits] r1815 - in trunk: . src (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-10-11 20:25:15 -0400 (Sun, 11 Oct 2009)
New Revision: 1815

Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
Log:
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.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-11 18:39:16 UTC (rev 1814)
+++ trunk/configure.ac	2009-10-12 00:25:15 UTC (rev 1815)
@@ -108,6 +108,20 @@
 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 @@
         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})

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-10-11 18:39:16 UTC (rev 1814)
+++ trunk/src/Makefile.am	2009-10-12 00:25:15 UTC (rev 1815)
@@ -40,12 +40,16 @@
 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: