From 2d08a74ff84fcbf11344ac93ce88180271088797 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 4 Jan 2017 14:34:06 -0500 Subject: add Config.sh --- tkblt/Makefile.in | 1 + tkblt/configure | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- tkblt/configure.in | 8 +++++++- tkblt/tkbltConfig.sh.in | 45 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100755 tkblt/tkbltConfig.sh.in diff --git a/tkblt/Makefile.in b/tkblt/Makefile.in index 52d61da..590137f 100755 --- a/tkblt/Makefile.in +++ b/tkblt/Makefile.in @@ -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/tkblt/configure b/tkblt/configure index b41a81b..1583ad2 100755 --- a/tkblt/configure +++ b/tkblt/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/tkblt/configure.in b/tkblt/configure.in index 85a02ed..0d657e2 100755 --- a/tkblt/configure.in +++ b/tkblt/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]) diff --git a/tkblt/tkbltConfig.sh.in b/tkblt/tkbltConfig.sh.in new file mode 100755 index 0000000..5464ed6 --- /dev/null +++ b/tkblt/tkbltConfig.sh.in @@ -0,0 +1,45 @@ +# tkbltConfig.sh -- +# +# This shell script (for sh) is generated automatically by tkblt's +# configure script. It will create shell variables for most of +# the configuration options discovered by the configure script. +# This script is intended to be included by the configure scripts +# for tkblt extensions so that they don't have to figure this all +# out for themselves. This file does not duplicate information +# already provided by tclConfig.sh, so you may need to use that +# file in addition to this one. +# +# The information in this file is specific to a single platform. + +# tkblt's version number. +tkblt_VERSION='@PACKAGE_VERSION@' + +# The name of the tkblt library (may be either a .a file or a shared library): +tkblt_LIB_FILE=@PKG_LIB_FILE@ + +# String to pass to linker to pick up the tkblt library from its +# build directory. +tkblt_BUILD_LIB_SPEC='@tkblt_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the tkblt library from its +# installed directory. +tkblt_LIB_SPEC='@tkblt_LIB_SPEC@' + +# The name of the tkblt stub library (a .a file): +tkblt_STUB_LIB_FILE=@PKG_STUB_LIB_FILE@ + +# String to pass to linker to pick up the tkblt stub library from its +# build directory. +tkblt_BUILD_STUB_LIB_SPEC='@tkblt_BUILD_STUB_LIB_SPEC@' + +# String to pass to linker to pick up the tkblt stub library from its +# installed directory. +tkblt_STUB_LIB_SPEC='@tkblt_STUB_LIB_SPEC@' + +# String to pass to linker to pick up the tkblt stub library from its +# build directory. +tkblt_BUILD_STUB_LIB_PATH='@tkblt_BUILD_STUB_LIB_PATH@' + +# String to pass to linker to pick up the tkblt stub library from its +# installed directory. +tkblt_STUB_LIB_PATH='@tkblt_STUB_LIB_PATH@' -- cgit v0.12