diff options
| author | stu <stwo@users.sourceforge.net> | 2017-05-20 13:00:43 (GMT) |
|---|---|---|
| committer | stu <stwo@users.sourceforge.net> | 2017-05-20 13:00:43 (GMT) |
| commit | d001527f84b97b4eede78018b3f1a4947e6df764 (patch) | |
| tree | 3629b687987fea6273af299e3ab11b360aeb265d | |
| parent | aa2d779ac317135a6f5f42e61373e5701ba8cc3a (diff) | |
| parent | 5a0b86d31c2dbb1480e1692c7be6ac6944e27633 (diff) | |
| download | tk-tk_stu_pkg.zip tk-tk_stu_pkg.tar.gz tk-tk_stu_pkg.tar.bz2 | |
Merge trunk.tk_stu_pkg
| -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 e8fb0d4..9fa82e8 100755 --- a/unix/configure +++ b/unix/configure @@ -5397,12 +5397,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"], [ |