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

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

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

Modified Files:
	Makefile.global.in Makefile.module.in 
Log Message:
Include tc.m4 macros and convert to Tcl TEA build system.  Add messages
to all autoconf feature tests.  Remove unneeded feature tests.  Rebuild
configure script using autoconf 2.59.


Index: Makefile.global.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.global.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.global.in	27 Apr 2005 05:30:41 -0000	1.5
--- Makefile.global.in	16 May 2005 06:57:08 -0000	1.6
***************
*** 51,56 ****
  INSTALL_DATA	 = $(INSTALL_SH) -m 644
  
! RANLIB           = @TCL_RANLIB@
! LIBEXT           = @TCL_SHLIB_SUFFIX@
  TCL_EXEC_PREFIX  = @TCL_EXEC_PREFIX@
  LIB_RUNTIME_DIR  =
--- 51,56 ----
  INSTALL_DATA	 = $(INSTALL_SH) -m 644
  
! RANLIB           = @RANLIB@
! LIBEXT           = @SHLIB_SUFFIX@
  TCL_EXEC_PREFIX  = @TCL_EXEC_PREFIX@
  LIB_RUNTIME_DIR  =
***************
*** 61,70 ****
  CCRPATH         += @CCRPATH@
  LDRPATH         += @LDRPATH@
! CC               = $(PURIFY) @TCL_CC@
! CFLAGS_DEBUG     = @TCL_CFLAGS_DEBUG@
! CFLAGS_OPTIMIZE  = @TCL_CFLAGS_OPTIMIZE@
! CFLAGS_WARNING   = @TCL_CFLAGS_WARNING@
! CFLAGS_INCLUDE   = -I$(INCDIR) @TCL_INCLUDE_SPEC@
! CFLAGS_EXTRA     = @TCL_SHLIB_CFLAGS@ @TCL_EXTRA_CFLAGS@
  DEFS             = -DNO_CONST @TCL_DEFS@ @DEFS@
  CFLAGS          += @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS)
--- 61,70 ----
  CCRPATH         += @CCRPATH@
  LDRPATH         += @LDRPATH@
! CC               = $(PURIFY) @CC@
! CFLAGS_DEBUG     = @CFLAGS_DEBUG@
! CFLAGS_OPTIMIZE  = @CFLAGS_OPTIMIZE@
! CFLAGS_WARNING   = @CFLAGS_WARNING@
! CFLAGS_INCLUDE   = -I$(INCDIR) @TCL_INCLUDES@
! CFLAGS_EXTRA     = @SHLIB_CFLAGS@ @TCL_EXTRA_CFLAGS@
  DEFS             = -DNO_CONST @TCL_DEFS@ @DEFS@
  CFLAGS          += @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS)
***************
*** 87,92 ****
  endif
  
! LIBS        += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@
! CCLIBS       = $(LIBS) @TCL_LD_FLAGS@
  
  # Install directories
--- 87,92 ----
  endif
  
! NSLIBS      += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@
! CCLIBS       = $(NSLIBS) @TCL_LD_FLAGS@
  
  # Install directories
***************
*** 106,112 ****
  ifneq (,$(findstring SunOS,$(uname)))
      ifneq (,$(findstring 5.6,$(uname)))
!         LIBS += -lthread -lposix4
      else
!         LIBS += -lrt
      endif
  endif
--- 106,112 ----
  ifneq (,$(findstring SunOS,$(uname)))
      ifneq (,$(findstring 5.6,$(uname)))
!         NSLIBS += -lthread -lposix4
      else
!         NSLIBS += -lrt
      endif
  endif

Index: Makefile.module.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.module.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.module.in	14 May 2005 10:22:31 -0000	1.6
--- Makefile.module.in	16 May 2005 06:57:08 -0000	1.7
***************
*** 130,138 ****
  $(MOD): $(LIBFILE) $(ALIBFILE) $(MODOBJS)
  	$(RM) $(MOD)
! 	$(LDSO) $(LDFLAGS) -o $(MOD) $(MODOBJS) $(MODLIBS) $(LIBS) @LDRPATHS@
  
  $(LIBFILE): $(LIBOBJS)
  	$(RM) $(LIBFILE)
! 	$(LDLIB) $(LDFLAGS) -o $(LIBFILE) $(LIBOBJS) $(LIBLIBS) $(LIBS) @LDRPATHS@
  
  $(ALIBFILE): $(LIBOBJS)
--- 130,138 ----
  $(MOD): $(LIBFILE) $(ALIBFILE) $(MODOBJS)
  	$(RM) $(MOD)
! 	$(LDSO) $(LDFLAGS) -o $(MOD) $(MODOBJS) $(MODLIBS) $(NSLIBS) @LDRPATH@
  
  $(LIBFILE): $(LIBOBJS)
  	$(RM) $(LIBFILE)
! 	$(LDLIB) $(LDFLAGS) -o $(LIBFILE) $(LIBOBJS) $(LIBLIBS) $(NSLIBS) @LDRPATH@
  
  $(ALIBFILE): $(LIBOBJS)
***************
*** 142,146 ****
  $(PGM): $(PGMOBJS) $(LIBFILE) $(ALIBFILE)
  	$(RM) $(PGM)
! 	$(CC) $(LDFLAGS) -o $(PGM) $(PGMOBJS) $(PGMLIBS) $(CCLIBS) @CCRPATHS@
  
  $(MODOBJS) $(LIBOBJS) $(PGMOBJS): $(HDRS) $(INCDIR)/ns.h $(INCDIR)/nsthread.h
--- 142,146 ----
  $(PGM): $(PGMOBJS) $(LIBFILE) $(ALIBFILE)
  	$(RM) $(PGM)
! 	$(CC) $(LDFLAGS) -o $(PGM) $(PGMOBJS) $(PGMLIBS) $(CCLIBS) @CCRPATH@
  
  $(MODOBJS) $(LIBOBJS) $(PGMOBJS): $(HDRS) $(INCDIR)/ns.h $(INCDIR)/nsthread.h