Explorar o código

Remove configure checks for XDR
Remove remaining references to XDRLIB


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53257 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements %!s(int64=12) %!d(string=hai) anos
pai
achega
ddd734afc0

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 572 - 776
configure


+ 0 - 11
configure.in

@@ -518,17 +518,6 @@ DBMIEXTRALIB="$LIBS"
 LIBS="$ac_save_libs"
 AC_SUBST(DBMIEXTRALIB)
 
-# Note: -lxdr -liberty -lws2_32 is for MinGW
-
-AC_CHECK_FUNC(xdrmem_create, XDRLIB=, [
-AC_CHECK_LIB(sun, xdrmem_create, XDRLIB=-lsun, [
-AC_CHECK_LIB(nsl, xdrmem_create, XDRLIB=-lnsl, [
-AC_CHECK_LIB(rpclib, xdrmem_create, XDRLIB=-lrpclib, [
-AC_CHECK_LIB(xdr, xdrmem_create, XDRLIB="-lxdr -liberty -lws2_32" , 
-   [ AC_MSG_ERROR([*** Unable to locate XDR functions.]) ], -liberty -lws2_32 )
-])])])])
-AC_SUBST(XDRLIB)
-
 AC_CHECK_FUNCS(asprintf)
 AC_SUBST(HAVE_ASPRINTF)
 

+ 1 - 1
include/Make/Compile.make

@@ -15,7 +15,7 @@ endif
 endif
 
 linker_base = $(PRELINK) && $(1) $(2) -o $@ $(filter %.o,$^) $(filter %.res,$^) $(3)
-linker_x = $(call linker_base,$(1),$(LDFLAGS) $(EXTRA_LDFLAGS),$(FMODE_OBJ) $(MANIFEST_OBJ) $(LIBES) $(EXTRA_LIBS) $(MATHLIB) $(XDRLIB))
+linker_x = $(call linker_base,$(1),$(LDFLAGS) $(EXTRA_LDFLAGS),$(FMODE_OBJ) $(MANIFEST_OBJ) $(LIBES) $(EXTRA_LIBS) $(MATHLIB))
 linker_c = $(call linker_x,$(CC))
 linker_cxx = $(call linker_x,$(CXX))
 linker = $(call linker_x,$(LINK))

+ 0 - 1
include/Make/Platform.make.in

@@ -89,7 +89,6 @@ XEXTRALIBS          = @X_EXTRA_LIBS@
 USE_X11             = @USE_X11@
 
 MATHLIB             = @MATHLIB@ 
-XDRLIB              = @XDRLIB@
 ICONVLIB            = @ICONVLIB@
 INTLLIB             = @INTLLIB@
 SOCKLIB             = @SOCKLIB@

+ 1 - 1
lib/form/Makefile

@@ -26,7 +26,7 @@ LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
 endif
 
 LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(TCLTKLIBPATH) $(TCLTKLIBS) \
-	$(MATHLIB) $(XDRLIB)
+	$(MATHLIB)
 
 default: lib $(GTCLTKFORM)
 

+ 1 - 1
raster/r.le/r.le.setup/polytocell/Makefile

@@ -17,7 +17,7 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 default: $(ETC)/bmif_to_cell $(ETC)/poly_to_bmif
 
 $(ETC)/bmif_to_cell: $(OBJDIR)/bmf_to_cll.o $(DEPENDENCIES)
-	$(CC) $(LDFLAGS) -o $@ $< $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
+	$(CC) $(LDFLAGS) -o $@ $< $(FMODE_OBJ) $(LIBES) $(MATHLIB)
 
 $(ETC)/poly_to_bmif: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ)