[sword-cvs] sword/lib Makefile.am,1.22,1.23

Tue May 18 12:20:20 MST 2004

Committed by: dglassey

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

Modified Files:
	Makefile.am 
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: Makefile.am
===================================================================
RCS file: /cvs/core/sword/lib/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23

--- Makefile.am	18 May 2004 12:34:43 -0000	1.22
+++ Makefile.am	18 May 2004 19:20:17 -0000	1.23
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = 1.6
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CPPFLAGS += -DUSE_AUTOTOOLS -DUNIX -Dunix
+AM_CPPFLAGS += -DUSE_AUTOTOOLS -DUNIX -Dunix -D__unix__
 
 if ZLIB
 ZLIBDEF = 
@@ -26,7 +26,7 @@
 
 AM_CPPFLAGS += $(ICUDEF)
 
-if INSTALLMGR
+if WITHCURL
 IMGRLIBADD = -lcurl $(CURL_LIBS)
 else
 IMGRLIBADD =

