diff options
| author | stu <stwo@users.sourceforge.net> | 2017-05-20 12:49:55 (GMT) |
|---|---|---|
| committer | stu <stwo@users.sourceforge.net> | 2017-05-20 12:49:55 (GMT) |
| commit | 5a0b86d31c2dbb1480e1692c7be6ac6944e27633 (patch) | |
| tree | 1f5ef058592815e48447f97a230d23a146aa5fed /unix | |
| parent | 8f56293a6faf629fa90092d966ad634247c76389 (diff) | |
| download | tk-5a0b86d31c2dbb1480e1692c7be6ac6944e27633.zip tk-5a0b86d31c2dbb1480e1692c7be6ac6944e27633.tar.gz tk-5a0b86d31c2dbb1480e1692c7be6ac6944e27633.tar.bz2 | |
Fix build on OpenBSD. [3439d04a] missed a couple of bits.
Tcl/Tk's tcl.m4 isn't identical to TEA's tcl.m4 - be careful!
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure index a02e8c4..cf04ea2 100755 --- a/unix/configure +++ b/unix/configure @@ -5367,12 +5367,14 @@ fi esac SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" if test $doRpath = yes; then : CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' LDFLAGS="-Wl,-export-dynamic" CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a69715d..559d8f3 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1476,10 +1476,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ esac SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' LDFLAGS="-Wl,-export-dynamic" CFLAGS_OPTIMIZE="-O2" AS_IF([test "${TCL_THREADS}" = "1"], [ |