9c121e17ff
* Tcl_Obj sharing fixed in [binary scan]
* Updated errno usage for recent glibc
* Fixed [file normalize ~unknownuser] error
* Fixed two memory leaks in VFS code
* Fixed possible infinite loop in TclFinalizeFilesystem
* Updated HP-UX 11 build libraries setup
* Unix std channels forced to exist at startup
* Stopped broken [exec] quoting of '{'
* Fixed memory leak with very long host names
* Corrected level interpretation of Tcl_CreateTrace
* Allow 64-bit configure on IRIX64-6.5*
* Several OS X/Aqua native integration improvements (scrollbar,
event generate, unicode clipboard, tk_messageBox, mousewheel event,
alpha blending for partially transparent images)
* Recognized native hand2/fleur cursors on Windows
* Post menubuttons so they stay on screen better
* Fixed crash during intra-image copy/resize
* New msg catalogs for Esperanto and Polish
* Corrections bold/italic font handling (width calculations) on Windows
* Fixed shrinking grid geometry calculations
89 lines
2.9 KiB
Text
89 lines
2.9 KiB
Text
$NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $
|
|
|
|
--- tcl.m4.orig 2004-03-01 18:04:48.000000000 -0600
|
|
+++ tcl.m4
|
|
@@ -796,6 +796,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
|
|
# Step 3: set configuration options based on system name and version.
|
|
|
|
do64bit_ok=no
|
|
+ RPATH_FLAG=""
|
|
EXTRA_CFLAGS=""
|
|
TCL_EXPORT_FILE_SUFFIX=""
|
|
UNSHARED_LIB_SUFFIX=""
|
|
@@ -1214,7 +1215,6 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
AC_CHECK_HEADER(dlfcn.h, [
|
|
# NetBSD/SPARC needs -fPIC, -fpic will not do.
|
|
SHLIB_CFLAGS="-fPIC"
|
|
- SHLIB_LD="ld -Bshareable -x"
|
|
SHLIB_LD_LIBS=""
|
|
SHLIB_SUFFIX=".so"
|
|
DL_OBJS="tclLoadDl.o"
|
|
@@ -1227,11 +1227,19 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
#ifdef __ELF__
|
|
yes
|
|
#endif
|
|
- ],
|
|
+ ], [
|
|
AC_MSG_RESULT(yes)
|
|
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
|
|
+ SHLIB_LD='${TCL_CC} -shared -Wl,-x'
|
|
+ RPATH_FLAG='-Wl,-R'
|
|
+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ ], [
|
|
AC_MSG_RESULT(no)
|
|
+ SHLIB_LD="ld -Bshareable -x"
|
|
+ RPATH_FLAG='-R'
|
|
+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
|
|
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
|
|
+ ]
|
|
)
|
|
], [
|
|
SHLIB_CFLAGS=""
|
|
@@ -1526,6 +1534,9 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
|
|
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
|
|
fi
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
ULTRIX-4.*)
|
|
SHLIB_CFLAGS="-G 0"
|
|
@@ -1710,8 +1721,8 @@ dnl AC_CHECK_TOOL(AR, ar)
|
|
|
|
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
|
|
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
|
|
- MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
|
|
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
|
|
+ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
|
|
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
|
|
else
|
|
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
|
|
|
|
@@ -2056,7 +2067,11 @@ AC_DEFUN(SC_PATH_X, [
|
|
for i in $dirs ; do
|
|
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
|
|
AC_MSG_RESULT($i)
|
|
- XLIBSW="-L$i -lX11"
|
|
+ if test "${RPATH_FLAG}" != ""; then
|
|
+ XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
|
|
+ else
|
|
+ XLIBSW="-L$i -lX11"
|
|
+ fi
|
|
x_libraries="$i"
|
|
break
|
|
fi
|
|
@@ -2065,7 +2080,11 @@ AC_DEFUN(SC_PATH_X, [
|
|
if test "$x_libraries" = ""; then
|
|
XLIBSW=-lX11
|
|
else
|
|
- XLIBSW="-L$x_libraries -lX11"
|
|
+ if test "${RPATH_FLAG}" != ""; then
|
|
+ XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
|
|
+ else
|
|
+ XLIBSW="-L$x_libraries -lX11"
|
|
+ fi
|
|
fi
|
|
fi
|
|
if test "$XLIBSW" = nope ; then
|