From 98a114af39a8d693cb1d9a7eb2c9e1e8252ee67a Mon Sep 17 00:00:00 2001
From: gombasg <gombasg@a7169a2c-3604-0410-bc95-c702d8d87f7a>
Date: Wed, 5 Apr 2006 13:14:33 +0000
Subject: [PATCH] Clean up backend selection

git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@419 a7169a2c-3604-0410-bc95-c702d8d87f7a
---
 dcapi/configure.ac | 72 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/dcapi/configure.ac b/dcapi/configure.ac
index a2ac3f150e..db910acbd8 100644
--- a/dcapi/configure.ac
+++ b/dcapi/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Distributed Computing API], [0.2], [podhorszki@sztaki.hu], [dcapi])
+AC_INIT([Distributed Computing API], [0.9], [desktopgrid@lpds.sztaki.hu], [dcapi])
 AC_CONFIG_MACRO_DIR([cf])
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([scripts])
@@ -11,40 +11,76 @@ AC_PROG_LIBTOOL
 
 LIBTOOL="$LIBTOOL --silent"
 
+dnl Enable useful warnings
 if test "$ac_cv_c_compiler_gnu" = yes; then
 	CFLAGS="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wsign-compare ${CFLAGS}"
 	CXXFLAGS="-Wall -Wsign-compare ${CXXFLAGS}"
 fi
 
-AC_ARG_ENABLE([client], AS_HELP_STRING([--disable-client], [do not build the client application]),, [enable_client=yes])
-AC_ARG_ENABLE([master], AS_HELP_STRING([--disable-master], [do not build the master application]),, [enable_master=yes])
-
-AM_PATH_GLIB_2_0([2.6.0],,[AC_MSG_ERROR([glib2 is missing])])
+AC_ARG_ENABLE([client],
+	AS_HELP_STRING([--disable-client], [do not build the client application]),,
+	[enable_client=yes])
+AC_ARG_ENABLE([master],
+	AS_HELP_STRING([--disable-master], [do not build the master application]),,
+	[enable_master=yes])
 
 AM_CONDITIONAL([BUILD_CLIENT], [test "$enable_client" = yes])
 AM_CONDITIONAL([BUILD_MASTER], [test "$enable_master" = yes])
 
-AC_ARG_WITH([clgr], AS_HELP_STRING([--with-clgr@<:@=DIR@:>@],
-	[Use ClusterGrid (installed in DIR)]),, [with_clgr=yes])
+AM_PATH_GLIB_2_0([2.6.0],,[AC_MSG_ERROR([glib2 is missing])])
 
-AC_ARG_ENABLE([local], AS_HELP_STRING([--enable-local],
-	[Build local DC-API]),, [enable_local=yes])
+dnl ===================================================================
+dnl BOINC backend
+dnl
 
-if test "$enable_client" = yes; then
-	SZDG_BOINC_CLIENT
-	if test "$no_boinc" != yes; then
+AC_ARG_ENABLE([backend-boinc],
+	AS_HELP_STRING([--enable-backend-boinc],
+		[enable the BOINC backend @<:@default=yes@:>@]),,
+	[enable_backend_boinc=yes])
+
+if test "$enable_backend_boinc" = yes; then
+	if test "$enable_client" = yes; then
+		SZDG_BOINC_CLIENT
 		AC_CHECK_HEADERS([uuid/uuid.h],, [AC_MSG_ERROR([libuuid headers are missing])])
 		AC_CHECK_LIB([uuid], [uuid_generate], [true], [AC_MSG_ERROR([libuuid is missing])])
 	fi
-fi
-
-if test "$enable_master" = yes; then
-	SZDG_BOINC_SERVER
+	if test "$enable_master" = yes; then
+		SZDG_BOINC_SERVER
+	fi
+	if test "$no_boinc" = yes; then
+		AC_MSG_ERROR([BOINC development environment was not found])
+	fi
+else
+	no_boinc=yes
 fi
 
 AM_CONDITIONAL([WITH_BOINC], [test "$no_boinc" != yes])
-AM_CONDITIONAL([WITH_CLGR], [test "$with_clgr" != no])
-AM_CONDITIONAL([WITH_LOCAL], [test "$enable_local" == yes])
+
+dnl ===================================================================
+dnl ClusterGrid backend
+dnl
+
+AC_ARG_ENABLE([backend-clgr],
+	AS_HELP_STRING([--enable-backend-clgr],
+		[enable the ClusterGrid backend @<:@default=yes@:>@]),,
+	[enable_backend_clgr=yes])
+
+AM_CONDITIONAL([WITH_CLGR], [test "$enable_backend_clgr" = yes])
+
+dnl ===================================================================
+dnl Local backend
+dnl
+
+AC_ARG_ENABLE([backend-local],
+	AS_HELP_STRING([--enable-backend-local],
+		[enable the local backend @<:@default=yes@:>@]),,
+	[enable_local=yes])
+
+AM_CONDITIONAL([WITH_LOCAL], [test "$enable_backend_local" == yes])
+
+dnl ===================================================================
+dnl Generate output files
+dnl
 
 AC_CONFIG_FILES([Makefile \
 	include/Makefile \