remove xmlrpc

iraf-community · Apr 29, 2017 · dc0e546 · dc0e546
1 parent 9c6e56a
commit dc0e546
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
@@ -1256,6 +1256,9 @@ passflag:		    mkobject = YES;
 		arglist[nargs++] = mkfname (IRAFLIB6);
 	    }
 	}
+#ifdef HOST_XMLRPC
+	arglist[nargs++] = "-lxmlrpc";
+#endif
 #ifdef HOST_CURL
 	arglist[nargs++] = "-lcurl";
 #endif

diff --git a/unix/hlib/irafuser.csh b/unix/hlib/irafuser.csh
@@ -120,7 +120,7 @@ case ipad:
     breaksw
 
 case linux64:
-    setenv HSI_CF "-g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT"
+    setenv HSI_CF "-g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_XMLRPC"
     setenv HSI_XF "-g -Inolibc -w -/m64 -/Wunused"
     setenv HSI_FF "-g -m64 -DBLD_KERNEL"
     setenv HSI_LF "-m64 "
@@ -132,7 +132,7 @@ case linux64:
 
 case linux:
 case redhat:
-    setenv HSI_CF "-g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused"
+    setenv HSI_CF "-g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_XMLRPC"
     setenv HSI_XF "-Inolibc -w -/Wunused -/m32"
     setenv HSI_FF "-O -DBLD_KERNEL -m32"
     setenv HSI_LF "-m32"

diff --git a/vendor/voclient/Makefile b/vendor/voclient/Makefile
@@ -55,8 +55,6 @@ mylib:
 	(cd libsamp     ; ${MAKE} .BASE lib ; cp *.h ../include ; cp *.a ../lib )
 	(cd libvoclient ; ${MAKE} install )
 	cp libsamp/cfitsio/*.h include
-	cp libsamp/libxrpc/*.h include
-	cp -r libsamp/libxrpc/include/xmlrpc-c include
 	(cd libvotable  ; ${MAKE} install)
 	(cd voapps      ; ${MAKE} lib ; cp *.a ../lib )
 	(rm -f *.o ; cd libvo       ; ${MAKE} HOST_CURL=1 lib)

diff --git a/vendor/voclient/libsamp/Makefile b/vendor/voclient/libsamp/Makefile
@@ -78,8 +78,11 @@ objs:	$(OBJS) $(INCS)
 clean:
 	/bin/rm -f *.o *.a *.e *.so .BASE $(APPS) __*
 	(cd examples ; make clean)
+ifndef HOST_XMLRPC
 	(cd libxrpc  ; make clean)
 	/bin/rm -rf libxrpc/lib/build/* libxrpc/lib/*.dylib
+endif
+	(cd cfitsio  ; make clean)
 	/bin/rm -f SWIG* libvot* php_libvot.h
 	/bin/rm -f sampJava.[co]
 	/bin/rm -f sampPerl.[co]
@@ -107,7 +110,10 @@ zztest: zztest.o $(OBJS) lib
 ####################################
 
 .BASE:
+ifndef HOST_XMLRPC
 	(cd libxrpc ; ./mklibs ; make install)
+endif
+	#(cd cfitsio ; ./mklibs )
 	touch .BASE
 
 lib: objs $(INCS)