Merge branch 'master' of github.com:SAOImageDS9/SAOImageDS9

4 files changed, 91 insertions, 3 deletions

diff --git a/tclzvfs/.gitignore b/tclzvfs/.gitignore
new file mode 100644
index 0000000..a53b4c4
--- /dev/null
+++ b/tclzvfs/.gitignore
@@ -0,0 +1,34 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+
+*~
diff --git a/tclzvfs/Makefile.in b/tclzvfs/Makefile.in
index 74be53f..feebb54 100755
--- a/tclzvfs/Makefile.in
+++ b/tclzvfs/Makefile.in
@@ -158,7 +158,7 @@ PKG_CFLAGS	= @PKG_CFLAGS@
 DEFS		= @DEFS@ $(PKG_CFLAGS)
 
 # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
-CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
+CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl tclzvfsConfig.sh
 CLEANFILES	= @CLEANFILES@
 
 CPPFLAGS	= @CPPFLAGS@
@@ -407,6 +407,7 @@ install-lib-binaries: binaries
 	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
 	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
 	fi
+	$(INSTALL_DATA) tclzvfsConfig.sh $(DESTDIR)$(libdir)
 
 #========================================================================
 # Install binary executables (e.g. .exe files and dependent .dll files)
diff --git a/tclzvfs/configure b/tclzvfs/configure
index 162287b..6944eae 100755
--- a/tclzvfs/configure
+++ b/tclzvfs/configure
@@ -620,6 +620,15 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+PATCHLEVEL
+MINOR_VERSION
+MAJOR_VERSION
+tclzvfs_STUB_LIB_PATH
+tclzvfs_BUILD_STUB_LIB_PATH
+tclzvfs_STUB_LIB_SPEC
+tclzvfs_BUILD_STUB_LIB_SPEC
+tclzvfs_LIB_SPEC
+tclzvfs_BUILD_LIB_SPEC
 TCLSH_PROG
 VC_MANIFEST_EMBED_EXE
 VC_MANIFEST_EMBED_DLL
@@ -8554,12 +8563,49 @@ $as_echo "${TCLSH_PROG}" >&6; }
 #TEA_PROG_WISH
 
 #--------------------------------------------------------------------
+# These are for tclzvfsConfig.sh
+#--------------------------------------------------------------------
+
+
+    #--------------------------------------------------------------------
+    # These are for tclzvfsConfig.sh
+    #--------------------------------------------------------------------
+
+    # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+    eval pkglibdir="${libdir}/tclzvfs${PACKAGE_VERSION}"
+    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+	eval tclzvfs_LIB_FLAG="-ltclzvfs${PACKAGE_VERSION}${DBGX}"
+	eval tclzvfs_STUB_LIB_FLAG="-ltclzvfsstub${PACKAGE_VERSION}${DBGX}"
+    else
+	eval tclzvfs_LIB_FLAG="-ltclzvfs`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+	eval tclzvfs_STUB_LIB_FLAG="-ltclzvfsstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+    fi
+    tclzvfs_BUILD_LIB_SPEC="-L`pwd` ${tclzvfs_LIB_FLAG}"
+    tclzvfs_LIB_SPEC="-L${pkglibdir} ${tclzvfs_LIB_FLAG}"
+    tclzvfs_BUILD_STUB_LIB_SPEC="-L`pwd` ${tclzvfs_STUB_LIB_FLAG}"
+    tclzvfs_STUB_LIB_SPEC="-L${pkglibdir} ${tclzvfs_STUB_LIB_FLAG}"
+    tclzvfs_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
+    tclzvfs_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+#--------------------------------------------------------------------
 # Finally, substitute all of the various values into the Makefile.
 # You may alternatively have a special pkgIndex.tcl.in or other files
 # which require substituting th AC variables in.  Include these here.
 #--------------------------------------------------------------------
 
-ac_config_files="$ac_config_files Makefile pkgIndex.tcl"
+ac_config_files="$ac_config_files Makefile pkgIndex.tcl tclzvfsConfig.sh"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9270,6 +9316,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES pkgIndex.tcl" ;;
+    "tclzvfsConfig.sh") CONFIG_FILES="$CONFIG_FILES tclzvfsConfig.sh" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/tclzvfs/configure.in b/tclzvfs/configure.in
index 5a4994e..4b15adb 100755
--- a/tclzvfs/configure.in
+++ b/tclzvfs/configure.in
@@ -178,9 +178,15 @@ TEA_PROG_TCLSH
 #TEA_PROG_WISH
 
 #--------------------------------------------------------------------
+# These are for tclzvfsConfig.sh
+#--------------------------------------------------------------------
+
+TEA_EXPORT_CONFIG([tclzvfs])
+
+#--------------------------------------------------------------------
 # Finally, substitute all of the various values into the Makefile.
 # You may alternatively have a special pkgIndex.tcl.in or other files
 # which require substituting th AC variables in.  Include these here.
 #--------------------------------------------------------------------
 
-AC_OUTPUT([Makefile pkgIndex.tcl])
+AC_OUTPUT([Makefile pkgIndex.tcl tclzvfsConfig.sh])