Overview
| Comment: | Cleaned up LDFLAGS settings
Fixed issue with "--with-zlib" wiping out LDFLAGS |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
56c3d5d0227e83f0855fad4ee62f790c |
| User & Date: | rkeene on 2010-09-26 04:40:43 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:40 |
Added zlib package
Added support for specifying --with-zlib to kitsh if zlib built fine check-in: e95acf08f0 user: rkeene tags: trunk | |
| 04:40 |
Cleaned up LDFLAGS settings
Fixed issue with "--with-zlib" wiping out LDFLAGS check-in: 56c3d5d022 user: rkeene tags: trunk | |
| 04:40 |
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 check-in: 8ef7a1eb1a user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [91d2c06e40] to [0394137fa9].
| ︙ | ︙ | |||
32 33 34 35 36 37 38 |
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}"
| < < | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
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}"
LIBS="${LIBS} ${TCL_LIBS}"
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LIBS)
AC_MSG_RESULT([$tclconfigsh])
])
AC_DEFUN(DC_DO_TK, [
AC_MSG_CHECKING([path to tk])
|
| ︙ | ︙ | |||
82 83 84 85 86 87 88 |
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}"
| < < | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 |
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}"
LIBS="${LIBS} ${TK_LIBS}"
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LIBS)
AC_MSG_RESULT([$tkconfigsh])
])
AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
AC_MSG_CHECKING([for how to statically link to libstdc++])
|
| ︙ | ︙ | |||
196 197 198 199 200 201 202 203 |
LDFLAGS="${SAVELDFLAGS} ${staticlibgcc}"
AC_MSG_RESULT([${staticlibgcc}])
else
LDFLAGS="${SAVELDFLAGS}"
AC_MSG_RESULT([not needed])
fi
])
| > | 192 193 194 195 196 197 198 199 200 |
LDFLAGS="${SAVELDFLAGS} ${staticlibgcc}"
AC_MSG_RESULT([${staticlibgcc}])
else
LDFLAGS="${SAVELDFLAGS}"
AC_MSG_RESULT([not needed])
fi
AC_SUBST(LDFLAGS)
])
|
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [d4c560883c] to [af02db7477].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 |
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"
dnl Find zlib
AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
| | | 26 27 28 29 30 31 32 33 34 35 36 37 38 |
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"
dnl Find zlib
AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
])
AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
dnl Produce output
AC_OUTPUT(Makefile)
|