[naviserver-commits] naviserver/include Makefile.global.in,1.1.1.1,1.2 Makefile.module.in,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13754/include

Modified Files:
	Makefile.global.in Makefile.module.in 
Log Message:
Binder suppport for different protocols added, supported TCP/UDP/ICMP/UNIX
protocols. Added Ns_SockListenUdp,Ns_SockListenRaw,Ns_SockListenUnix functions.
Backported sockopen command from 4.1 tree with -localhost/-localport
options. db select will reuse exception which driver set otherwise will set
standard error about wrong query.


Index: Makefile.global.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.global.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.global.in	16 Feb 2005 08:41:21 -0000	1.1.1.1
--- Makefile.global.in	16 Feb 2005 15:05:46 -0000	1.2
***************
*** 38,42 ****
  #
  
! AOLSERVER	= @AOLSERVER@
  srcdir		= @SRCDIR@
  
--- 38,42 ----
  #
  
! NAVISERVER	= @NAVISERVER@
  srcdir		= @SRCDIR@
  
***************
*** 71,77 ****
  
  ifndef NSBUILD
!     LDFLAGS	+= -L$(AOLSERVER)/lib
      LIBS	+= -lnsthread -lnsd
!     INCDIR	= $(AOLSERVER)/include
  else
      LDFLAGS	+= -L../nsthread -L../nsd
--- 71,77 ----
  
  ifndef NSBUILD
!     LDFLAGS	+= -L$(NAVISERVER)/lib
      LIBS	+= -lnsthread -lnsd
!     INCDIR	= $(NAVISERVER)/include
  else
      LDFLAGS	+= -L../nsthread -L../nsd
***************
*** 91,99 ****
  
  # Install directories
! INSTBIN		= $(AOLSERVER)/bin
! INSTLIB		= $(AOLSERVER)/lib
! INSTMOD		= $(AOLSERVER)/modules
! INSTTCL		= $(AOLSERVER)/modules/tcl
! INSTSRV		= $(AOLSERVER)/servers/server1
  INSTSRVMOD	= $(INSTSRV)/modules
  INSTSRVPAG	= $(INSTSRV)/pages
--- 91,99 ----
  
  # Install directories
! INSTBIN		= $(NAVISERVER)/bin
! INSTLIB		= $(NAVISERVER)/lib
! INSTMOD		= $(NAVISERVER)/modules
! INSTTCL		= $(NAVISERVER)/modules/tcl
! INSTSRV		= $(NAVISERVER)/servers/server1
  INSTSRVMOD	= $(INSTSRV)/modules
  INSTSRVPAG	= $(INSTSRV)/pages
***************
*** 130,134 ****
              LDSO += -bundle_loader $(srcdir)/nsd/nsd
          else
!             LDSO += -bundle_loader $(AOLSERVER)/bin/nsd
          endif
      endif
--- 130,134 ----
              LDSO += -bundle_loader $(srcdir)/nsd/nsd
          else
!             LDSO += -bundle_loader $(NAVISERVER)/bin/nsd
          endif
      endif

Index: Makefile.module.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.module.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.module.in	16 Feb 2005 08:41:20 -0000	1.1.1.1
--- Makefile.module.in	16 Feb 2005 15:05:46 -0000	1.2
***************
*** 36,40 ****
  #	before including this file include:
  #
! #	AOLSERVER	AOLserver install directory.
  #	MOD		Name of module
  #	MODOBJS		List of module object files (required with MOD)
--- 36,40 ----
  #	before including this file include:
  #
! #	NAVISERVER	naviserver install directory.
  #	MOD		Name of module
  #	MODOBJS		List of module object files (required with MOD)
***************
*** 105,109 ****
      include ../include/Makefile.global
  else
!     include $(AOLSERVER)/include/Makefile.global
  endif
  
--- 105,109 ----
      include ../include/Makefile.global
  else
!     include $(NAVISERVER)/include/Makefile.global
  endif