Overview
Comment: | Updated to try to link statically to zlib |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 580c83353268f42b41ee8c397819aba1fcd8f112 |
User & Date: | rkeene on 2010-09-26 04:42:52 |
Other Links: | manifest | tags |
Context
2010-09-26
| ||
04:42 | KitCreator 0.2.4.x check-in: 49e8ab0bae user: rkeene tags: trunk, 0.2.4 | |
04:42 | Updated to try to link statically to zlib check-in: 580c833532 user: rkeene tags: trunk | |
04:42 | Added back safe successful exits check-in: baaf0c5896 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [bc43649110] to [e537bcd01c].
90 90 AC_SUBST(CFLAGS) 91 91 AC_SUBST(CPPFLAGS) 92 92 AC_SUBST(LIBS) 93 93 94 94 AC_MSG_RESULT([$tkconfigsh]) 95 95 ]) 96 96 97 -AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [ 98 - AC_MSG_CHECKING([for how to statically link to libstdc++]) 97 +AC_DEFUN(DC_DO_STATIC_LINK_LIB, [ 98 + AC_MSG_CHECKING([for how to statically link to $1]) 99 99 100 100 SAVELIBS="${LIBS}" 101 - staticlibcxx="" 101 + staticlib="" 102 + found="0" 102 103 dnl HP/UX uses -Wl,-a,archive -lstdc++ -Wl,-a,shared_archive 103 104 dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic 104 - dnl 105 - dnl Sun Studio uses -lCstd -lCrun, most platforms use -lstdc++ 106 - 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 105 + for trylink in "-Wl,-a,archive $2 -Wl,-a,shared_archive" "-Wl,-Bstatic $2 -Wl,-Bdynamic" "$2"; do 107 106 LIBS="${SAVELIBS} ${trylink}" 108 107 109 108 AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ 110 - staticlibcxx="${trylink}" 109 + staticlib="${trylink}" 110 + found="1" 111 111 112 112 break 113 113 ]) 114 114 done 115 - LIBS="${SAVELIBS} ${staticlibcxx}" 116 115 117 - AC_MSG_RESULT([${staticlibcxx}]) 116 + if test "${found}" = "1"; then 117 + LIBS="${SAVELIBS} ${staticlib}" 118 118 119 - AC_SUBST(LIBS) 119 + AC_MSG_RESULT([${staticlib}]) 120 + 121 + AC_SUBST(LIBS) 122 + 123 + $3 124 + else 125 + LIBS="${SAVELIBS}" 126 + 127 + AC_MSG_RESULT([cant]) 128 + 129 + $4 130 + fi 131 +]) 132 + 133 +AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [ 134 + dnl Sun Studio uses -lCstd -lCrun, most platforms use -lstdc++ 135 + DC_DO_STATIC_LINK_LIB([C++ Library (Sun Studio)], [-lCstd -lCrun],, [ 136 + DC_DO_STATIC_LINK_LIB([C++ Library (UNIX)], [-lstdc++]) 137 + ]) 120 138 ]) 121 139 122 140 AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ 123 141 DC_SETUP_TCL_PLAT_DEFS 124 142 125 143 for proj in mk4tcl tcl tclvfs tk; do 126 144 AC_MSG_CHECKING([for libraries required for ${proj}])
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [af02db7477] to [dc10e35060].
28 28 LIBS="${SAVE_LIBS}" 29 29 30 30 dnl Find zlib 31 31 AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [ 32 32 CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}" 33 33 LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}" 34 34 ]) 35 -AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ]) 35 +DC_DO_STATIC_LINK_LIB(zlib, -lz,, [ 36 + DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [ 37 + AC_SEARCH_LIBS(inflate, z zlib,, [ 38 + AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) 39 + ]) 40 + ]) 41 +]) 36 42 37 43 dnl Produce output 38 44 AC_OUTPUT(Makefile)