Merge from vendor branch TNF:
[pkgsrc.git] / mbone / sdr / patches / patch-ap
1 $NetBSD: patch-ao,v 1.2 1999/10/28 02:40:24 hubertf Exp $
2
3 --- sdr/solaris/Makefile.solaris.orig   Mon Mar 13 16:11:46 2000
4 +++ sdr/solaris/Makefile.solaris        Mon Mar 13 16:13:20 2000
5 @@ -1,7 +1,8 @@
6  CC          = gcc 
7 -INCLUDES    = -I/usr/openwin/include -I../../tcl-8.0/generic -I../../tk-8.0/generic -I../../common
8 -LIBS        = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a \
9 -             -L/usr/openwin/lib -lX11 -lm -lnsl -ldl -lsocket -lresolv 
10 +INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.0/generic -I${LOCALBASE}/include/tcl8.0/generic -I../../common
11 +LIBS        = -L${LOCALBASE}/lib -ltk80 -ltcl80 ../../common/libcommon.a \
12 +               -lm -L${X11BASE}/lib -lX11 -lz  -lnsl -ldl -lsocket -lresolv \
13 +               -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
14 -CFLAGS      = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris
15 +CFLAGS      = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris -DHAVE_ZLIB
16  
17  all::  sdr