[sword-cvs] sword/src/mgr installmgr.cpp,1.10,1.11

sword@www.crosswire.org sword@www.crosswire.org
Wed, 9 Jul 2003 14:58:24 -0700


Update of /usr/local/cvsroot/sword/src/mgr
In directory www:/tmp/cvs-serv18203/mgr

Modified Files:
	installmgr.cpp 
Log Message:


Index: installmgr.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/mgr/installmgr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- installmgr.cpp	7 Jul 2003 14:16:25 -0000	1.10
+++ installmgr.cpp	9 Jul 2003 21:58:21 -0000	1.11
@@ -5,9 +5,11 @@
  */
  
 
+#ifndef EXCLUDEZLIB
 extern "C" {
 #include <untgz.h>
 }
+#endif
 
 
 #include <installmgr.h>
@@ -601,13 +603,17 @@
 	}
 
 
+
+#ifndef EXCLUDEZLIB
 	SWBuf archive = root + "/mods.d.tar.gz";
 	if (!FTPCopy(is, "mods.d.tar.gz", archive.c_str(), false)) {
 		int fd = open(archive.c_str(), O_RDONLY|O_BINARY);
 		untargz(fd, root.c_str());
 		close(fd);
 	}
-	else	FTPCopy(is, "mods.d", target.c_str(), true, ".conf");
+	else
+#endif
+	FTPCopy(is, "mods.d", target.c_str(), true, ".conf");
 	is->flush();
 }