summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-01-04 19:50:34 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-01-04 19:50:34 (GMT)
commit06305cc1f8e14272596be1e1572b1d8ccb608aa7 (patch)
tree326afc1b067a3cd6d0886fd1205242721db9d69a
parentc805970300d095b4a9ebe390f125c95430d3b80a (diff)
downloadblt-06305cc1f8e14272596be1e1572b1d8ccb608aa7.zip
blt-06305cc1f8e14272596be1e1572b1d8ccb608aa7.tar.gz
blt-06305cc1f8e14272596be1e1572b1d8ccb608aa7.tar.bz2
add Config.sh
-rwxr-xr-xMakefile.in3
-rwxr-xr-xconfigure49
-rwxr-xr-xconfigure.in8
3 files changed, 57 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 52d61da..ae9286a 100755
--- a/Makefile.in
+++ b/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 tkbltConfig.sh
CLEANFILES = @CLEANFILES@
CPPFLAGS = @CPPFLAGS@
@@ -414,6 +414,7 @@ install-lib-binaries: binaries
echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
fi
+ $(INSTALL_DATA) tkbltConfig.sh $(DESTDIR)$(libdir)
#========================================================================
# Install binary executables (e.g. .exe files and dependent .dll files)
diff --git a/configure b/configure
index b41a81b..1583ad2 100755
--- a/configure
+++ b/configure
@@ -620,6 +620,15 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
+PATCHLEVEL
+MINOR_VERSION
+MAJOR_VERSION
+tkblt_STUB_LIB_PATH
+tkblt_BUILD_STUB_LIB_PATH
+tkblt_STUB_LIB_SPEC
+tkblt_BUILD_STUB_LIB_SPEC
+tkblt_LIB_SPEC
+tkblt_BUILD_LIB_SPEC
WISH_PROG
TCLSH_PROG
VC_MANIFEST_EMBED_EXE
@@ -9450,12 +9459,49 @@ $as_echo "${WISH_PROG}" >&6; }
#--------------------------------------------------------------------
+# These are for tkbltConfig.sh
+#--------------------------------------------------------------------
+
+
+ #--------------------------------------------------------------------
+ # These are for tkbltConfig.sh
+ #--------------------------------------------------------------------
+
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/tkblt${PACKAGE_VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ eval tkblt_LIB_FLAG="-ltkblt${PACKAGE_VERSION}${DBGX}"
+ eval tkblt_STUB_LIB_FLAG="-ltkbltstub${PACKAGE_VERSION}${DBGX}"
+ else
+ eval tkblt_LIB_FLAG="-ltkblt`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+ eval tkblt_STUB_LIB_FLAG="-ltkbltstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+ fi
+ tkblt_BUILD_LIB_SPEC="-L`pwd` ${tkblt_LIB_FLAG}"
+ tkblt_LIB_SPEC="-L${pkglibdir} ${tkblt_LIB_FLAG}"
+ tkblt_BUILD_STUB_LIB_SPEC="-L`pwd` ${tkblt_STUB_LIB_FLAG}"
+ tkblt_STUB_LIB_SPEC="-L${pkglibdir} ${tkblt_STUB_LIB_FLAG}"
+ tkblt_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
+ tkblt_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 tkbltConfig.sh"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -10166,6 +10212,7 @@ do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES pkgIndex.tcl" ;;
+ "tkbltConfig.sh") CONFIG_FILES="$CONFIG_FILES tkbltConfig.sh" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/configure.in b/configure.in
index 85a02ed..0d657e2 100755
--- a/configure.in
+++ b/configure.in
@@ -230,9 +230,15 @@ TEA_PROG_TCLSH
TEA_PROG_WISH
#--------------------------------------------------------------------
+# These are for tkbltConfig.sh
+#--------------------------------------------------------------------
+
+TEA_EXPORT_CONFIG([tkblt])
+
+#--------------------------------------------------------------------
# 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 tkbltConfig.sh])