Menu
▾
▴
[naviserver-commits] naviserver tcl.m4,NONE,1.1 ChangeLog,1.77,1.78 aclocal.m4,1.1.1.1,1.2 configure,1.2,1.3 configure.in,1.2,1.3
|
From: Stephen D. <sd...@us...> - 2005-05-17 07:27:34
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv521 Modified Files: ChangeLog aclocal.m4 configure configure.in Added Files: tcl.m4 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: aclocal.m4 =================================================================== RCS file: /cvsroot/naviserver/naviserver/aclocal.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** aclocal.m4 16 Feb 2005 08:38:43 -0000 1.1.1.1 --- aclocal.m4 16 May 2005 06:57:06 -0000 1.2 *************** *** 32,41 **** # ! # configure.in -- # ! # AOLserver autoconf include which simply includes Tcl's tcl.m4. # ! builtin(include,../tcl8.4/unix/tcl.m4) --- 32,41 ---- # ! # aclocal.m4 -- # ! # Autoconf include which includes the bundled TEA tcl.m4. # ! builtin(include,tcl.m4) *************** *** 64,69 **** (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_6) AC_MSG_RESULT(yes) ], [ --- 64,69 ---- (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Define to 1 if gethostbyname_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_6,1,[Define to 1 if gethostbyname_r takes 6 args.]) AC_MSG_RESULT(yes) ], [ *************** *** 81,86 **** (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_5) AC_MSG_RESULT(yes) ], [ --- 81,86 ---- (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Define to 1 if gethostbyname_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_5,1,[Define to 1 if gethostbyname_r takes 5 args.]) AC_MSG_RESULT(yes) ], [ *************** *** 96,101 **** (void) gethostbyname_r(name, he, &data); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_3) AC_MSG_RESULT(yes) ], [ --- 96,101 ---- (void) gethostbyname_r(name, he, &data); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Define to 1 if gethostbyname_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_3,1,[Define to 1 if gethostbyname_r takes 3 args.]) AC_MSG_RESULT(yes) ], [ *************** *** 125,130 **** (void) gethostbyaddr_r(addr, length, type, result, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYADDR_R) ! AC_DEFINE(HAVE_GETHOSTBYADDR_R_7) AC_MSG_RESULT(yes) ], [ --- 125,130 ---- (void) gethostbyaddr_r(addr, length, type, result, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYADDR_R,1,[Define to 1 if gethostbyaddr_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYADDR_R_7,1,[Define to 1 if gethostbyaddr_r takes 7 args.]) AC_MSG_RESULT(yes) ], [ Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** ChangeLog 16 May 2005 01:25:01 -0000 1.77 --- ChangeLog 16 May 2005 06:57:06 -0000 1.78 *************** *** 1,2 **** --- 1,14 ---- + 2005-05-16 Stephen Deasey <sd...@us...> + + * aclocal.m4: + * tcl.m4 + * configure.in: + * configure: + * include/Makefile.global.in: + * include/Makefile.module.in: 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. + 2005-05-15 Stephen Deasey <sd...@us...> --- NEW FILE: tcl.m4 --- # tcl.m4 -- # # This file provides a set of autoconf macros to help TEA-enable # a Tcl extension. # # Copyright (c) 1999-2000 Ajuba Solutions. # Copyright (c) 2002-2005 ActiveState Corporation. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: tcl.m4,v 1.1 2005/05/16 06:57:07 sdeasey Exp $ AC_PREREQ(2.50) #------------------------------------------------------------------------ # TEA_PATH_TCLCONFIG -- # # Locate the tclConfig.sh file and perform a sanity check on [...3788 lines suppressed...] # we need TCLSH_PROG defined to get Windows short pathnames AC_REQUIRE([TEA_PROG_TCLSH]) AC_MSG_CHECKING([short pathname for $1 ($2)]) shortpath= case "$2" in *\ *) # Only do this if we need to. shortpath=`echo "puts [[file attributes {$2} -shortname]] ; exit" | ${TCLSH_PROG} 2>/dev/null` ;; esac if test "x${shortpath}" = "x" ; then AC_MSG_RESULT([not changed]) else $1=$shortpath AC_MSG_RESULT([${$1}]) fi fi ]) Index: configure =================================================================== RCS file: /cvsroot/naviserver/naviserver/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure 16 Feb 2005 15:05:45 -0000 1.2 --- configure 16 May 2005 06:57:06 -0000 1.3 *************** *** 1,34 **** #! /bin/sh ! # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 ! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ! # Defaults: [...15039 lines suppressed...] ! # config.status does its own redirection, appending to config.log. ! # Unfortunately, on DOS this fails, as config.log is still kept open ! # by configure, so config.status won't be able to write to it; its ! # output is simply discarded. So we exec the FD to /dev/null, ! # effectively closing config.log, so it can be properly (re)opened and ! # appended to by config.status. When coming back to configure, we ! # need to make the FD available again. ! if test "$no_create" != yes; then ! ac_cs_success=: ! ac_config_status_args= ! test "$silent" = yes && ! ac_config_status_args="$ac_config_status_args --quiet" ! exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ! exec 5>>config.log ! # Use ||, not &&, to avoid exiting from the if with $? = 1, which ! # would make configure fail if this is the last instruction. ! $ac_cs_success || { (exit 1); exit 1; } ! fi Index: configure.in =================================================================== RCS file: /cvsroot/naviserver/naviserver/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 16 Feb 2005 16:45:43 -0000 1.2 --- configure.in 16 May 2005 06:57:07 -0000 1.3 *************** *** 34,43 **** # configure.in -- # ! # AOLserver configure script. # ! AC_INIT(include/ns.h) ! AC_PREREQ(2.13) ! AC_PREFIX_DEFAULT(/usr/local/aolserver) # --- 34,44 ---- # configure.in -- # ! # NaviServer configure script. # ! AC_INIT(NaviServer, 4.99.0, nav...@li...) ! AC_CONFIG_SRCDIR(include/ns.h) ! AC_PREREQ(2.50) ! AC_REVISION($Revision$) # *************** *** 45,84 **** # ! SC_PATH_TCLCONFIG ! SC_LOAD_TCLCONFIG if test "${TCL_THREADS}" != "1"; then AC_MSG_ERROR([must build tcl with --enable-threads]) fi ! SC_ENABLE_SYMBOLS ! ! AC_SUBST(TCL_LIB_SPEC) ! AC_SUBST(TCL_LIBS) ! AC_SUBST(TCL_INCLUDE_SPEC) ! AC_SUBST(TCL_RANLIB) ! AC_SUBST(TCL_EXEC_PREFIX) ! ! AC_SUBST(TCL_SHLIB_SUFFIX) ! AC_SUBST(TCL_CC_SEARCH_FLAGS) ! AC_SUBST(TCL_LD_SEARCH_FLAGS) ! AC_SUBST(TCL_LD_FLAGS) ! ! AC_SUBST(TCL_CC) ! AC_SUBST(TCL_CFLAGS_DEBUG) ! AC_SUBST(TCL_CFLAGS_OPTIMIZE) ! AC_SUBST(TCL_CFLAGS_WARNING) ! AC_SUBST(TCL_EXTRA_CFLAGS) ! AC_SUBST(TCL_SHLIB_CFLAGS) ! AC_SUBST(TCL_DEFS) ! ! if test "${CC+set}" != "set"; then ! CC=$TCL_CC ! fi ! AC_PROG_CC # ! # TCL_SHLIB_LD from tclConfig.sh is not quite right for aolserver. # ! test "x$prefix" = "xNONE" && prefix="/usr/local/aolserver" system=`uname` case "$system" in --- 46,68 ---- # ! TEA_INIT([3.2]) ! TEA_PATH_TCLCONFIG ! TEA_LOAD_TCLCONFIG ! TEA_ENABLE_THREADS if test "${TCL_THREADS}" != "1"; then AC_MSG_ERROR([must build tcl with --enable-threads]) fi ! TEA_SETUP_COMPILER ! TEA_PUBLIC_TCL_HEADERS ! TEA_ENABLE_SHARED ! TEA_CONFIG_CFLAGS ! TEA_ENABLE_SYMBOLS # ! # Modify SHLIB_LD from tclConfig.sh as we specifically name ! # shared library _init functions. # ! test "x$prefix" = "xNONE" && prefix="/usr/local/ns" system=`uname` case "$system" in *************** *** 92,96 **** ;; *) ! LDLIB="$TCL_SHLIB_LD" case "$LDLIB" in *gcc*) --- 76,80 ---- ;; *) ! LDLIB="$SHLIB_LD" case "$LDLIB" in *gcc*) *************** *** 124,128 **** esac SRCDIR=`cd $srcdir; pwd` ! AOLSERVER=$prefix AC_SUBST(SRCDIR) AC_SUBST(LDLIB) --- 108,112 ---- esac SRCDIR=`cd $srcdir; pwd` ! NAVISERVER=$prefix AC_SUBST(SRCDIR) AC_SUBST(LDLIB) *************** *** 132,147 **** AC_SUBST(CCRPATH) AC_SUBST(LDRPATH) ! AC_SUBST(CCRPATHS) ! AC_SUBST(LDRPATHS) ! AC_SUBST(AOLSERVER) # ! # Additional AOLserver checks. # AC_CHECK_HEADERS(inttypes.h) AC_CHECK_FUNCS(timegm fork1 poll drand48 random _NSGetEnviron) ! AC_CHECK_HEADER(mach-o/dyld.h, AC_DEFINE(USE_DYLD),) ! AC_CHECK_HEADER(dl.h, AC_DEFINE(USE_DLSHL),) AC_MSG_CHECKING([need for dup high]) AC_TRY_RUN([ --- 116,131 ---- AC_SUBST(CCRPATH) AC_SUBST(LDRPATH) ! AC_SUBST(SHLIB_SUFFIX) ! AC_SUBST(TCL_EXEC_PREFIX) ! AC_SUBST(NAVISERVER) # ! # Additional checks. # AC_CHECK_HEADERS(inttypes.h) AC_CHECK_FUNCS(timegm fork1 poll drand48 random _NSGetEnviron) ! AC_CHECK_HEADER(mach-o/dyld.h, AC_DEFINE(USE_DYLD,1,[Define to 1 if the <mach-o/dyld.h> header should be used.]),) ! AC_CHECK_HEADER(dl.h, AC_DEFINE(USE_DLSHL,1,[Define to 1 if the <dl.h> header should be used.]),) AC_MSG_CHECKING([need for dup high]) AC_TRY_RUN([ *************** *** 151,164 **** { return (sizeof(stdout->_file) == 1) ? 0 : 1; ! }], AC_DEFINE(USE_DUPHIGH) as_ok=yes, as_ok=no, as_ok=no) ! AC_MSG_RESULT($as_ok) ! ! AC_MSG_CHECKING([msg_controllen in struct msghdr]) ! AC_TRY_COMPILE([ ! #include <sys/types.h> ! #include <sys/socket.h>], [ ! struct msghdr msg; ! int *i = msg.msg_controllen; ! ], AC_DEFINE(HAVE_CMMSG) as_ok=yes, as_ok=no) AC_MSG_RESULT($as_ok) --- 135,139 ---- { return (sizeof(stdout->_file) == 1) ? 0 : 1; ! }], AC_DEFINE(USE_DUPHIGH,1,[need for dup high]) as_ok=yes, as_ok=no, as_ok=no) AC_MSG_RESULT($as_ok) *************** *** 238,242 **** # ! # Create Makefile.global. # --- 213,217 ---- # ! # Create Makefiles. # |
