Index: xotcl/ChangeLog =================================================================== diff -u -N -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/ChangeLog (.../ChangeLog) (revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3) +++ xotcl/ChangeLog (.../ChangeLog) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -1,3 +1,22 @@ +2004-07-18 Gustaf.Neumann@wu-wien.ac.at + * added removal of autom4te.cache to distclean + * make doc added to "all" target + * autogenerated html docs are removed in a make clean + * remove all *~ files in directory tree via find (ok with TEA3?) + +2004-07-11 jim@jam.sessionsnet.org + * revamped configure recursion + * added "--with-xotcl=" to child configure.ins + * arranged for root configure to call child configures specifying path + * located and fixed bug where parts of the build cannot find xotcl.h + if xotcl was not "make install"ed (bug implies build always finds + old includes) + * ensured "make clean" and "make distclean" still worked + * TODO: clean should remove emacs backup files + distclean should remove autom4te.cache + docs should be built during make, installed during make install + and removed from the build dir during make clean. + 2004-07-03 Gustaf.Neumann@wu-wien.ac.at * extended commands filter, mixin, instfilter, instmixin: These commands are changed in a backward compatible manner. They @@ -12,15 +31,19 @@ obj mixin add C3 3 adds a mixin at the 3rd position obj mixin delete ::C3 removes the mixin from the mixin list - The same semantics are available as well for filter, instmixin - and instfilter. - The implementation uses the forwarder and is extensible, new - subcommands can be added. As a side effect, the c-code was reduced - by 50 lines. - * the commands mixinappend, filterappend, instmixinappend and - instfilterappend were marked as deprecated and will be removed - in future versions - + The same semantics are available as well for filter, instmixin + and instfilter. + The implementation uses the forwarder and is extensible, new + subcommands can be added. As a side effect, the c-code was reduced + by 50 lines. + * the commands mixinappend, filterappend, instmixinappend and + instfilterappend were marked as deprecated and will be removed + in future versions + +2004-07-02 Uwe Zdun + * integrated support for non-positional arguments for procs + and instprocs + 2004-07-02 Gustaf.Neumann@wu-wien.ac.at * rename forward option -inscope to -objscope * xotcl.c: added current namespace prefix, when a forwarder is Index: xotcl/Makefile =================================================================== diff -u -N -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/Makefile (.../Makefile) (revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3) +++ xotcl/Makefile (.../Makefile) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.10 2004/07/03 21:19:39 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.11 2004/07/18 09:49:03 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -118,7 +118,7 @@ PACKAGE_NAME = xotcl PACKAGE_VERSION = 1.2.1 CC = gcc -pipe -CFLAGS_DEFAULT = -O -g +CFLAGS_DEFAULT = -O CFLAGS_WARNING = -Wall -Wconversion -Wno-implicit-int CLEANFILES = *.o *.a *.so *~ core gmon.out config.* EXEEXT = @@ -163,7 +163,7 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) SHARED_BUILD = 1 -INCLUDES = -I$(TCL_SRC_DIR)/generic -I$(TCL_SRC_DIR)/unix +INCLUDES = -I$(TCL_SRC_DIR)/generic -I$(TCL_SRC_DIR)/unix -I/home/neumann/xotcl-1.2.1/generic EXTRA_CFLAGS = -DXOTCLVERSION=\"1.2\" -DXOTCLPATCHLEVEL=\".1\" -DHAVE_TCL_COMPILE_H=1 # TCL_DEFS is not strictly need here, but if you remove it, then you @@ -174,7 +174,7 @@ #DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.2.1\" -DPACKAGE_STRING=\"xotcl\ 1.2.1\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1 $(EXTRA_CFLAGS) DEFS = -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.2.1\" -DPACKAGE_STRING=\"xotcl\ 1.2.1\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1 $(EXTRA_CFLAGS) -CONFIG_CLEAN_FILES = Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix +CONFIG_CLEAN_FILES = Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix autom4te.cache CPPFLAGS = LIBS = @@ -194,7 +194,7 @@ # for the BINARIES that you specified above have already been done. #======================================================================== -all: binaries libraries +all: binaries libraries doc #======================================================================== # The binaries target builds executable programs, Windows .dll's, unix @@ -459,14 +459,15 @@ #======================================================================== clean: - -rm -rf $(BINARIES) $(CLEANFILES) xotclsh xowish pkgIndex.tcl ./receiver + -rm -rf $(BINARIES) $(CLEANFILES) xotclsh xowish pkgIndex.tcl ./receiver $(src_doc_dir)/*-xotcl.html + find ${srcdir} -type f -name \*~ -exec rm \{} \; @if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \ for dir in $$dirs ; do \ if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \ done; fi distclean: clean - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -rf Makefile $(CONFIG_CLEAN_FILES) @if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \ for dir in $$dirs ; do \ if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \ Index: xotcl/Makefile.in =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/Makefile.in (.../Makefile.in) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/Makefile.in (.../Makefile.in) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile.in,v 1.4 2004/07/02 11:22:31 neumann Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.5 2004/07/18 09:49:03 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -163,7 +163,7 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) SHARED_BUILD = @SHARED_BUILD@ -INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ +INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @XOTCL_BUILD_INCLUDE_SPEC@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ @PKG_CFLAGS@ # TCL_DEFS is not strictly need here, but if you remove it, then you @@ -194,7 +194,7 @@ # for the BINARIES that you specified above have already been done. #======================================================================== -all: binaries libraries +all: binaries libraries doc #======================================================================== # The binaries target builds executable programs, Windows .dll's, unix @@ -459,14 +459,15 @@ #======================================================================== clean: - -rm -rf $(BINARIES) $(CLEANFILES) @XOTCLSH@ @XOWISH@ pkgIndex.tcl ./receiver + -rm -rf $(BINARIES) $(CLEANFILES) @XOTCLSH@ @XOWISH@ pkgIndex.tcl ./receiver $(src_doc_dir)/*-xotcl.html + find ${srcdir} -type f -name \*~ -exec rm \{} \; @if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \ for dir in $$dirs ; do \ if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \ done; fi distclean: clean - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -rf Makefile $(CONFIG_CLEAN_FILES) @if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \ for dir in $$dirs ; do \ if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \ Index: xotcl/configure =================================================================== diff -u -N -r894d9fdf1f31a1e18c1942007edebd85ebc5ae59 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/configure (.../configure) (revision 894d9fdf1f31a1e18c1942007edebd85ebc5ae59) +++ xotcl/configure (.../configure) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -270,9 +270,6 @@ PACKAGE_STRING='xotcl 1.2.1' PACKAGE_BUGREPORT='' -ac_subdirs_all="$ac_subdirs_all library/store/XOTclSdbm/" -ac_subdirs_all="$ac_subdirs_all library/store/XOTclGdbm/" -ac_subdirs_all="$ac_subdirs_all library/xml/TclExpat-1.1/" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -310,7 +307,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS subdirs XOTCL_VERSION XOTCL_MAJOR_VERSION XOTCL_MINOR_VERSION XOTCL_RELEASE_LEVEL TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING EXTRA_CFLAGS STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LD_FLAGS SHLIB_LD_LIBS LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG XOTCL_COMPATIBLE_TCLSH PKG_DIR pkgdatadir pkglibdir pkgincludedir SHARED_LIB_SUFFIX UNSHARED_LIB_SUFFIX XOTCL_BUILD_LIB_SPEC XOTCL_LIB_SPEC XOTCL_BUILD_STUB_LIB_SPEC XOTCL_STUB_LIB_SPEC XOTCL_BUILD_STUB_LIB_PATH XOTCL_STUB_LIB_PATH XOTCL_SRC_DIR XOTCLSH XOWISH test_actiweb libdirs_actiweb apps_actiweb TEA_PLATFORM CONFIG_CLEAN_FILES LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS subdirs XOTCL_VERSION XOTCL_MAJOR_VERSION XOTCL_MINOR_VERSION XOTCL_RELEASE_LEVEL TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING EXTRA_CFLAGS STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LD_FLAGS SHLIB_LD_LIBS LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG XOTCL_COMPATIBLE_TCLSH PKG_DIR pkgdatadir pkglibdir pkgincludedir SHARED_LIB_SUFFIX UNSHARED_LIB_SUFFIX XOTCL_BUILD_LIB_SPEC XOTCL_LIB_SPEC XOTCL_BUILD_STUB_LIB_SPEC XOTCL_STUB_LIB_SPEC XOTCL_BUILD_STUB_LIB_PATH XOTCL_STUB_LIB_PATH XOTCL_SRC_DIR XOTCLSH XOWISH XOTCL_BUILD_INCLUDE_DIR XOTCL_BUILD_INCLUDE_SPEC test_actiweb libdirs_actiweb apps_actiweb TEA_PLATFORM CONFIG_CLEAN_FILES LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1490,6 +1487,8 @@ with_tclinclude=${withval} fi; +subdirs="" + if test "$with_all" = yes; then with_actiweb=yes with_xotclsh=yes @@ -1501,26 +1500,19 @@ test_actiweb="test-actiweb" libdirs_actiweb="actiweb rdf registry store xml patterns" apps_actiweb="actiweb persistence" - - -subdirs="$subdirs library/store/XOTclSdbm/" - + subdirs="$subdirs library/store/XOTclSdbm/" if ! test "$with_gdbm" = no; then - - -subdirs="$subdirs library/store/XOTclGdbm/" - + subdirs="$subdirs library/store/XOTclGdbm/" fi - - -subdirs="$subdirs library/xml/TclExpat-1.1/" - + subdirs="$subdirs library/xml/TclExpat-1.1/" else test_actiweb="" libdirs_actiweb="" apps_actiweb="" fi + + if test "$with_tk" = no; then with_xowish="" ; fi if test "$with_xotclsh" = yes; then XOTCLSH="xotclsh" ; else XOTCLSH=""; fi if test "$with_xowish" = yes; then XOWISH="xowish" ; else XOWISH=""; fi @@ -9574,6 +9566,7 @@ PKG_DIR="${PACKAGE_NAME}${PACKAGE_VERSION}" pkgdatadir="${datadir}/${PKG_DIR}" pkglibdir="${libdir}/${PKG_DIR}" +# make sure this is right (then remove this comment) pkgincludedir="${includedir}/${PKG_DIR}" @@ -9618,6 +9611,9 @@ +# include dir of xotcl during build process (i.e., does not assume installed) +XOTCL_BUILD_INCLUDE_DIR="${XOTCL_SRC_DIR}/generic" +XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}" @@ -9627,14 +9623,17 @@ + + + #-------------------------------------------------------------------- # the value of this variable is set to the files which are to be # removed when the user invokes 'make distclean' (i.e., those # files generated by ./configure) and is used in the make distclean # target, defined in Makefile.in #-------------------------------------------------------------------- -CONFIG_CLEAN_FILES="Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix" +CONFIG_CLEAN_FILES="Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix autom4te.cache" @@ -10399,6 +10398,8 @@ s,@XOTCL_SRC_DIR@,$XOTCL_SRC_DIR,;t t s,@XOTCLSH@,$XOTCLSH,;t t s,@XOWISH@,$XOWISH,;t t +s,@XOTCL_BUILD_INCLUDE_DIR@,$XOTCL_BUILD_INCLUDE_DIR,;t t +s,@XOTCL_BUILD_INCLUDE_SPEC@,$XOTCL_BUILD_INCLUDE_SPEC,;t t s,@test_actiweb@,$test_actiweb,;t t s,@libdirs_actiweb@,$libdirs_actiweb,;t t s,@apps_actiweb@,$apps_actiweb,;t t @@ -10640,147 +10641,11 @@ $ac_cs_success || { (exit 1); exit 1; } fi -# -# CONFIG_SUBDIRS section. -# -if test "$no_recursion" != yes; then - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $ac_configure_args; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done +here=${PWD} - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" +for subdir in ${subdirs} +do + (cd $subdir; eval $SHELL configure ${ac_configure_args} --with-xotcl=${here}) +done - ac_popdir=`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - test -d $srcdir/$ac_dir || continue - - { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 -echo "$as_me: configuring in $ac_dir" >&6;} - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - - cd $ac_dir - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'" - elif test -f $ac_srcdir/configure; then - ac_sub_configure="$SHELL '$ac_srcdir/configure'" - elif test -f $ac_srcdir/configure.in; then - ac_sub_configure=$ac_configure - else - { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 -echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative path. - ac_sub_cache_file=$ac_top_builddir$cache_file ;; - esac - - { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || - { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 -echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} - { (exit 1); exit 1; }; } - fi - - cd $ac_popdir - done -fi - Index: xotcl/configure.in =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/configure.in (.../configure.in) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/configure.in (.../configure.in) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -59,6 +59,8 @@ [ --with-tclinclude directory containing the public Tcl header files.], with_tclinclude=${withval}) +subdirs="" + if test "$with_all" = yes; then with_actiweb=yes with_xotclsh=yes @@ -70,17 +72,22 @@ test_actiweb="test-actiweb" libdirs_actiweb="actiweb rdf registry store xml patterns" apps_actiweb="actiweb persistence" - AC_CONFIG_SUBDIRS(library/store/XOTclSdbm/) + subdirs="$subdirs library/store/XOTclSdbm/" +dnl AC_CONFIG_SUBDIRS(library/store/XOTclSdbm/) if ! test "$with_gdbm" = no; then - AC_CONFIG_SUBDIRS(library/store/XOTclGdbm/) + subdirs="$subdirs library/store/XOTclGdbm/" +dnl AC_CONFIG_SUBDIRS(library/store/XOTclGdbm/) fi - AC_CONFIG_SUBDIRS(library/xml/TclExpat-1.1/) + subdirs="$subdirs library/xml/TclExpat-1.1/" +dnl AC_CONFIG_SUBDIRS(library/xml/TclExpat-1.1/) else test_actiweb="" libdirs_actiweb="" apps_actiweb="" fi +AC_SUBST(subdirs) + if test "$with_tk" = no; then with_xowish="" ; fi if test "$with_xotclsh" = yes; then XOTCLSH="xotclsh" ; else XOTCLSH=""; fi if test "$with_xowish" = yes; then XOWISH="xowish" ; else XOWISH=""; fi @@ -335,6 +342,7 @@ PKG_DIR="${PACKAGE_NAME}${PACKAGE_VERSION}" pkgdatadir="${datadir}/${PKG_DIR}" pkglibdir="${libdir}/${PKG_DIR}" +# make sure this is right (then remove this comment) pkgincludedir="${includedir}/${PKG_DIR}" AC_SUBST(PKG_DIR) @@ -376,6 +384,12 @@ AC_SUBST(XOTCLSH) AC_SUBST(XOWISH) +# include dir of xotcl during build process (i.e., does not assume installed) +XOTCL_BUILD_INCLUDE_DIR="${XOTCL_SRC_DIR}/generic" +XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}" +AC_SUBST(XOTCL_BUILD_INCLUDE_DIR) +AC_SUBST(XOTCL_BUILD_INCLUDE_SPEC) + AC_SUBST(test_actiweb) AC_SUBST(libdirs_actiweb) AC_SUBST(apps_actiweb) @@ -397,7 +411,7 @@ # target, defined in Makefile.in #-------------------------------------------------------------------- -CONFIG_CLEAN_FILES="CONFIG_OUTPUT_FILES" +CONFIG_CLEAN_FILES="CONFIG_OUTPUT_FILES autom4te.cache/" AC_SUBST(CONFIG_CLEAN_FILES) @@ -414,3 +428,11 @@ #-------------------------------------------------------------------- AC_OUTPUT + +here=${PWD} + +for subdir in ${subdirs} +do + (cd $subdir; eval $SHELL configure ${ac_configure_args} --with-xotcl=${here}) +done + Index: xotcl/generic/predefined.h =================================================================== diff -u -N -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/generic/predefined.h (.../predefined.h) (revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3) +++ xotcl/generic/predefined.h (.../predefined.h) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -1,5 +1,5 @@ static char cmd[] = -"# $Id: predefined.h,v 1.3 2004/07/03 21:19:39 neumann Exp $\n" +"# $Id: predefined.h,v 1.4 2004/07/18 09:49:03 neumann Exp $\n" "::xotcl::Object instproc init args {}\n" "::xotcl::Object create ::xotcl::@\n" "::xotcl::@ proc unknown args {}\n" Index: xotcl/library/store/XOTclGdbm/Makefile =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/library/store/XOTclGdbm/Makefile (.../Makefile) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/library/store/XOTclGdbm/Makefile (.../Makefile) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.10 2004/07/02 11:22:31 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.11 2004/07/18 09:49:03 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that Index: xotcl/library/store/XOTclGdbm/configure.in =================================================================== diff -u -N -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/library/store/XOTclGdbm/configure.in (.../configure.in) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/store/XOTclGdbm/configure.in (.../configure.in) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -3,7 +3,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# RCS: @(#) $Id: configure.in,v 1.2 2004/07/18 09:49:03 neumann Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. The only places you should @@ -34,6 +34,16 @@ AC_CONFIG_AUX_DIR(../../../config) #-------------------------------------------------------------------- +# specify some extra flags +#-------------------------------------------------------------------- + +AC_ARG_WITH(xotcl, + [ --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH + absolute path to xotclConfig.sh, + --without-xotcl disables, but this is pointless], + [with_xotcl=$withval], [AC_MSG_ERROR([--with-xotcl is required])]) + +#-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- @@ -108,14 +118,16 @@ #echo "Gdbm include spec = '${GDBM_INC_SPEC}'" #echo "Gdbm lib spec = '${GDBM_LIB_SPEC}'" -# ------- load xotclConfig.sh ---------- -SC_PATH_XOTCLCONFIG -SC_LOAD_XOTCLCONFIG -# ------- +#-------------------------------------------------------------------- +# Load the xotclConfig.sh file +#-------------------------------------------------------------------- +AC_MSG_NOTICE([Reading file ${with_xotcl}/xotclConfig.sh]) +source ${with_xotcl}/xotclConfig.sh + TEA_ADD_SOURCES([xotclgdbm.c]) TEA_ADD_HEADERS([]) -TEA_ADD_INCLUDES([-I$XOTCL_SRC_DIR/generic $GDBM_INC_SPEC]) +TEA_ADD_INCLUDES([${XOTCL_BUILD_INCLUDE_SPEC} $GDBM_INC_SPEC]) TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC $GDBM_LIB_SPEC -lgdbm]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) @@ -226,4 +238,6 @@ # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([Makefile]) + +AC_OUTPUT Index: xotcl/library/store/XOTclSdbm/Makefile =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/library/store/XOTclSdbm/Makefile (.../Makefile) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/library/store/XOTclSdbm/Makefile (.../Makefile) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.10 2004/07/02 11:22:31 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.11 2004/07/18 09:49:03 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that Index: xotcl/library/store/XOTclSdbm/configure.in =================================================================== diff -u -N -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/library/store/XOTclSdbm/configure.in (.../configure.in) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/store/XOTclSdbm/configure.in (.../configure.in) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -3,7 +3,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# RCS: @(#) $Id: configure.in,v 1.2 2004/07/18 09:49:03 neumann Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. The only places you should @@ -34,6 +34,16 @@ AC_CONFIG_AUX_DIR(../../../config) #-------------------------------------------------------------------- +# specify some extra flags +#-------------------------------------------------------------------- + +AC_ARG_WITH(xotcl, + [ --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH + absolute path to xotclConfig.sh, + --without-xotcl disables, but this is pointless], + [with_xotcl=$withval], [AC_MSG_ERROR([--with-xotcl is required])]) + +#-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- @@ -63,6 +73,13 @@ TEA_SETUP_COMPILER +#-------------------------------------------------------------------- +# Load the xotclConfig.sh file +#-------------------------------------------------------------------- + +AC_MSG_NOTICE([Reading file ${with_xotcl}/xotclConfig.sh]) +source ${with_xotcl}/xotclConfig.sh + #----------------------------------------------------------------------- # __CHANGE__ # Specify the C source files to compile in TEA_ADD_SOURCES, @@ -73,14 +90,9 @@ # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- -# ------- load xotclConfig.sh ---------- -SC_PATH_XOTCLCONFIG -SC_LOAD_XOTCLCONFIG -# ------- - TEA_ADD_SOURCES([hash.c pair.c sdbm.c xotclsdbm.c]) TEA_ADD_HEADERS([]) -TEA_ADD_INCLUDES([-I$XOTCL_SRC_DIR/generic]) +TEA_ADD_INCLUDES([${XOTCL_BUILD_INCLUDE_SPEC}]) TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) Index: xotcl/library/xml/TclExpat-1.1/Makefile =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/library/xml/TclExpat-1.1/Makefile (.../Makefile) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/library/xml/TclExpat-1.1/Makefile (.../Makefile) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.10 2004/07/02 11:22:31 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.11 2004/07/18 09:49:03 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that Index: xotcl/library/xml/TclExpat-1.1/configure.in =================================================================== diff -u -N -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/library/xml/TclExpat-1.1/configure.in (.../configure.in) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/xml/TclExpat-1.1/configure.in (.../configure.in) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -3,7 +3,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# RCS: @(#) $Id: configure.in,v 1.2 2004/07/18 09:49:03 neumann Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. The only places you should @@ -34,6 +34,16 @@ AC_CONFIG_AUX_DIR(../../../config) #-------------------------------------------------------------------- +# specify some extra flags +#-------------------------------------------------------------------- + +AC_ARG_WITH(xotcl, + [ --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH + absolute path to xotclConfig.sh, + --without-xotcl disables, but this is pointless], + [with_xotcl=$withval], [AC_MSG_ERROR([--with-xotcl is required])]) + +#-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- @@ -63,6 +73,13 @@ TEA_SETUP_COMPILER +#-------------------------------------------------------------------- +# Load the xotclConfig.sh file +#-------------------------------------------------------------------- + +AC_MSG_NOTICE([Reading file ${with_xotcl}/xotclConfig.sh]) +source ${with_xotcl}/xotclConfig.sh + #----------------------------------------------------------------------- # __CHANGE__ # Specify the C source files to compile in TEA_ADD_SOURCES, @@ -73,11 +90,6 @@ # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- -# ------- load xotclConfig.sh ---------- -SC_PATH_XOTCLCONFIG -SC_LOAD_XOTCLCONFIG -# ------- - TEA_ADD_SOURCES([xmltok.c unixfilemap.c xmlrole.c xmlwf.c codepage.c xmlparse.c hashtable.c tclexpat.c]) TEA_ADD_HEADERS([]) TEA_ADD_INCLUDES([-I$XOTCL_SRC_DIR/generic]) Index: xotcl/xotclConfig.sh =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -17,6 +17,16 @@ XOTCL_MINOR_VERSION='2' XOTCL_RELEASE_LEVEL='.1' +# String to pass to compiles to pick up includes during build +# (i.e., assuming nothing has been installed) +XOTCL_BUILD_INCLUDE_DIR='/home/neumann/xotcl-1.2.1/generic' +XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}" + +# String to pass to compiles to pick up the XOTcl includes from their +# installed directory. +XOTCL_INCLUDE_DIR="/usr/include/xotcl1.2.1" +XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR" + # The name of the XOTcl library (may be either a .a file or a shared library): XOTCL_LIB_FILE=libxotcl1.2.1.so Index: xotcl/xotclConfig.sh.in =================================================================== diff -u -N -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 --- xotcl/xotclConfig.sh.in (.../xotclConfig.sh.in) (revision 9722a51911e1502444c173306c8c88f7f3888989) +++ xotcl/xotclConfig.sh.in (.../xotclConfig.sh.in) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) @@ -17,6 +17,16 @@ XOTCL_MINOR_VERSION='@XOTCL_MINOR_VERSION@' XOTCL_RELEASE_LEVEL='@XOTCL_RELEASE_LEVEL@' +# String to pass to compiles to pick up includes during build +# (i.e., assuming nothing has been installed) +XOTCL_BUILD_INCLUDE_DIR='@XOTCL_BUILD_INCLUDE_DIR@' +XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}" + +# String to pass to compiles to pick up the XOTcl includes from their +# installed directory. +XOTCL_INCLUDE_DIR="@pkgincludedir@" +XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR" + # The name of the XOTcl library (may be either a .a file or a shared library): XOTCL_LIB_FILE=@PKG_LIB_FILE@