diff options
| author | das <das> | 2007-09-11 05:17:04 (GMT) |
|---|---|---|
| committer | das <das> | 2007-09-11 05:17:04 (GMT) |
| commit | e7dcc8b342311f2f9bd82343335d20b5daefec87 (patch) | |
| tree | ba0b2f2626af07d0b1f45bdb018a11579a18a355 /unix/configure | |
| parent | c6b29b12bf3680de4f95fd5d98bf69005ef1d606 (diff) | |
| download | tk-e7dcc8b342311f2f9bd82343335d20b5daefec87.zip tk-e7dcc8b342311f2f9bd82343335d20b5daefec87.tar.gz tk-e7dcc8b342311f2f9bd82343335d20b5daefec87.tar.bz2 | |
* unix/configure.in: backport of TK_INCLUDE_SPEC addition.
* unix/tkConfig.sh.in: [Bug 777203]
* unix/configure: autoconf-2.13
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 5 |
1 files changed, 5 insertions, 0 deletions
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 |