diff options
Diffstat (limited to 'unix')
-rwxr-xr-x | unix/configure | 10 | ||||
-rw-r--r-- | unix/configure.in | 4 | ||||
-rw-r--r-- | unix/tk.spec | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/unix/configure b/unix/configure index e9b009e..119e912 100755 --- a/unix/configure +++ b/unix/configure @@ -1279,7 +1279,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL="a0" +TK_PATCH_LEVEL="a1" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb es fr it nl ru" @@ -4220,6 +4220,12 @@ fi LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi + if test "$GCC" = "yes" ; then + SHLIB_LD="gcc -shared" + SHLIB_LD_LIBS='${LIBS}' + LD_SEARCH_FLAGS='' + CC_SEARCH_FLAGS='' + fi # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc #EXTRA_CFLAGS="+DAportable" @@ -4233,7 +4239,7 @@ fi # 64-bit gcc in use. Fix flags for GNU ld. do64bit_ok=yes SHLIB_LD="gcc -shared" - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' LD_SEARCH_FLAGS='' CC_SEARCH_FLAGS='' ;; diff --git a/unix/configure.in b/unix/configure.in index 8861f3f..662b059 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.92 2003/11/12 01:10:40 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.93 2004/03/02 00:49:13 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.57) @@ -11,7 +11,7 @@ AC_PREREQ(2.57) TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL="a0" +TK_PATCH_LEVEL="a1" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb es fr it nl ru" diff --git a/unix/tk.spec b/unix/tk.spec index befe1af..6fe28fe 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,7 +1,7 @@ -# $Id: tk.spec,v 1.16 2003/03/04 23:50:45 dgp Exp $ +# $Id: tk.spec,v 1.17 2004/03/02 00:49:13 hobbs Exp $ # This file is the basis for a binary Tk Linux RPM. -%define version 8.5a0 +%define version 8.5a1 %define directory /usr/local Summary: Tk graphical toolkit for the Tcl scripting language. @@ -14,7 +14,7 @@ Source: http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz URL: http://www.tcl.tk/ Packager: Carina Buildroot: /var/tmp/%{name}%{version} -Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.5a0 +Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.5a1 %description The Tcl (Tool Command Language) provides a powerful platform for |