[sword-cvs] sword configure.ac,1.42,1.43

[sword at www.crosswire.org]

Committed by: dglassey

Update of /cvs/core/sword
In directory www:/tmp/cvs-serv16407

Modified Files:
	configure.ac 
Log Message:

allow installmgr to use external libcurl, external ftplib or internal ftplib
ftplib support appears to work but still needs testing
remove redundant target platform part of configure


Index: configure.ac
===================================================================
RCS file: /cvs/core/sword/configure.ac,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- configure.ac	7 May 2004 17:49:44 -0000	1.42
+++ configure.ac	18 May 2004 19:20:17 -0000	1.43
@@ -37,8 +37,12 @@
 	AC_HELP_STRING([--with-icu],[use ICU for unicode (default=no)]),,with_icu=no)
 AC_ARG_WITH(conf,
 	AC_HELP_STRING([--with-conf],[install a new sword.conf (default=yes)]),,with_conf=yes)
-AC_ARG_WITH(curl,
-	AC_HELP_STRING([--with-curl],[build install manager support using libcurl (default=yes)]),,with_curl=yes)
+AC_ARG_WITH(installmgr,
+	AC_HELP_STRING([--with-installmgr],[build install manager support: 
+	curl=using libcurl, 
+	ftplib=using external ftplib, 
+	internal=using internal ftplib 
+	(default=internal)]),,with_installmgr=internal)
 AC_ARG_WITH(lucene,
 	AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
 
@@ -73,6 +77,10 @@
 	AC_CHECK_LIB(z, compress)
 fi
 
+if test x$with_installmgr  = xftplib; then
+	AC_CHECK_LIB(ftplib, FtpGet)
+fi
+
 # ---------------------------------------------------------------------
 # Find pkg-config
 # ---------------------------------------------------------------------
@@ -161,7 +169,7 @@
 
 CURL_AM_CFLAGS=
 CURL_LIBS=
-if test x$with_curl = xyes; then
+if test x$with_installmgr = xcurl; then
     AC_PATH_PROG(CURL_CONFIG, curl-config, no)
     if test "$CURL_CONFIG" = "no" ; then
 	echo "*** The curl-config script installed by curl could not be found"
@@ -226,46 +234,6 @@
 
 
 # ---------------------------------------------------------------------
-# Determine target system (obsolete?)
-# ---------------------------------------------------------------------
-case "$target_cpu" in
-  i?86)
-    target_system="intel"
-    ;;
-  sparc)
-	case "$target_os" in
-  	solaris*)
-    	target_system="sparc_solaris"
-    	;;
-  	*)
-    	target_system="gnu_bigendian"
-    	;;
-	esac
-    ;;
-  *)
-    target_system="$target_cpu"
-    ;;
-esac
-
-case "$target_os" in
-  beos)
-    target_system="beos"
-    ;;
-  *)
-    target_system="$target_system"
-    ;;
-esac
-
-case "$target_os" in
-  mingw*)
-    target_mingw32="yes"
-    ;;
-  *)
-    target_mingw32="no"
-    ;;
-esac
-
-# ---------------------------------------------------------------------
 # Substitute variables into makefiles
 # ---------------------------------------------------------------------
 AC_SUBST(with_zlib)
@@ -302,7 +270,10 @@
 AM_CONDITIONAL(ICUSWORD, test x$with_icu = xsword)
 AM_CONDITIONAL(ZLIB, test x$with_zlib = xyes)
 AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes)
-AM_CONDITIONAL(INSTALLMGR, test x$with_curl = xyes)
+#AM_CONDITIONAL(INSTALLMGR, test x$with_curl = xyes)
+AM_CONDITIONAL(INTERNALFTPLIB, test x$with_installmgr = xinternal)
+AM_CONDITIONAL(WITHCURL, test x$with_installmgr = xcurl)
+AM_CONDITIONAL(WITHFTPLIB, test x$with_installmgr = xftplib)
 AM_CONDITIONAL(CONFDEF, test x$dir_confdef = xyes)
 AM_CONDITIONAL(USE_PKGCONF, test x$use_pkgconfig = xyes)
 #AM_CONDITIONAL(DEBUG, test x$with_debug = xyes)