--- vcl/unx/source/app/makefile.mk	15 Aug 2003 11:25:34 -0000	1.9.250.1
+++ vcl/unx/source/app/makefile.mk	6 Dec 2003 19:16:55 -0000
@@ -116,6 +116,11 @@
 CDEFS+=-DHAVE_LIBSN
 CFLAGS+=$(LIBSN_CFLAGS)
 .ENDIF
 
+.IF "$(SYSTEM_NAS)"=="YES"
+CDEFS+=-DSYSTEM_NAS
+CFLAGS+=-I$(NAS_INCLUDES)
+.ENDIF
+
 .IF "$(OS)$(CPU)" == "SOLARISS"
 .IF "$(COM)"!="GCC"
--- nas/makefile.mk.orig	2004-08-27 14:15:47 +0400
+++ nas/makefile.mk	2004-10-13 23:43:10 +0400
@@ -71,13 +71,14 @@
 
 # --- Files --------------------------------------------------------
 
-.IF "$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
+.IF "$(GUI)"!="UNX" || "$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
 
 dummy:
 	@echo "Nothing to build"
 
-.ELSE	"$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
+.ELSE  "$(OS)" == "MACOSX" || "$(OS)" == "IRIX" || "$(SYSTEM_NAS)" == "YES"
 
+.IF "$(SYSTEM_NAS)"!="YES"
 TARFILE_NAME=nas-1.6
 
 PATCH_FILE_NAME=nas-1.6.patch
@@ -101,11 +102,16 @@
 BUILD_FLAGS=CC="$(CC)" CXX="$(CXX)" 
 .ENDIF
 
+.ENDIF
+
+.IF "$(SYSTEM_NAS)"!="YES"
+
 OUT2LIB= \
 	lib/audio/libaudio.a
 	
 OUT2INC= \
 	include/audio/*.h
+.ENDIF
 
 .ENDIF			# "$(GUI)"=="UNX"