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
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-