Index: xotcl/configure.in =================================================================== diff -u -r638782f84b31e4ebfd00529381e280c70f9950bc -r464284f53643031115e4da0204025a733675ad60 --- xotcl/configure.in (.../configure.in) (revision 638782f84b31e4ebfd00529381e280c70f9950bc) +++ xotcl/configure.in (.../configure.in) (revision 464284f53643031115e4da0204025a733675ad60) @@ -11,7 +11,7 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- -define(XOTclVersion, 1.3.0) +define(XOTclVersion, 1.3.1) AC_INIT([xotcl], [XOTclVersion]) #-------------------------------------------------------------------- @@ -72,12 +72,15 @@ test_actiweb="test-actiweb" libdirs_actiweb="actiweb rdf registry store xml patterns" apps_actiweb="actiweb persistence" + mkdir -p library/store/XOTclSdbm subdirs="$subdirs library/store/XOTclSdbm/" dnl AC_CONFIG_SUBDIRS(library/store/XOTclSdbm/) if ! test "$with_gdbm" = no; then + mkdir -p library/store/XOTclGdbm subdirs="$subdirs library/store/XOTclGdbm/" dnl AC_CONFIG_SUBDIRS(library/store/XOTclGdbm/) fi + mkdir -p library/xml/TclExpat-1.1/ subdirs="$subdirs library/xml/TclExpat-1.1/" dnl AC_CONFIG_SUBDIRS(library/xml/TclExpat-1.1/) else @@ -104,7 +107,7 @@ # do not modify the following lines manually, they are generated with changeXOTclVersion XOTCL_MAJOR_VERSION=1 XOTCL_MINOR_VERSION=3 -XOTCL_RELEASE_LEVEL=.0 +XOTCL_RELEASE_LEVEL=.1 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} @@ -379,7 +382,7 @@ AC_SUBST(XOTCL_STUB_LIB_SPEC) AC_SUBST(XOTCL_BUILD_STUB_LIB_PATH) AC_SUBST(XOTCL_STUB_LIB_PATH) -XOTCL_SRC_DIR=`pwd` +XOTCL_SRC_DIR=$srcdir AC_SUBST(XOTCL_SRC_DIR) AC_SUBST(XOTCLSH) AC_SUBST(XOWISH) @@ -412,9 +415,7 @@ #-------------------------------------------------------------------- CONFIG_CLEAN_FILES="CONFIG_OUTPUT_FILES autom4te.cache/" - AC_SUBST(CONFIG_CLEAN_FILES) - AC_CONFIG_FILES(CONFIG_OUTPUT_FILES) #-------------------------------------------------------------------- @@ -433,8 +434,16 @@ for subdir in ${subdirs} do - (cd $subdir; eval $SHELL configure ${ac_configure_args} --with-xotcl=${here}) + echo "======================= configure $subdir ======================" + if test x"${srcdir}" == x. ; then + confdir=. + else + confdir=${srcdir}/$subdir + fi + (cd $subdir; eval $SHELL ${confdir}/configure ${ac_configure_args} --with-xotcl=${here}) done + +