diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-03 14:32:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-03 14:32:01 (GMT) |
| commit | 2dd83ab46b70e46cdb3ab9f1f4d2ecfa28d70325 (patch) | |
| tree | 0eef56a4b8bba42bc60e7b17b229ab65c891c518 | |
| parent | b7ae0abaef7c4c750b7f565a3d012f3c0b4353c2 (diff) | |
| download | tk-2dd83ab46b70e46cdb3ab9f1f4d2ecfa28d70325.zip tk-2dd83ab46b70e46cdb3ab9f1f4d2ecfa28d70325.tar.gz tk-2dd83ab46b70e46cdb3ab9f1f4d2ecfa28d70325.tar.bz2 | |
last-moment fix for FreeBSD from Pietro Cerutti
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rwxr-xr-x | unix/tcl.m4 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure index 6f3ca9a..97718d5 100755 --- a/unix/configure +++ b/unix/configure @@ -2926,14 +2926,14 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" - TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@" + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="" if test $doRpath = yes ; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi if test "${TCL_THREADS}" = "1" ; then # The -pthread needs to go in the LDFLAGS, not LIBS diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 85b8f82..45d19ae 100755 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1564,14 +1564,14 @@ dnl AC_CHECK_TOOL(AR, ar) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" - TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]" + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="" if test $doRpath = yes ; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi if test "${TCL_THREADS}" = "1" ; then # The -pthread needs to go in the LDFLAGS, not LIBS |