naviserver-commits — Commit notices

[naviserver-commits] naviserver/include Makefile.module.in,1.5,1.6

[Stephen D. <sd...@us...>]

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

Modified Files:
	Makefile.module.in 
Log Message:
Add new MODNAME and TCL Makefile variables which modules can use to
specify a list of shared tcl files to install.


Index: Makefile.module.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.module.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.module.in	27 Apr 2005 05:30:41 -0000	1.5
--- Makefile.module.in	14 May 2005 10:22:31 -0000	1.6
***************
*** 37,42 ****
  #
  #     NAVISERVER  naviserver install directory.
! #     MOD         Name of module
  #     MODOBJS     List of module object files (required with MOD)
  #     LIB         Root name of dynamic library (without lib prefix or extension)
  #     LIBOBJS     List of library object files (required with LIB)
--- 37,44 ----
  #
  #     NAVISERVER  naviserver install directory.
! #     MODNAME     Unique name of module
! #     MOD         File name of binary loadable module
  #     MODOBJS     List of module object files (required with MOD)
+ #     TCL         List of module shared Tcl files
  #     LIB         Root name of dynamic library (without lib prefix or extension)
  #     LIBOBJS     List of library object files (required with LIB)
***************
*** 79,82 ****
--- 81,91 ----
  endif
  
+ ifdef TCL
+     ifndef MODNAME
+         $(error MODNAME not specified)
+     endif
+     INSTALL += install-tcl
+ endif
+ 
  ifdef LIB
      LIBFILE	 = lib$(LIB)$(LIBEXT)
***************
*** 140,143 ****
--- 149,158 ----
  	$(INSTALL_SH) $(MOD) $(INSTBIN)/
  
+ install-tcl: $(TCL)
+ 	$(MKDIR) $(INSTTCL)/$(MODNAME)
+ 	for t in $(TCL); do \
+ 		$(INSTALL_DATA) $$t $(INSTTCL)/$(MODNAME)/; \
+ 	done
+ 
  install-lib: $(LIBFILE)
  	$(INSTALL_SH) $(LIBFILE) $(INSTLIB)/

[naviserver-commits] naviserver ChangeLog,1.69,1.70

[Stephen D. <sd...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Add new MODNAME and TCL Makefile variables which modules can use to
specify a list of shared tcl files to install.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** ChangeLog	14 May 2005 05:39:29 -0000	1.69
--- ChangeLog	14 May 2005 10:22:31 -0000	1.70
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-05-14  Stephen Deasey  <sd...@us...>
+ 
+ 	* include/Makefile.module.in: Add new MODNAME and TCL Makefile
+ 	variables which modules can use to specify a list of shared tcl
+ 	files to install.
+ 
  2005-05-13  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver ChangeLog,1.68,1.69

[Stephen D. <sd...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Module's shared tcl directory was incorrectly set to private directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** ChangeLog	11 May 2005 05:55:03 -0000	1.68
--- ChangeLog	14 May 2005 05:39:29 -0000	1.69
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-05-13  Stephen Deasey  <sd...@us...>
+ 
+ 	* nsd/init.tcl (_ns_sourcemodule): Module's shared tcl directory
+ 	was incorrectly set to private directory.
+ 
  2005-05-11  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/nsd init.tcl,1.1.1.1,1.2

[Stephen D. <sd...@us...>]

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

Modified Files:
	init.tcl 
Log Message:
Module's shared tcl directory was incorrectly set to private directory.


Index: init.tcl
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/init.tcl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** init.tcl	16 Feb 2005 08:40:27 -0000	1.1.1.1
--- init.tcl	14 May 2005 05:39:29 -0000	1.2
***************
*** 360,364 ****
      ns_module name    $module
      ns_module private $private
!     ns_module shared  $private
      _ns_sourcefiles $shared $private
      ns_module clear
--- 360,364 ----
      ns_module name    $module
      ns_module private $private
!     ns_module shared  $shared
      _ns_sourcefiles $shared $private
      ns_module clear

[naviserver-commits] naviserver ChangeLog,1.67,1.68

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** ChangeLog	4 May 2005 12:46:21 -0000	1.67
--- ChangeLog	11 May 2005 05:55:03 -0000	1.68
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-05-11  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/urlencode.c: added URLDECODE_RELAXED (undefined per default)
+ 	to be able to adjust url decoding to replace '+' to ' ', thus being
+ 	more forgiving to urls encoded with (broken) AOLserver urlencoder.
+ 
  2005-05-04  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/nsd urlencode.c,1.2,1.3

[Zoran V. <vas...@us...>]

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

Modified Files:
	urlencode.c 
Log Message:
Added (undefined per default) URLDECODE_RELAXED so we can decode '+' to ' '
in order to process urls encoded with (broken) AOLserver urlencoder.


Index: urlencode.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/urlencode.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** urlencode.c	28 Feb 2005 05:04:17 -0000	1.2
--- urlencode.c	11 May 2005 05:54:42 -0000	1.3
***************
*** 656,660 ****
--- 656,664 ----
              *q++ = (unsigned char) ((i << 4) + j);
              p += 3;
+ #ifndef URLDECODE_RELAXED 
          } else if (UCHAR(p[0]) == '+' && part == 'q') {
+ #else
+         } else if (UCHAR(p[0]) == '+') {
+ #endif
              *q++ = ' ';
              ++p;

[naviserver-commits] naviserver ChangeLog,1.66,1.67

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** ChangeLog	4 May 2005 12:37:58 -0000	1.66
--- ChangeLog	4 May 2005 12:46:21 -0000	1.67
***************
*** 5,8 ****
--- 5,11 ----
  	poll() wrapper to be easily readable.
  
+ 	* nsd/tclmisc.c: conditionally define u_int32_t and u_int8_t
+ 	on Darwin since it has the definition already. 
+ 
  2005-04-30  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/nsd tclmisc.c,1.4,1.5

[Zoran V. <vas...@us...>]

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

Modified Files:
	tclmisc.c 
Log Message:
Conditionally define u_int32_t and u_int8_t for Darwin builds. Some earlier
versions (6.x) have those already defined.


Index: tclmisc.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tclmisc.c	27 Apr 2005 20:54:28 -0000	1.4
--- tclmisc.c	4 May 2005 12:43:43 -0000	1.5
***************
*** 663,668 ****
--- 663,670 ----
  static char hexChars[] = "0123456789ABCDEF";
  
+ #ifndef __APPLE__
  typedef unsigned int u_int32_t;
  typedef unsigned char u_int8_t;
+ #endif
  
  /*** FROM sha.h: ***/

[naviserver-commits] naviserver ChangeLog,1.65,1.66

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** ChangeLog	30 Apr 2005 09:22:41 -0000	1.65
--- ChangeLog	4 May 2005 12:37:58 -0000	1.66
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-05-04  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/unix.c: modified poll() wrapper to work on Darwin 6.x 
+ 	in addition to 7.x and 8.x versions. Also, heavily reformatted
+ 	poll() wrapper to be easily readable.
+ 
  2005-04-30  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/nsd unix.c,1.4,1.5

[Zoran V. <vas...@us...>]

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

Modified Files:
	unix.c 
Log Message:
Modified pool() compatibility wrapper to work on Darwin 10.2 and less.
Also, heavily reformatted to be easily readable.


Index: unix.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/unix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** unix.c	8 Apr 2005 19:59:17 -0000	1.4
--- unix.c	4 May 2005 12:34:58 -0000	1.5
***************
*** 482,487 ****
  
  #ifndef HAVE_POLL
- 
  /*
   *  Copyright 1994 University of Washington
   *
--- 482,487 ----
  
  #ifndef HAVE_POLL
  /*
+  * -----------------------------------------------------------------
   *  Copyright 1994 University of Washington
   *
***************
*** 491,546 ****
   *  that this software is suitable for any purpose and will not
   *  be held liable for any damage it may cause.
   */
  
  int
! poll(fds, nfds, timo)
! 	struct pollfd *fds;
! 	unsigned long nfds;
! 	int timo;
  {
      struct timeval timeout, *toptr;
!     fd_set ifds, ofds, efds, *ip, *op, *ep;
!     int i, rc, n;
      FD_ZERO(&ifds);
      FD_ZERO(&ofds);
      FD_ZERO(&efds);
!     for (i = 0, n = -1, op = ip = 0; i < nfds; ++i) {
!         fds[i].revents = 0;
!         if (fds[i].fd < 0)
              continue;
!         if (fds[i].fd > n)
              n = fds[i].fd;
-         if (fds[i].events & (POLLIN|POLLPRI)) {
-             ip = &ifds;
-             FD_SET(fds[i].fd, ip);
          }
!         if (fds[i].events & POLLOUT) {
!             op = &ofds;
!             FD_SET(fds[i].fd, op);
          }
-         FD_SET(fds[i].fd, &efds);
      }
!     if (timo < 0)
!         toptr = 0;
!     else {
          toptr = &timeout;
          timeout.tv_sec = timo / 1000;
          timeout.tv_usec = (timo - timeout.tv_sec * 1000) * 1000;
      }
!     
!     rc = select(++n, ip, op, &efds, toptr);
!     if (rc <= 0)
          return rc;
!     
!     for (i = 0, n = 0; i < nfds; ++i) {
!         if (fds[i].fd < 0) continue;
!         if (fds[i].events & (POLLIN|POLLPRI) && FD_ISSET(i, &ifds))
              fds[i].revents |= POLLIN;
!         if (fds[i].events & POLLOUT && FD_ISSET(i, &ofds))
              fds[i].revents |= POLLOUT;
!         if (FD_ISSET(i, &efds))
!             /* Some error was detected ... should be some way to know. */
!             fds[i].revents |= POLLHUP;
      }
      return rc;
  }
--- 491,553 ----
   *  that this software is suitable for any purpose and will not
   *  be held liable for any damage it may cause.
+  * -----------------------------------------------------------------
+  * 
+  *  Modified to work properly on Darwin 10.2 or less.
+  *  Also, heavily reformatted to be more readable.
   */
  
  int
! poll(struct pollfd *fds, unsigned long int nfds, int timo)
  {
      struct timeval timeout, *toptr;
!     fd_set ifds, ofds, efds;
!     int i, rc, n = -1;
      FD_ZERO(&ifds);
      FD_ZERO(&ofds);
      FD_ZERO(&efds);
!     for (i = 0; i < nfds; ++i) {
!         if (fds[i].fd == -1) {
              continue;
!         }
!         if (fds[i].fd > n) {
              n = fds[i].fd;
          }
!         if ((fds[i].events & POLLIN)) {
!             FD_SET(fds[i].fd, &ifds);
!         }
!         if ((fds[i].events & POLLOUT)) {
!             FD_SET(fds[i].fd, &ofds);
!         }
!         if ((fds[i].events & POLLPRI)) {
!             FD_SET(fds[i].fd, &efds);
          }
      }
!     if (timo < 0) {
!         toptr = NULL;
!     } else {
          toptr = &timeout;
          timeout.tv_sec = timo / 1000;
          timeout.tv_usec = (timo - timeout.tv_sec * 1000) * 1000;
      }
!     rc = select(++n, &ifds, &ofds, &efds, toptr);
!     if (rc <= 0) {
          return rc;
!     }
!     for (i = 0; i < nfds; ++i) {
!         fds[i].revents = 0;
!         if (fds[i].fd == -1) {
!             continue;
!         }
!         if (FD_ISSET(fds[i].fd, &ifds)) {
              fds[i].revents |= POLLIN;
!         }
!         if (FD_ISSET(fds[i].fd, &ofds)) {
              fds[i].revents |= POLLOUT;
!         }
!         if (FD_ISSET(fds[i].fd, &efds)) {
!             fds[i].revents |= POLLPRI;
!         }
      }
+ 
      return rc;
  }

[naviserver-commits] naviserver/nsd nsmain.c,1.9,1.10

[Stephen D. <sd...@us...>]

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

Modified Files:
	nsmain.c 
Log Message:
Don't assign chroot directory as default server name.
Simplify option parsing error messages.


Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nsmain.c	16 Apr 2005 09:20:04 -0000	1.9
--- nsmain.c	30 Apr 2005 09:22:42 -0000	1.10
***************
*** 234,238 ****
                  server = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 234,238 ----
                  server = argv[++optind];
              } else {
!                 UsageError("no parameter for -s option");
              }
              break;
***************
*** 244,248 ****
                  nsconf.config = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 244,248 ----
                  nsconf.config = argv[++optind];
              } else {
!                 UsageError("no parameter for -t option");
              }
              break;
***************
*** 256,260 ****
              	bindargs = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 256,260 ----
              	bindargs = argv[++optind];
              } else {
!                 UsageError("no parameter for -b option");
              }
              break;
***************
*** 263,274 ****
              	bindfile = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
          case 'r':
              if (optind + 1 < argc) {
!             	root = server = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][optind]);
              }
              break;
--- 263,274 ----
              	bindfile = argv[++optind];
              } else {
!                 UsageError("no parameter for -B option");
              }
              break;
          case 'r':
              if (optind + 1 < argc) {
!             	root = argv[++optind];
              } else {
!                 UsageError("no parameter for -r option");
              }
              break;
***************
*** 280,284 ****
                  garg = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 280,284 ----
                  garg = argv[++optind];
              } else {
!                 UsageError("no parameter for -g option");
              }
              break;
***************
*** 287,291 ****
                  uarg = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 287,291 ----
                  uarg = argv[++optind];
              } else {
!                 UsageError("no parameter for -u option");
              }
              break;

[naviserver-commits] naviserver ChangeLog,1.64,1.65

[Stephen D. <sd...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Don't assign chroot directory as default server name.
Simplify option parsing error messages.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** ChangeLog	30 Apr 2005 09:15:46 -0000	1.64
--- ChangeLog	30 Apr 2005 09:22:41 -0000	1.65
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-04-30  Stephen Deasey  <sd...@us...>
+ 
+ 	* nsd/nsmain.c: Don't assign chroot directory as default server
+ 	name.  Simplify option parsing error messages.
+ 
  2005-04-27  Vlad Seryakov  <ser...@us...>
  

[naviserver-commits] naviserver ChangeLog,1.63,1.64

[Stephen D. <sd...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Move nsdb public header file into module directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** ChangeLog	27 Apr 2005 20:54:27 -0000	1.63
--- ChangeLog	30 Apr 2005 09:15:46 -0000	1.64
***************
*** 6,9 ****
--- 6,13 ----
  2005-04-26  Stephen Deasey  <sd...@us...>
  
+ 	* include/nsdb.h:
+ 	* nsdb/nsdb.h:
+ 	* nsdb/Makefile: Move nsdb public header file into module directory.
+ 
  	* include/nsextmsg.h:
  	* include/nspd.h: Move stray headers into external modules.

[naviserver-commits] naviserver/nsd tclmisc.c,1.3,1.4

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

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

Modified Files:
	tclmisc.c 
Log Message:
updated ns_uudecode to return possibly binary decoded data in the Tcl_Obj 
result instead of string result


Index: tclmisc.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tclmisc.c	2 Apr 2005 20:29:46 -0000	1.3
--- tclmisc.c	27 Apr 2005 20:54:28 -0000	1.4
***************
*** 393,409 ****
  NsTclHTUUDecodeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
!     int   n;
      char *string, *decoded;
! 
      if (objc != 2) {
          Tcl_WrongNumArgs(interp, 1, objv, "string");
          return TCL_ERROR;
      }
!     string = Tcl_GetStringFromObj(objv[1], &n);
!     n += 3;
!     decoded = ns_malloc((size_t)n);
!     n = Ns_HtuuDecode(string, (unsigned char *) decoded, n);
!     decoded[n] = '\0';
!     Tcl_SetResult(interp, decoded, (Tcl_FreeProc *) ns_free);
      return TCL_OK;
  }
--- 393,410 ----
  NsTclHTUUDecodeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
!     int   size;
      char *string, *decoded;
!  
      if (objc != 2) {
          Tcl_WrongNumArgs(interp, 1, objv, "string");
          return TCL_ERROR;
      }
!     string = Tcl_GetStringFromObj(objv[1], &size);
!     size += 3;
!     decoded = ns_malloc((size_t)size);
!     size = Ns_HtuuDecode(string, (unsigned char *) decoded, size);
!     decoded[size] = '\0';
!     Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(decoded,size));
!     ns_free(decoded);
      return TCL_OK;
  }

[naviserver-commits] naviserver ChangeLog,1.62,1.63

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

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

Modified Files:
	ChangeLog 
Log Message:
updated ns_uudecode to return possibly binary decoded data in the Tcl_Obj 
result instead of string result


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** ChangeLog	27 Apr 2005 05:55:25 -0000	1.62
--- ChangeLog	27 Apr 2005 20:54:27 -0000	1.63
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-04-27  Vlad Seryakov  <ser...@us...>
+ 
+ 	nsd/tclmisc.c: updated ns_uudecode to return possibly binary decoded data
+ 	in the Tcl_Obj result instead of string result
+ 
  2005-04-26  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/nsdb nsdb.h,NONE,1.1 Makefile,1.1.1.1,1.2

[Stephen D. <sd...@us...>]

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

Modified Files:
	Makefile 
Added Files:
	nsdb.h 
Log Message:
Move nsdb public header file into module directory.


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsdb/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	16 Feb 2005 08:40:46 -0000	1.1.1.1
--- Makefile	27 Apr 2005 06:18:34 -0000	1.2
***************
*** 1,7 ****
  #
! # The contents of this file are subject to the AOLserver Public License
  # Version 1.1 (the "License"); you may not use this file except in
  # compliance with the License. You may obtain a copy of the License at
! # http://aolserver.com/.
  #
  # Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
  #
! # The contents of this file are subject to the Mozilla Public License
  # Version 1.1 (the "License"); you may not use this file except in
  # compliance with the License. You may obtain a copy of the License at
! # http://mozilla.org/.
  #
  # Software distributed under the License is distributed on an "AS IS"
***************
*** 32,35 ****
--- 32,36 ----
  LIB	= nsdb
  LIBOBJS	= dbinit.o dbdrv.o dbtcl.o dbutil.o
+ LIBHDRS = nsdb.h
  MOD	= nsdb.so
  OBJS	= nsdb.o

--- NEW FILE: nsdb.h ---
/*
 * The contents of this file are subject to the Mozilla Public License
 * Version 1.1 (the "License"); you may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
 * http://www.mozilla.org/.
 *
 * Software distributed under the License is distributed on an "AS IS"
 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 * the License for the specific language governing rights and limitations
 * under the License.
 *
 * The Original Code is AOLserver Code and related documentation
 * distributed by AOL.
 * 
 * The Initial Developer of the Original Code is America Online,
 * Inc. Portions created by AOL are Copyright (C) 1999 America Online,
 * Inc. All Rights Reserved.
 *
 * Alternatively, the contents of this file may be used under the terms
 * of the GNU General Public License (the "GPL"), in which case the
 * provisions of GPL are applicable instead of those above.  If you wish
 * to allow use of your version of this file only under the terms of the
 * GPL and not to allow others to use your version of this file under the
 * License, indicate your decision by deleting the provisions above and
 * replace them with the notice and other provisions required by the GPL.
 * If you do not delete the provisions above, a recipient may use your
 * version of this file under either the License or the GPL.
 */

/*
 * nsdb.h --
 *
 *      Public types and function declarations for the nsdb module.
 *
 *	$Header: /cvsroot/naviserver/naviserver/nsdb/nsdb.h,v 1.1 2005/04/27 06:18:34 sdeasey Exp $
 */

#ifndef NSDB_H
#define NSDB_H

#include "ns.h"

/*
 * The following are nsdb return codes.
 */

#define NS_DML  		  1
#define NS_ROWS 		  2
#define NS_END_DATA 		  4
#define NS_NO_DATA 		  8

/* 
 * The following enum defines known nsdb driver function ids.
 */

typedef enum {
    DbFn_Name,
    DbFn_DbType,
    DbFn_ServerInit,
    DbFn_OpenDb,
    DbFn_CloseDb,
    DbFn_DML,
    DbFn_Select,
    DbFn_GetRow,
    DbFn_Flush,
    DbFn_Cancel,
    DbFn_GetTableInfo,
    DbFn_TableList,
    DbFn_BestRowId,
    DbFn_Exec,
    DbFn_BindRow,
    DbFn_ResetHandle,
    DbFn_SpStart,
    DbFn_SpSetParam,
    DbFn_SpExec,
    DbFn_SpReturnCode,
    DbFn_SpGetParams,
    DbFn_End
} Ns_DbProcId;

/*
 * Database procedure structure used when registering
 * a driver. 
 */

typedef struct Ns_DbProc {
    Ns_DbProcId id;
    void       *func;
} Ns_DbProc;

/*
 * Database handle structure.
 */

typedef struct Ns_DbHandle {
    char       *driver;
    char       *datasource;
    char       *user;
    char       *password;
    void       *connection;
    char       *poolname;
    int         connected;
    int         verbose;
    Ns_Set     *row;
    char        cExceptionCode[6];
    Ns_DString  dsExceptionMsg;
    void       *context;
    void       *statement;
    int         fetchingRows;
} Ns_DbHandle;

/*
 * The following structure is no longer supported and only provided to
 * allow existing database modules to compile.  All of the TableInfo
 * routines now log an unsupported use error and return an error result.
 */

typedef struct {
    Ns_Set  *table;
    int      size;
    int      ncolumns;
    Ns_Set **columns;
} Ns_DbTableInfo;

/*
 * dbdrv.c:
 */

NS_EXTERN int Ns_DbRegisterDriver(char *driver, Ns_DbProc *procs);
NS_EXTERN char *Ns_DbDriverName(Ns_DbHandle *handle);
NS_EXTERN char *Ns_DbDriverDbType(Ns_DbHandle *handle);
NS_EXTERN int Ns_DbDML(Ns_DbHandle *handle, char *sql);
NS_EXTERN Ns_Set *Ns_DbSelect(Ns_DbHandle *handle, char *sql);
NS_EXTERN int Ns_DbExec(Ns_DbHandle *handle, char *sql);
NS_EXTERN Ns_Set *Ns_DbBindRow(Ns_DbHandle *handle);
NS_EXTERN int Ns_DbGetRow(Ns_DbHandle *handle, Ns_Set *row);
NS_EXTERN int Ns_DbFlush(Ns_DbHandle *handle);
NS_EXTERN int Ns_DbCancel(Ns_DbHandle *handle);
NS_EXTERN int Ns_DbResetHandle(Ns_DbHandle *handle);
NS_EXTERN int Ns_DbSpStart(Ns_DbHandle *handle, char *procname);
NS_EXTERN int Ns_DbSpSetParam(Ns_DbHandle *handle, char *paramname,
			   char *paramtype, char *inout, char *value);
NS_EXTERN int Ns_DbSpExec(Ns_DbHandle *handle);
NS_EXTERN int Ns_DbSpReturnCode(Ns_DbHandle *handle, char *returnCode,
			     int bufsize);
NS_EXTERN Ns_Set *Ns_DbSpGetParams(Ns_DbHandle *handle);

/*
 * dbinit.c:
 */

NS_EXTERN char *Ns_DbPoolDescription(char *pool);
NS_EXTERN char *Ns_DbPoolDefault(char *server);
NS_EXTERN char *Ns_DbPoolList(char *server);
NS_EXTERN int Ns_DbPoolAllowable(char *server, char *pool);
NS_EXTERN void Ns_DbPoolPutHandle(Ns_DbHandle *handle);
NS_EXTERN Ns_DbHandle *Ns_DbPoolTimedGetHandle(char *pool, int wait);
NS_EXTERN Ns_DbHandle *Ns_DbPoolGetHandle(char *pool);
NS_EXTERN int Ns_DbPoolGetMultipleHandles(Ns_DbHandle **handles, char *pool,
				       int nwant);
NS_EXTERN int Ns_DbPoolTimedGetMultipleHandles(Ns_DbHandle **handles, char *pool,
					    int nwant, int wait);
NS_EXTERN int Ns_DbBouncePool(char *pool);

/*
 * dbtcl.c:
 */

NS_EXTERN int Ns_TclDbGetHandle(Tcl_Interp *interp, char *handleId,
			     Ns_DbHandle **handle);

/*
 * dbutil.c:
 */
    
NS_EXTERN void Ns_DbQuoteValue(Ns_DString *pds, char *string);
NS_EXTERN Ns_Set *Ns_Db0or1Row(Ns_DbHandle *handle, char *sql, int *nrows);
NS_EXTERN Ns_Set *Ns_Db1Row(Ns_DbHandle *handle, char *sql);
NS_EXTERN int Ns_DbInterpretSqlFile(Ns_DbHandle *handle, char *filename);
NS_EXTERN void Ns_DbSetException(Ns_DbHandle *handle, char *code, char *msg);

#endif /* NSDB_H */

[naviserver-commits] naviserver/include nsdb.h,1.2,NONE

[Stephen D. <sd...@us...>]

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

Removed Files:
	nsdb.h 
Log Message:
Move nsdb public header file into module directory.


--- nsdb.h DELETED ---

[naviserver-commits] modules/nsext ChangeLog,NONE,1.1

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/modules/nsext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14553

Added Files:
	ChangeLog 
Log Message:
Create ChangeLog File.


--- NEW FILE: ChangeLog ---
2005-04-26  Stephen Deasey  <sd...@us...>

	* ChangeLog: Create ChangeLog file.

	* Makefile, nsextmsg.h: Move missing public header into module.

2005-03-12  Vlad Seryakov  <ser...@us...>

	* Makefile, msg.c, nsext.c: Initial import

2005-03-12 Vlad Seryakov  <ser...@us...>

	* Makefile, msg.c, nsext.c: Initial revision

[naviserver-commits] modules/nspd ChangeLog,NONE,1.1

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/modules/nspd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13871

Added Files:
	ChangeLog 
Log Message:
Create ChangeLog file.


--- NEW FILE: ChangeLog ---
2005-04-27  Stephen Deasey  <sd...@us...>

	* ChangeLog: Create ChangeLog file.

	* Makefile, nspd.h: Move missing public header into module.

2005-03-12  Vlad Seryakov  <ser...@us...>

	* Makefile, listen.c, log.c, main.c, pd.h: Initial import

2005-03-12  Vlad Seryakov  <ser...@us...>

	* Makefile, listen.c, log.c, main.c, pd.h: Initial revision

[naviserver-commits] modules/nspd nspd.h,NONE,1.1 Makefile,1.1.1.1,1.2

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/modules/nspd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11958

Modified Files:
	Makefile 
Added Files:
	nspd.h 
Log Message:
Move missing public header into module.


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/modules/nspd/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	13 Mar 2005 02:12:03 -0000	1.1.1.1
--- Makefile	27 Apr 2005 06:01:31 -0000	1.2
***************
*** 1,7 ****
  #
! # The contents of this file are subject to the AOLserver Public License
  # Version 1.1 (the "License"); you may not use this file except in
  # compliance with the License. You may obtain a copy of the License at
! # http://aolserver.com/.
  #
  # Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
  #
! # The contents of this file are subject to the Mozilla Public License
  # Version 1.1 (the "License"); you may not use this file except in
  # compliance with the License. You may obtain a copy of the License at
! # http://mozilla.org/.
  #
  # Software distributed under the License is distributed on an "AS IS"
***************
*** 31,35 ****
  #
  
! ALIB	=  nspd
! LIBOBJS	=  listen.o log.o main.o 
! include  ../include/Makefile.build
--- 31,38 ----
  #
  
! ALIB    =  nspd
! LIBOBJS =  listen.o log.o main.o 
! LIBHDRS =  nspd.h
! 
! include  $(NAVISERVER)/include/Makefile.module
! 

--- NEW FILE: nspd.h ---
/*
 * The contents of this file are subject to the Mozilla Public License
 * Version 1.1 (the "License"); you may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
 * http://www.mozilla.org/.
 *
 * Software distributed under the License is distributed on an "AS IS"
 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 * the License for the specific language governing rights and limitations
 * under the License.
 *
 * The Original Code is AOLserver Code and related documentation
 * distributed by AOL.
 * 
 * The Initial Developer of the Original Code is America Online,
 * Inc. Portions created by AOL are Copyright (C) 1999 America Online,
 * Inc. All Rights Reserved.
 *
 * Alternatively, the contents of this file may be used under the terms
 * of the GNU General Public License (the "GPL"), in which case the
 * provisions of GPL are applicable instead of those above.  If you wish
 * to allow use of your version of this file only under the terms of the
 * GPL and not to allow others to use your version of this file under the
 * License, indicate your decision by deleting the provisions above and
 * replace them with the notice and other provisions required by the GPL.
 * If you do not delete the provisions above, a recipient may use your
 * version of this file under either the License or the GPL.
 */


#ifndef NSPD_H
#define NSPD_H

#define DB_END_DATA 3
#define DB_ROWS 2
#define DB_DML 1
#define EXCEPTION_CODE_MAX 32
#define EXCEPTION_MSG_MAX  4096
#define END_DATA "-1\n"

#define NS_OK 0
#define NS_ERROR (-1)

typedef enum {
    Error,
    Notice,
    Trace
}               Ns_PdLogMsgType;

typedef struct Ns_PdRowData {
    int             elSize;
    char           *elData;
}               Ns_PdRowData;

typedef struct Ns_PdRowInfo {
    int             numColumns;
    Ns_PdRowData   *rowData;
}               Ns_PdRowInfo;

extern int      Ns_PdMain(int argc, char **argv);
extern Ns_PdRowInfo *Ns_PdNewRowInfo(int ncols);
extern void     Ns_PdFreeRowInfo(Ns_PdRowInfo * rowInfo, int fFreeData);
extern void     Ns_PdSendRowInfo(Ns_PdRowInfo * rowInfo);
extern void     Ns_PdSetRowInfoNumColumns(Ns_PdRowInfo * rowInfo, int numColumns);
extern void     Ns_PdSetRowInfoItem(Ns_PdRowInfo * rowInfo, int index, char *data, int size);
extern int      Ns_PdGetRowInfoNumColumns(Ns_PdRowInfo * rowInfo);
extern int      Ns_PdFindRowInfoValue(Ns_PdRowInfo * rowInfo, char *value, int len);
extern void     Ns_PdGetRowInfoItem(Ns_PdRowInfo * rowInfo, int index, char **data, int *size);
extern void    *Ns_PdDbInit(void);
extern void     Ns_PdDbFlush(void *dbhandle);
extern void     Ns_PdDbCancel(void *dbhandle);
extern void     Ns_PdDbTableList(void *dbhandle, char *includeSystem);
extern void     Ns_PdDbExec(void *dbhandle, char *sql);
extern void     Ns_PdDbBindRow(void *dbhandle);
extern void     Ns_PdDbGetRow(void *dbhandle, char *columnCount);
extern void     Ns_PdDbGetTableInfo(void *dbhandle, char *tableName);
extern void     Ns_PdDbBestRowId(void *dbhandle, char *tableName);
extern void     Ns_PdDbClose(void *dbhandle);
extern void     Ns_PdDbOpen(void *dbhandle, char *datasource);
extern void     Ns_PdDbCleanup(void *dbhandle);
extern void     Ns_PdDbIdentify(void *dbhandle);
extern void     Ns_PdDbGetTypes(void *dbhandle);
extern void     Ns_PdDbResultId(void *dbhandle);
extern void     Ns_PdDbResultRows(void *dbhandle);
extern void     Ns_PdDbSetMaxRows(void *dbhandle, char *maxRows);
extern void     Ns_PdDbResetHandle(void *dbhandle);

extern void     Ns_PdSendString(char *rsp);
extern void     Ns_PdSendData(char *data, int len);
extern void     Ns_PdSendException(char *code, char *msg);
extern int      Ns_PdCloseonexec(int fd);
extern void 
Ns_PdParseOpenArgs(char *openargs, char **datasource, char **user,
    char **password, char **param);
extern int      Ns_PdSqlbufEnough(char **sqlbuf, int *sqlbufsize, int howmuch);
extern void     Ns_PdLog(Ns_PdLogMsgType errtype, char *format,...);
extern char    *Ns_PdStringTrim(char *string);
extern void     Ns_PdDbSpReturnCode(void *handle);
extern void     Ns_PdDbSpStart(void *handle, char *procname);
extern void     Ns_PdDbSpSetParam (void *handle, char *args);
extern void     Ns_PdDbSpExec (void *handle);
extern void     Ns_PdDbSpGetParams(void *handle);

#endif                                  /* NSPD_H */

[naviserver-commits] modules/nsext nsextmsg.h,NONE,1.1 Makefile,1.1.1.1,1.2

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/modules/nsext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10771

Modified Files:
	Makefile 
Added Files:
	nsextmsg.h 
Log Message:
Move missing public header into module.


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/modules/nsext/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	13 Mar 2005 02:12:02 -0000	1.1.1.1
--- Makefile	27 Apr 2005 05:58:42 -0000	1.2
***************
*** 30,38 ****
  # $Header$
  
! LIB	= nsext
! LIBOBJS	= msg.o
! MOD	= nsext.so
! OBJS	= nsext.o
  MODLIBS	= -L../nsdb -lnsdb
! HDRS	= ../include/nsextmsg.h
! include ../include/Makefile.build
--- 30,39 ----
  # $Header$
  
! LIB     = nsext
! LIBOBJS = msg.o
! LIBHDRS = nsextmsg.h
! MOD     = nsext.so
! OBJS    = nsext.o
  MODLIBS	= -L../nsdb -lnsdb
! 
! include $(NAVISERVER)/include/Makefile.module

--- NEW FILE: nsextmsg.h ---
/*
 * The contents of this file are subject to the Mozilla Public License
 * Version 1.1 (the "License"); you may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
 * http://www.mozilla.org/.
 *
 * Software distributed under the License is distributed on an "AS IS"
 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 * the License for the specific language governing rights and limitations
 * under the License.
 *
 * The Original Code is AOLserver Code and related documentation
 * distributed by AOL.
 * 
 * The Initial Developer of the Original Code is America Online,
 * Inc. Portions created by AOL are Copyright (C) 1999 America Online,
 * Inc. All Rights Reserved.
 *
 * Alternatively, the contents of this file may be used under the terms
 * of the GNU General Public License (the "GPL"), in which case the
 * provisions of GPL are applicable instead of those above.  If you wish
 * to allow use of your version of this file only under the terms of the
 * GPL and not to allow others to use your version of this file under the
 * License, indicate your decision by deleting the provisions above and
 * replace them with the notice and other provisions required by the GPL.
 * If you do not delete the provisions above, a recipient may use your
 * version of this file under either the License or the GPL.
 */


#ifndef NSEXTMSG_H
#define NSEXTMSG_H

typedef enum {
    Exec = 0,
    BindRow = 1,
    GetRow = 2,
    Flush = 3,
    Cancel = 4,
    GetTableInfo = 5,
    TableList = 6,
    BestRowId = 7,
    ResultId = 8,
    ResultRows = 9,
    SetMaxRows = 10,
    Close = 11,
    Open = 12,
    Ping = 13,
    Identify = 14,
    TraceOn = 15,
    TraceOff = 16,
    GetTypes = 17,
    OpenF = 18,
    CloseF = 19,
    ReadF = 20,
    WriteF = 21,
    DeleteF = 22,
    CreateTmpF = 23,
    ResetHandle = 24,
    SpStart = 25,
    SpSetParam = 26,
    SpExec = 27,
    SpReturnCode = 28,
    SpGetParams = 29
} Ns_ExtDbCommandCode;

#define OK_STATUS "ok"
#define SILENT_ERROR_STATUS "silentError"
#define NO_BESTROWID "__nobestrowid__"
#define ARG_TOKEN_DELIMITER '#'
#define EXEC_RET_ROWS "exec_rows"
#define EXEC_RET_DML "exec_dml"

extern int      Ns_ExtDbMsgNameToCode(char *msgname);
extern char    *Ns_ExtDbMsgCodeToName(Ns_ExtDbCommandCode code);
extern short    Ns_ExtDbMsgRequiresArg(Ns_ExtDbCommandCode code);

#endif                                  /* NSEXTMSG_H */

[naviserver-commits] naviserver/include nsextmsg.h,1.2,NONE nspd.h,1.2,NONE

[Stephen D. <sd...@us...>]

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

Removed Files:
	nsextmsg.h nspd.h 
Log Message:
Move stray headers into external modules.


--- nspd.h DELETED ---

--- nsextmsg.h DELETED ---

[naviserver-commits] naviserver ChangeLog,1.61,1.62

[Stephen D. <sd...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Move stray headers into external modules.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** ChangeLog	27 Apr 2005 05:32:32 -0000	1.61
--- ChangeLog	27 Apr 2005 05:55:25 -0000	1.62
***************
*** 1,4 ****
--- 1,7 ----
  2005-04-26  Stephen Deasey  <sd...@us...>
  
+ 	* include/nsextmsg.h:
+ 	* include/nspd.h: Move stray headers into external modules.
+ 
  	* include/Makefile.module.in:
  	* include/Makefile.global.in:

[naviserver-commits] naviserver ChangeLog,1.60,1.61

[Stephen D. <sd...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Woops, changed Makefile too.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** ChangeLog	27 Apr 2005 05:01:23 -0000	1.60
--- ChangeLog	27 Apr 2005 05:32:32 -0000	1.61
***************
*** 2,5 ****
--- 2,11 ----
  
  	* include/Makefile.module.in:
+ 	* include/Makefile.global.in:
+ 	* Makefile: Add new module variable LIBHDRS which is the list of
+ 	headers which should be installed for other modules to link
+ 	against (e.g. nsdb.h).
+ 
+ 	* include/Makefile.module.in:
  	* include/Makefile.global.in: Reindent code for consistency prior
  	to making changes.

[naviserver-commits] naviserver Makefile,1.5,1.6

[Stephen D. <sd...@us...>]

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

Modified Files:
	Makefile 
Log Message:
Add new module variable LIBHDRS which is the list of headers which should
be installed for other modules to link against (e.g. nsdb.h).


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/naviserver/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	18 Apr 2005 13:04:14 -0000	1.5
--- Makefile	27 Apr 2005 05:30:40 -0000	1.6
***************
*** 48,52 ****
  	done
  	for i in include/*.h include/Makefile.global include/Makefile.module; do \
! 		$(INSTALL_DATA) $$i $(NAVISERVER)/include/; \
  	done
  	for i in tcl/*.tcl; do \
--- 48,52 ----
  	done
  	for i in include/*.h include/Makefile.global include/Makefile.module; do \
! 		$(INSTALL_DATA) $$i $(INSTHDR)/; \
  	done
  	for i in tcl/*.tcl; do \