$NetBSD: patch-aa,v 1.2 2004/07/10 17:20:30 kristerw Exp $

--- Makefile.in.orig	2003-06-18 15:12:06.000000000 +0200
+++ Makefile.in	2004-07-10 19:17:29.000000000 +0200
@@ -137,7 +137,7 @@
 #
 CXX=	@CXX@
 CC=     @CC@
-LD=     @CC@
+LD=     @CXX@
 AR= ar rc
 RANLIB= @RANLIB@
 LEX=    @LEX@
@@ -155,10 +155,10 @@
 	$(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC)
 
 # Link flags and shared libs only
-LDFLAGS=  $(RUNPATHS) -L. -lmap $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIB) \
+MSLDFLAGS=  $(RUNPATHS) -L. -lmap $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIB) \
           $(JPEG_LIB) $(SDE_LIB) $(OGR_LIB) $(GDAL_LIB) \
 	  $(MING_LIB) $(POSTGIS_LIB) $(MYGIS_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) \
-	  $(MPATROL_LIB) $(THREAD_LIB) $(XTRALIBS)
+	  $(MPATROL_LIB) $(THREAD_LIB) $(XTRALIBS) ${LDFLAGS}
 
 # STATIC_LIBS is full filename with path of libs that will be statically linked
 STATIC_LIBS= $(GD_STATIC) $(OGR_STATIC)
@@ -200,55 +200,55 @@
 	$(RANLIB) libmap.a
 
 shp2pdf: libmap.a shp2pdf.o map.h
-	$(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) $(STATIC_LIBS) -o shp2pdf
+	$(LD) $(CFLAGS) shp2pdf.o $(MSLDFLAGS) $(STATIC_LIBS) -o shp2pdf
 
 shp2img: libmap.a  shp2img.o map.h
-	$(LD) $(CFLAGS) shp2img.o $(LDFLAGS) $(STATIC_LIBS) -o shp2img
+	$(LD) $(CFLAGS) shp2img.o $(MSLDFLAGS) $(STATIC_LIBS) -o shp2img
 
 sym2img: libmap.a   sym2img.o map.h
-	$(LD) $(CFLAGS) sym2img.o $(LDFLAGS) $(STATIC_LIBS) -o sym2img
+	$(LD) $(CFLAGS) sym2img.o $(MSLDFLAGS) $(STATIC_LIBS) -o sym2img
 
 legend: libmap.a  legend.o map.h
-	$(LD) $(CFLAGS) legend.o $(LDFLAGS) $(STATIC_LIBS) -o legend
+	$(LD) $(CFLAGS) legend.o $(MSLDFLAGS) $(STATIC_LIBS) -o legend
 
 scalebar: libmap.a  scalebar.o map.h
-	$(LD) $(CFLAGS) scalebar.o $(LDFLAGS) $(STATIC_LIBS) -o scalebar
+	$(LD) $(CFLAGS) scalebar.o $(MSLDFLAGS) $(STATIC_LIBS) -o scalebar
 
 mapserv: mapserv.h libmap.a  mapserv.o cgiutil.o map.h
-	$(LD) $(CFLAGS) mapserv.o cgiutil.o  $(LDFLAGS) $(STATIC_LIBS) -o mapserv
+	$(LD) $(CFLAGS) mapserv.o cgiutil.o  $(MSLDFLAGS) $(STATIC_LIBS) -o mapserv
 
 mapserv.fcgi: mapserv.h libmap.a  mapserv_fcgi.o cgiutil.o map.h
 	$(LD) $(CFLAGS) mapserv_fcgi.o cgiutil.o  \
-	$(LDFLAGS) $(STATIC_LIBS) -lfcgi \
+	$(MSLDFLAGS) $(STATIC_LIBS) -lfcgi \
 	 -o mapserv.fcgi
 
 shpindex: libmap.a shpindex.o map.h
-	$(LD) $(CFLAGS) shpindex.o $(LDFLAGS) $(STATIC_LIBS) -o shpindex
+	$(LD) $(CFLAGS) shpindex.o $(MSLDFLAGS) $(STATIC_LIBS) -o shpindex
 
 shptree: libmap.a shptree.o map.h
-	$(LD) $(CFLAGS) shptree.o $(LDFLAGS) $(STATIC_LIBS) -o shptree
+	$(LD) $(CFLAGS) shptree.o $(MSLDFLAGS) $(STATIC_LIBS) -o shptree
 
 shptreevis: libmap.a shptreevis.o map.h
-	$(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) $(STATIC_LIBS) -o shptreevis
+	$(LD) $(CFLAGS) shptreevis.o $(MSLDFLAGS) $(STATIC_LIBS) -o shptreevis
 
 shptreetst: libmap.a shptreetst.o map.h
-	$(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) $(STATIC_LIBS) -o shptreetst
+	$(LD) $(CFLAGS) shptreetst.o $(MSLDFLAGS) $(STATIC_LIBS) -o shptreetst
 
 sortshp: sortshp.o
-	$(LD) $(CFLAGS) sortshp.o $(LDFLAGS) $(STATIC_LIBS) -o sortshp
+	$(LD) $(CFLAGS) sortshp.o $(MSLDFLAGS) $(STATIC_LIBS) -o sortshp
 
 tile4ms: tile4ms.o
-	$(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) $(STATIC_LIBS) -o tile4ms
+	$(LD) $(CFLAGS) tile4ms.o $(MSLDFLAGS) $(STATIC_LIBS) -o tile4ms
 
 testexpr: testexpr.o mapparser.o maplexer.o
-	$(LD) $(CFLAGS) testexpr.o $(LDFLAGS) $(STATIC_LIBS) -o testexpr
+	$(LD) $(CFLAGS) testexpr.o $(MSLDFLAGS) $(STATIC_LIBS) -o testexpr
 
 mapscriptvars:
 	touch mapscriptvars
 	pwd > mapscriptvars
 	echo $(IGNORE_MISSING_DATA) $(STRINGS) $(EPPL) $(PROJ) $(TTF) $(TIFF) $(JPEG) $(GD) $(SDE) $(OGR) $(GDAL) >> mapscriptvars
 	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) >> mapscriptvars
-	echo $(LDFLAGS) >> mapscriptvars
+	echo $(MSLDFLAGS) >> mapscriptvars
 	echo $(STATIC_LIBS) >> mapscriptvars
 
 php3_mapscript_clean::