Index: Makefile.in
===================================================================
diff -u -refb84f692ba4024803be49e1edd1ab36144089cd -r1c9684a6be93da0beb9e73d6ff02ed2b6f014c19
--- Makefile.in (.../Makefile.in) (revision efb84f692ba4024803be49e1edd1ab36144089cd)
+++ Makefile.in (.../Makefile.in) (revision 1c9684a6be93da0beb9e73d6ff02ed2b6f014c19)
@@ -422,8 +422,8 @@
done;
@echo " Installing pkgIndex.tcl for nsf in $(DESTDIR)$(pkglibdir)/pkgIndex.tcl"
@echo "" >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
- @cat unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
- @$(INSTALL_DATA) nsfConfig.sh $(DESTDIR)$(libdir)/
+ @cat $(srcdir)/unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
+ @$(INSTALL_DATA) $(srcdir)/nsfConfig.sh $(DESTDIR)$(libdir)/
install-xotcl-libraries: install-libraries $(DESTDIR)$(pkglibdir)
@echo "Installing XOTcl Libraries to $(DESTDIR)$(xotcl_pkglibdir)/"
@@ -922,7 +922,7 @@
)
tar: libraries-pkgindex
- sh ./tclconfig/mktar.sh
+ sh $(srcdir)/tclconfig/mktar.sh
.PHONY: all binaries clean depend distclean doc install libraries \
Index: autogen.sh
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r1c9684a6be93da0beb9e73d6ff02ed2b6f014c19
--- autogen.sh (.../autogen.sh) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ autogen.sh (.../autogen.sh) (revision 1c9684a6be93da0beb9e73d6ff02ed2b6f014c19)
@@ -1,6 +1,6 @@
#!/bin/sh
-for pdir in `find . -name configure.in`
+for pdir in `find . -name configure.ac`
do
(cd `dirname $pdir`; autoconf)
done
Index: configure
===================================================================
diff -u -r8d8e1bacda07426650fc27ae0993409e9106804c -r1c9684a6be93da0beb9e73d6ff02ed2b6f014c19
--- configure (.../configure) (revision 8d8e1bacda07426650fc27ae0993409e9106804c)
+++ configure (.../configure) (revision 1c9684a6be93da0beb9e73d6ff02ed2b6f014c19)
@@ -2469,7 +2469,7 @@
if ! test "$with_mongoc" = no; then
test_mongodb=test-mongdb
- subdirs="$subdirs library/mongodb"
+ subdirs="$subdirs ${srcdir}/library/mongodb"
fi
test_actiweb=""
@@ -8948,16 +8948,20 @@
# Next Scripting specific configs
#
-#NSF_SRC_DIR=$srcdir
-NSF_SRC_DIR="`pwd`"
+NSF_BUILD_DIR=${PWD}
+cd ${srcdir}
+NSF_SRC_DIR=${PWD}
+cd ${NSF_BUILD_DIR}
+#NSF_SRC_DIR="`pwd`"
+
eval "NSF_PKG_LIBDIR=\"${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}\""
if test "${TEA_PLATFORM}" != "windows" ; then
-NSF_BUILD_LIB_SPEC="-L${NSF_SRC_DIR} -lnsf${PACKAGE_VERSION}"
+NSF_BUILD_LIB_SPEC="-L${NSF_BUILD_DIR} -lnsf${PACKAGE_VERSION}"
NSF_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsf${PACKAGE_VERSION}"
# If someone wants to build without stubs, as it was the case for
@@ -8970,7 +8974,7 @@
else
NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
- NSF_BUILD_STUB_LIB_SPEC="-L${NSF_SRC_DIR} -lnsfstub${PACKAGE_VERSION}"
+ NSF_BUILD_STUB_LIB_SPEC="-L${NSF_BUILD_DIR} -lnsfstub${PACKAGE_VERSION}"
NSF_STUB_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsfstub${PACKAGE_VERSION}"
$as_echo "#define COMPILE_NSF_STUBS 1" >>confdefs.h
@@ -8980,9 +8984,9 @@
NSF_BUILD_LIB_SPEC="${NSF_SRC_DIR}/${PKG_LIB_FILE}"
NSF_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_LIB_FILE}"
-NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_PATH="${NSF_BUILD_DIR}/${PKG_STUB_LIB_FILE}"
NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
-NSF_BUILD_STUB_LIB_SPEC="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_SPEC="${NSF_BUILD_DIR}/${PKG_STUB_LIB_FILE}"
NSF_STUB_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
fi
@@ -9024,9 +9028,9 @@
# target, defined in Makefile.in
#--------------------------------------------------------------------
-CONFIG_CLEAN_FILES="Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/pkgIndex.unix nxsh nxwish autom4te.cache/"
+CONFIG_CLEAN_FILES="Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish ${srcdir}/unix/pkgIndex.unix nxsh nxwish autom4te.cache/"
-ac_config_files="$ac_config_files Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/pkgIndex.unix nxsh nxwish"
+ac_config_files="$ac_config_files Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish ${srcdir}/unix/pkgIndex.unix nxsh nxwish"
#--------------------------------------------------------------------
@@ -9747,10 +9751,10 @@
do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "nsfConfig.sh") CONFIG_FILES="$CONFIG_FILES nsfConfig.sh" ;;
- "library/xotcl/xotclsh") CONFIG_FILES="$CONFIG_FILES library/xotcl/xotclsh" ;;
- "library/xotcl/xowish") CONFIG_FILES="$CONFIG_FILES library/xotcl/xowish" ;;
- "unix/pkgIndex.unix") CONFIG_FILES="$CONFIG_FILES unix/pkgIndex.unix" ;;
+ "${srcdir}/nsfConfig.sh") CONFIG_FILES="$CONFIG_FILES ${srcdir}/nsfConfig.sh" ;;
+ "${srcdir}/library/xotcl/xotclsh") CONFIG_FILES="$CONFIG_FILES ${srcdir}/library/xotcl/xotclsh" ;;
+ "${srcdir}/library/xotcl/xowish") CONFIG_FILES="$CONFIG_FILES ${srcdir}/library/xotcl/xowish" ;;
+ "${srcdir}/unix/pkgIndex.unix") CONFIG_FILES="$CONFIG_FILES ${srcdir}/unix/pkgIndex.unix" ;;
"nxsh") CONFIG_FILES="$CONFIG_FILES nxsh" ;;
"nxwish") CONFIG_FILES="$CONFIG_FILES nxwish" ;;
@@ -10203,38 +10207,18 @@
fi
-chmod +x nxsh nxwish library/xotcl/xotclsh library/xotcl/xowish
+chmod +x nxsh nxwish ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish
-here=${PWD}
-
for subdir in ${subdirs}
do
echo "==================== configure $subdir"
if test x"${srcdir}" = x. ; then
confdir=.
else
- mkdir -p $subdir
+ #mkdir -p $subdir
confdir=${srcdir}/$subdir
fi
- (cd $subdir; echo $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${here}; eval $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${here})
+ (cd $subdir; echo $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${NSF_SRC_DIR}; eval $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${NSF_SRC_DIR})
done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: configure.ac
===================================================================
diff -u -r8d8e1bacda07426650fc27ae0993409e9106804c -r1c9684a6be93da0beb9e73d6ff02ed2b6f014c19
--- configure.ac (.../configure.ac) (revision 8d8e1bacda07426650fc27ae0993409e9106804c)
+++ configure.ac (.../configure.ac) (revision 1c9684a6be93da0beb9e73d6ff02ed2b6f014c19)
@@ -73,7 +73,7 @@
if ! test "$with_mongoc" = no; then
test_mongodb=test-mongdb
- subdirs="$subdirs library/mongodb"
+ subdirs="$subdirs ${srcdir}/library/mongodb"
fi
test_actiweb=""
@@ -357,17 +357,22 @@
#
# Next Scripting specific configs
#
-
#NSF_SRC_DIR=$srcdir
-NSF_SRC_DIR="`pwd`"
+#NSF_SRC_DIR="`pwd`"
+
+NSF_BUILD_DIR=${PWD}
+cd ${srcdir}
+NSF_SRC_DIR=${PWD}
+cd ${NSF_BUILD_DIR}
+
AC_SUBST([NSF_SRC_DIR])
eval "NSF_PKG_LIBDIR=\"${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}\""
AC_SUBST([NSF_PKG_LIBDIR])
if test "${TEA_PLATFORM}" != "windows" ; then
-NSF_BUILD_LIB_SPEC="-L${NSF_SRC_DIR} -lnsf${PACKAGE_VERSION}"
+NSF_BUILD_LIB_SPEC="-L${NSF_BUILD_DIR} -lnsf${PACKAGE_VERSION}"
NSF_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsf${PACKAGE_VERSION}"
# If someone wants to build without stubs, as it was the case for
@@ -380,7 +385,7 @@
else
NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
- NSF_BUILD_STUB_LIB_SPEC="-L${NSF_SRC_DIR} -lnsfstub${PACKAGE_VERSION}"
+ NSF_BUILD_STUB_LIB_SPEC="-L${NSF_BUILD_DIR} -lnsfstub${PACKAGE_VERSION}"
NSF_STUB_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsfstub${PACKAGE_VERSION}"
AC_DEFINE([COMPILE_NSF_STUBS])
fi
@@ -389,9 +394,9 @@
NSF_BUILD_LIB_SPEC="${NSF_SRC_DIR}/${PKG_LIB_FILE}"
NSF_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_LIB_FILE}"
-NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_PATH="${NSF_BUILD_DIR}/${PKG_STUB_LIB_FILE}"
NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
-NSF_BUILD_STUB_LIB_SPEC="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_SPEC="${NSF_BUILD_DIR}/${PKG_STUB_LIB_FILE}"
NSF_STUB_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
fi
@@ -429,7 +434,7 @@
dnl Change the value of -this- macro if you want to add or remove
dnl such files.
-AC_DEFUN([CONFIG_OUTPUT_FILES], [[Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/pkgIndex.unix nxsh nxwish]])
+AC_DEFUN([CONFIG_OUTPUT_FILES], [[Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish ${srcdir}/unix/pkgIndex.unix nxsh nxwish]])
#--------------------------------------------------------------------
# the value of this variable is set to the files which are to be
@@ -454,38 +459,18 @@
AC_OUTPUT
-chmod +x nxsh nxwish library/xotcl/xotclsh library/xotcl/xowish
+chmod +x nxsh nxwish ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish
-here=${PWD}
-
for subdir in ${subdirs}
do
echo "==================== configure $subdir"
if test x"${srcdir}" = x. ; then
confdir=.
else
- mkdir -p $subdir
+ #mkdir -p $subdir
confdir=${srcdir}/$subdir
fi
- (cd $subdir; echo $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${here}; eval $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${here})
+ (cd $subdir; echo $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${NSF_SRC_DIR}; eval $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-nsf=${NSF_SRC_DIR})
done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: library/mongodb/configure
===================================================================
diff -u -r9e8610ba86e16a518747bd25907d04b2aaf19dd5 -r1c9684a6be93da0beb9e73d6ff02ed2b6f014c19
--- library/mongodb/configure (.../configure) (revision 9e8610ba86e16a518747bd25907d04b2aaf19dd5)
+++ library/mongodb/configure (.../configure) (revision 1c9684a6be93da0beb9e73d6ff02ed2b6f014c19)
@@ -735,6 +735,7 @@
with_bson
with_nsf
enable_development
+enable_profile
with_tcl
with_tclinclude
enable_threads
@@ -1366,6 +1367,7 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-development build nsf with development support (intensive
runtime checking, etc.; default: disabled)
+ --enable-profile build nsf with profile support (default: disabled)
--enable-threads build with threads
--enable-shared build and link with shared libraries (default: on)
--enable-64bit enable 64bit support (default: off)
@@ -2376,6 +2378,12 @@
enable_development=no
fi
+# Check whether --enable-profile was given.
+if test "${enable_profile+set}" = set; then :
+ enableval=$enable_profile; enable_profile=$enableval
+else
+ enable_profile=no
+fi
#--------------------------------------------------------------------
Index: library/mongodb/configure.ac
===================================================================
diff -u -r9e8610ba86e16a518747bd25907d04b2aaf19dd5 -r1c9684a6be93da0beb9e73d6ff02ed2b6f014c19
--- library/mongodb/configure.ac (.../configure.ac) (revision 9e8610ba86e16a518747bd25907d04b2aaf19dd5)
+++ library/mongodb/configure.ac (.../configure.ac) (revision 1c9684a6be93da0beb9e73d6ff02ed2b6f014c19)
@@ -56,8 +56,10 @@
AS_HELP_STRING([--enable-development],
[build nsf with development support (intensive runtime checking, etc.; default: disabled)]),
[enable_development=$enableval], [enable_development=no])
+AC_ARG_ENABLE([profile],
+ AS_HELP_STRING([--enable-profile], [build nsf with profile support (default: disabled)]),
+ [enable_profile=$enableval], [enable_profile=no])
-
#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------