diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/configure.in | 6 | ||||
| -rw-r--r-- | unix/tkConfig.sh.in | 12 |
4 files changed, 24 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2007-09-11 Daniel Steffen <das@users.sourceforge.net> + + * unix/configure.in: backport of TK_INCLUDE_SPEC addition. + * unix/tkConfig.sh.in: [Bug 777203] + * unix/configure: autoconf-2.13 + 2007-09-11 Pat Thoyts <patthoyts@users.sourceforge.net> * win/makefile.vc: Fix for AMD64 symbols target builds. diff --git a/unix/configure b/unix/configure index 94b8bf0..24d1db6 100755 --- a/unix/configure +++ b/unix/configure @@ -6014,6 +6014,9 @@ TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}" TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}" +# Install time header dir can be set via --includedir +eval "TK_INCLUDE_SPEC=\"-I${includedir}\"" + #------------------------------------------------------------------------ # tkConfig.sh refers to this by a different name #------------------------------------------------------------------------ @@ -6072,6 +6075,7 @@ TK_SHARED_BUILD=${SHARED_BUILD} + CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS="" @@ -6274,6 +6278,7 @@ s%@TK_STUB_LIB_FILE@%$TK_STUB_LIB_FILE%g s%@TK_STUB_LIB_FLAG@%$TK_STUB_LIB_FLAG%g s%@TK_STUB_LIB_SPEC@%$TK_STUB_LIB_SPEC%g s%@TK_STUB_LIB_PATH@%$TK_STUB_LIB_PATH%g +s%@TK_INCLUDE_SPEC@%$TK_INCLUDE_SPEC%g s%@TK_BUILD_STUB_LIB_SPEC@%$TK_BUILD_STUB_LIB_SPEC%g s%@TK_BUILD_STUB_LIB_PATH@%$TK_BUILD_STUB_LIB_PATH%g s%@TK_SRC_DIR@%$TK_SRC_DIR%g diff --git a/unix/configure.in b/unix/configure.in index 8564ef5..cf71b2e 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.83.2.41 2007/08/07 05:07:49 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.83.2.42 2007/09/11 05:17:07 das Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -534,6 +534,9 @@ TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}" TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}" +# Install time header dir can be set via --includedir +eval "TK_INCLUDE_SPEC=\"-I${includedir}\"" + #------------------------------------------------------------------------ # tkConfig.sh refers to this by a different name #------------------------------------------------------------------------ @@ -553,6 +556,7 @@ AC_SUBST(TK_STUB_LIB_FILE) AC_SUBST(TK_STUB_LIB_FLAG) AC_SUBST(TK_STUB_LIB_SPEC) AC_SUBST(TK_STUB_LIB_PATH) +AC_SUBST(TK_INCLUDE_SPEC) AC_SUBST(TK_BUILD_STUB_LIB_SPEC) AC_SUBST(TK_BUILD_STUB_LIB_PATH) diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in index f8d43f1..fd917f0 100644 --- a/unix/tkConfig.sh.in +++ b/unix/tkConfig.sh.in @@ -11,7 +11,7 @@ # # The information in this file is specific to a single platform. # -# RCS: @(#) $Id: tkConfig.sh.in,v 1.8 2002/07/28 03:23:08 mdejong Exp $ +# RCS: @(#) $Id: tkConfig.sh.in,v 1.8.2.1 2007/09/11 05:17:07 das Exp $ # Tk's version number. TK_VERSION='@TK_VERSION@' @@ -34,11 +34,11 @@ TK_LIB_FILE='@TK_LIB_FILE@' # Additional libraries to use when linking Tk. TK_LIBS='@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@' -# Top-level directory in which Tcl's platform-independent files are +# Top-level directory in which Tk's platform-independent files are # installed. TK_PREFIX='@prefix@' -# Top-level directory in which Tcl's platform-specific files (e.g. +# Top-level directory in which Tk's platform-specific files (e.g. # executables) are installed. TK_EXEC_PREFIX='@exec_prefix@' @@ -48,7 +48,7 @@ TK_XINCLUDES='@XINCLUDES@' # Linker switch(es) to use to link with the X11 library archive. TK_XLIBSW='@XLIBSW@' -# -l flag to pass to the linker to pick up the Tcl library +# -l flag to pass to the linker to pick up the Tk library TK_LIB_FLAG='@TK_LIB_FLAG@' # String to pass to linker to pick up the Tk library from its @@ -59,6 +59,10 @@ TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' # installed directory. TK_LIB_SPEC='@TK_LIB_SPEC@' +# String to pass to the compiler so that an extension can +# find installed Tk headers. +TK_INCLUDE_SPEC='@TK_INCLUDE_SPEC@' + # Location of the top-level source directory from which Tk was built. # This is the directory that contains a README file as well as # subdirectories such as generic, unix, etc. If Tk was compiled in a |