You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/10/28 18:32:22 UTC
svn commit: r329239 - in /tcl/websh/trunk/src/unix: Makefile.in configure.in
Author: ronnie
Date: Fri Oct 28 09:32:06 2005
New Revision: 329239
URL: http://svn.apache.org/viewcvs?rev=329239&view=rev
Log:
- cleanup of configure stuff
- adapted to work with Tcl8.5
- moved to Version 3.6.0b2 (too many command changes)
Modified:
tcl/websh/trunk/src/unix/Makefile.in
tcl/websh/trunk/src/unix/configure.in
Modified: tcl/websh/trunk/src/unix/Makefile.in
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/unix/Makefile.in?rev=329239&r1=329238&r2=329239&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/Makefile.in (original)
+++ tcl/websh/trunk/src/unix/Makefile.in Fri Oct 28 09:32:06 2005
@@ -175,9 +175,9 @@
INCLUDES = @TCL_INCLUDES@ $(HTTPD_INCLUDES)
-EXTRA_CFLAGS = $(TCL_DEFS) $(PROTO_FLAGS) $(SECURITY_FLAGS) $(MEM_DEBUG_FLAGS) $(KEYSYM_FLAGS) $(NO_DEPRECATED_FLAGS)
-
-DEFS = @DEFS@ $(EXTRA_CFLAGS)
+EXTRA_CFLAGS = $(TCL_DEFS) $(PROTO_FLAGS) $(SECURITY_FLAGS) $(MEM_DEBUG_FLAGS) $(KEYSYM_FLAGS) $(NO_DEPRECATED_FLAGS) $(TCL_EXTRA_FLAGS)
+
+DEFS = -DVERSION=\"@VERSION@\" -D@PLATFORM@=1 -DUSE_TCL_STUBS=@USE_TCL_STUBS@ $(EXTRA_CFLAGS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -201,7 +201,7 @@
binaries: $(BINARIES) $(OBJECTS) websh
-libraries:
+libraries: mod_websh.so
doc:
@@ -292,11 +292,11 @@
websh$(VERSION): tclAppInit.$(OBJEXT) $(web_OBJECTS)
$(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
- $(TCL_LIB_SPEC) $(TCL_LIBS) -o websh$(VERSION)
+ $(TCL_LIB_SPEC) $(TCL_LIBS) $(TCL_LD_FLAGS) -o websh$(VERSION)
mod_websh$(SHARED_LIB_SUFFIX): $(web_ap_OBJECTS)
- $(SHLIB_LD) -o mod_websh$(SHARED_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC)
+ $(SHLIB_LD) $(TCL_LD_FLAGS) -o mod_websh$(SHARED_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC)
mod_websh.a: $(web_ap_OBJECTS)
echo "proto: $(PROTO_FLAGS)"
@@ -313,12 +313,12 @@
pure: tclAppInit.$(OBJEXT) $(web_OBJECTS)
purify $(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
- $(TCL_LIB_SPEC) -o websh$(VERSION).pure
+ $(TCL_LIB_SPEC) $(TCL_LD_FLAGS) -o websh$(VERSION).pure
-rm -f *_pure_*.o
cov: tclAppInit.$(OBJEXT) $(web_OBJECTS)
purecov $(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
- $(TCL_LIB_SPEC) -o websh$(VERSION).cov
+ $(TCL_LIB_SPEC) $(TCL_LD_FLAGS) -o websh$(VERSION).cov
-rm -f *_pure_*.o
# =============================================================================
@@ -327,22 +327,26 @@
# =============================================================================
clean:
- -test -z "$(BINARIES)" || rm -f $(BINARIES)
+ -rm -f $(BINARIES)
+ -rm -f $(bin_BINARIES)
-rm -f *.o core *.core
-rm -f *.$(OBJEXT)
- -rm -f *pure*
+ -rm -f *pure* .*pure*
-rm -f ../generic/script.h
+ -rm -f *~
+ -rm -f ../tests/locktest.*
-rm -f $(web_OBJECTS) $(web_ap_OBJECTS) mod_websh$(SHARED_LIB_SUFFIX) mod_websh$(UNSHARED_LIB_SUFFIX)
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean: clean
-rm -f *.tab.c
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-rm -f config.status
+ -rm -rf autom4te*.cache
-rm -f configure
( cd ../../ && find . -name "*~" -exec rm -f {} \;)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
# =============================================================================
# Install binary object libraries. On Windows this includes both .dll and
Modified: tcl/websh/trunk/src/unix/configure.in
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/unix/configure.in?rev=329239&r1=329238&r2=329239&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/configure.in (original)
+++ tcl/websh/trunk/src/unix/configure.in Fri Oct 28 09:32:06 2005
@@ -30,8 +30,8 @@
PACKAGE=web
MAJOR_VERSION=3
-MINOR_VERSION=5
-PATCHLEVEL=1b1
+MINOR_VERSION=6
+PATCHLEVEL=0b2
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCHLEVEL}
NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION}${PATCHLEVEL}
@@ -40,13 +40,6 @@
AC_SUBST(VERSION)
#--------------------------------------------------------------------
-# We put this here so that you can compile with -DVERSION="1.2" to
-# encode the package version directly into the source files.
-#--------------------------------------------------------------------
-
-eval AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
-
-#--------------------------------------------------------------------
# Check whether --enable-gcc or --disable-gcc was given. Do this
# before AC_CYGWIN is called so the compiler can
# be fully tested by built-in autoconf tools.
@@ -123,7 +116,6 @@
#--------------------------------------------------------------------
SC_PUBLIC_TCL_HEADERS
-#SC_PRIVATE_TCL_HEADERS
#--------------------------------------------------------------------
# Load the tclConfig.sh file
@@ -136,15 +128,30 @@
#--------------------------------------------------------------------
# --with-httpd-include
#--------------------------------------------------------------------
-AC_ARG_WITH(httpdinclude, [ --with-httpdinclude directory containing the apache header files.], with_httpdinclude=${withval})
+AC_ARG_WITH(httpdinclude, [ --with-httpdinclude directory containing the apache header files.], with_httpdinclude=${withval}, with_httpdinclude=NA)
-if test x"${with_httpdinclude}" != x ; then
+if test x"${with_httpdinclude}" != xNA ; then
if test -f "${with_httpdinclude}/httpd.h" ; then
echo "httpd header files found"
HTTPD_INCLUDES=-I\"${with_httpdinclude}\"
AC_SUBST(HTTPD_INCLUDES)
else
- AC_MSG_ERROR([${with_httpdinclude}: directory does not contain httpd.h])
+ AC_MSG_ERROR([${with_httpdinclude}: directory does not contain Apache httpd header file httpd.h])
+ fi
+else
+ eval "temp_includedir=${includedir}"
+ for i in \
+ `ls -d ${temp_includedir} 2>/dev/null` \
+ /usr/local/include /usr/include ; do
+ if test -f "$i/httpd.h" ; then
+ echo "httpd header files found"
+ HTTPD_INCLUDES=-I\"$i\"
+ AC_SUBST(HTTPD_INCLUDES)
+ break
+ fi
+ done
+ if test x"${HTTPD_INCLUDES}" = x ; then
+ AC_MSG_ERROR(httpd.h not found. Please specify its location with --with-httpdinclude)
fi
fi
@@ -166,14 +173,13 @@
case "`uname -s`" in
*win32* | *WIN32* | *CYGWIN_NT*)
- AC_DEFINE(BUILD_web)
CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch"
- AC_SUBST(CLEANFILES)
;;
*)
CLEANFILES="*pure* *.cov* ../tests/webtest.log ../tests/*.dat"
;;
esac
+AC_SUBST(CLEANFILES)
#--------------------------------------------------------------------
@@ -181,21 +187,22 @@
#--------------------------------------------------------------------
case "`uname -s`" in
*win32* | *WIN32* | *CYGWIN_NT*)
- AC_DEFINE(WIN32)
+ PLATFORM="WIN32"
;;
*aix* | *AIX* )
- AC_DEFINE(AIX)
+ PLATFORM="AIX"
;;
*freebsd* | *FreeBSD* )
- AC_DEFINE(FREEBSD)
+ PLATFORM="FREEBSD"
;;
*bsd/os* | *BSD/OS* )
- AC_DEFINE(BSDI)
+ PLATFORM="BSDI"
;;
*)
- AC_DEFINE(SYSV)
+ PLATFORM="SYSV"
;;
esac
+AC_SUBST(PLATFORM)
#--------------------------------------------------------------------
# Check whether --enable-threads or --disable-threads was given.
@@ -252,7 +259,8 @@
# link against the non-stubbed Tcl library.
#--------------------------------------------------------------------
-AC_DEFINE(USE_TCL_STUBS)
+USE_TCL_STUBS=1
+AC_SUBST(USE_TCL_STUBS)
#--------------------------------------------------------------------
# This macro generates a line to use when building a library. It
@@ -322,7 +330,7 @@
:${TCL_PACKAGE_PATH}/../bin:.:${prefix}:${exec_prefix}:${PATH})
if test "x${TCLSH_PROG}" = "x:" ; then
- AC_ERROR(needed tclsh 8.5 not found)
+ AC_ERROR(needed tclsh not found)
fi
AC_SUBST(TCL_LIB_SPEC)
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org