Differences From Artifact [e980cfaf2c]:
- File
kitsh/buildsrc/kitsh-0.0/aclocal.m4
— part of check-in
[b84f59e5de]
at
2010-09-26 04:40:31
on branch trunk
— Fixed issue with Tcl 8.5 and up cross-compile installation
Fixed check for no Tk libs to exclude stubs in the check, but include it in the linking (user: rkeene, size: 4612) [annotate] [blame] [check-ins using]
To Artifact [91d2c06e40]:
- File
kitsh/buildsrc/kitsh-0.0/aclocal.m4
— part of check-in
[8ef7a1eb1a]
at
2010-09-26 04:40:40
on branch trunk
— Updated to statically link against libstdc++ on HP/UX
Added patch to metakit to not call "autoconf"
Fixed issue with sh on HP/UX (source versus ".")
Added support for statically linking to libgcc (user: rkeene, size: 5324) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
28 29 30 31 32 33 34 |
fi
else
tclconfigshdir="${with_tcl}"
tclconfigsh="${tclconfigshdir}/tclConfig.sh"
fi
if test -f "${tclconfigsh}"; then
| | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
fi
else
tclconfigshdir="${with_tcl}"
tclconfigsh="${tclconfigshdir}/tclConfig.sh"
fi
if test -f "${tclconfigsh}"; then
. "${tclconfigsh}"
CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
LDFLAGS="${LDFLAGS}"
LIBS="${LIBS} ${TCL_LIBS}"
fi
|
| ︙ | ︙ | |||
78 79 80 81 82 83 84 |
fi
else
tkconfigshdir="${with_tk}"
tkconfigsh="${tkconfigshdir}/tkConfig.sh"
fi
if test -f "${tkconfigsh}"; then
| | > > > > | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
fi
else
tkconfigshdir="${with_tk}"
tkconfigsh="${tkconfigshdir}/tkConfig.sh"
fi
if test -f "${tkconfigsh}"; then
. "${tkconfigsh}"
CFLAGS="${CFLAGS} ${TK_INCLUDE_SPEC} -I${TK_SRC_DIR}/generic -I${tkconfigshdir}"
CPPFLAGS="${CPPFLAGS} ${TK_INCLUDE_SPEC} -I${TK_SRC_DIR}/generic -I${tkconfigshdir}"
LDFLAGS="${LDFLAGS}"
LIBS="${LIBS} ${TK_LIBS}"
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
AC_MSG_RESULT([$tkconfigsh])
])
AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
AC_MSG_CHECKING([for how to statically link to libstdc++])
SAVELIBS="${LIBS}"
staticlibcxx=""
dnl HP/UX uses -Wl,-a,archive -lstdc++ -Wl,-a,shared_archive
dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic
dnl
dnl Sun Studio uses -lCstd -lCrun, most platforms use -lstdc++
for trylink in "-Wl,-a,archive -lstdc++ -Wl,-a,shared_archive" "-Wl,-Bstatic -lCstd -lCrun -Wl,-Bdynamic" "-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic" "-lCstd -lCrun" "-lstdc++"; do
LIBS="${SAVELIBS} ${trylink}"
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
staticlibcxx="${trylink}"
break
])
|
| ︙ | ︙ | |||
169 170 171 172 173 174 175 176 |
AC_DEFINE(BUILD_tcl, [1], [Define if you need to pretend to be building Tcl (Windows)])
AC_DEFINE(BUILD_tk, [1], [Define if you need to pretend to be building Tk (Windows)])
;;
cygwin*)
CFLAGS="${CFLAGS} -mms-bitfields"
;;
esac
])
| > > > > > > > > > > > > > > > > > > > > > > > | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 |
AC_DEFINE(BUILD_tcl, [1], [Define if you need to pretend to be building Tcl (Windows)])
AC_DEFINE(BUILD_tk, [1], [Define if you need to pretend to be building Tk (Windows)])
;;
cygwin*)
CFLAGS="${CFLAGS} -mms-bitfields"
;;
esac
])
AC_DEFUN(DC_STATIC_LIBGCC, [
AC_MSG_CHECKING([how to link statically against libgcc])
SAVELDFLAGS="${LDFLAGS}"
staticlibgcc=""
for trylink in "-static-libgcc"; do
LDFLAGS="${SAVELDFLAGS} ${trylink}"
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [
staticlibgcc="${trylink}"
break
])
done
if test -n "${staticlibgcc}"; then
LDFLAGS="${SAVELDFLAGS} ${staticlibgcc}"
AC_MSG_RESULT([${staticlibgcc}])
else
LDFLAGS="${SAVELDFLAGS}"
AC_MSG_RESULT([not needed])
fi
])
|