deleting native Python from configure xml

[tools/install.git] / config_files / tcltk-8.4.5.sh

diff --git a/config_files/tcltk-8.4.5.sh b/config_files/tcltk-8.4.5.sh
index 934b879222bd6cd0930843c7d6867ed05703a292..5e1929b3c6e506f1e54d6e7f6e777873093818a4 100755 (executable)
--- a/config_files/tcltk-8.4.5.sh
+++ b/config_files/tcltk-8.4.5.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
+VERSION="8.4"
+
 check_version()
 {
-VERSION="8.4"
 if [ -z "$TCLHOME" ]; then
    echo "TCLHOME doesn't set"
    return 1
@@ -46,7 +47,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -70,7 +71,7 @@ if [ -n "${tclhome}" ] ; then
 export TCLHOME=${tclhome}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
     (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -116,9 +117,9 @@ Installing tcl...
 EOF
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-(cd ${PRODUCT_DIR}/bin; ln -s tclsh8.4 tclsh)
-(cd ${PRODUCT_DIR}/lib; ln -s libtcl8.4.so libtcl.so)
-(cd ${PRODUCT_DIR}/lib; ln -s libtclstub8.4.a libtclstub.a)
+(cd ${PRODUCT_DIR}/bin; ln -fs tclsh8.4 tclsh)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtcl8.4.so libtcl.so)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtclstub8.4.a libtclstub.a)
 
 check_jb tar xfz ${SOURCE_DIR}/tk8.4.5.tar.gz -C ${INSTALL_WORK}
 cd ${INSTALL_WORK}/tk8.4.5/unix
@@ -128,7 +129,7 @@ Configuring tk...
 -------------------
 EOF
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads \
-    --prefix=${PRODUCT_DIR} 
+    --prefix=${PRODUCT_DIR} --with-tcl=${PRODUCT_DIR}/lib
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 -------------------
 Making tk...
@@ -142,11 +143,23 @@ Installing tk...
 EOF
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-(cd ${PRODUCT_DIR}/bin; ln -s wish8.4 wish)
-(cd ${PRODUCT_DIR}/lib; ln -s libtk8.4.so libtk.so)
-(cd ${PRODUCT_DIR}/lib; ln -s libtkstub8.4.a libtkstub.a)
+(cd ${PRODUCT_DIR}/bin; ln -fs wish8.4 wish)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtk8.4.so libtk.so)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtkstub8.4.a libtkstub.a)
 
 check_jb tar xfz ${SOURCE_DIR}/tclx8.3.5.tar.gz -C ${INSTALL_WORK}
+
+#vsr: patch tclx 8.3.5 to make it compiliable on Mandriva 2006.0
+cd ${INSTALL_WORK}/tclx8.3.5/unix
+mv Common.mk.in Common.mk.in.orig
+sed -e 's/@DEFS@/-DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void/g' Common.mk.in.orig > Common.mk.in
+cd ${INSTALL_WORK}/tclx8.3.5/tcl/unix
+mv tclxConfig.sh.in tclxConfig.sh.in.orig
+sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tclxConfig.sh.in.orig > tclxConfig.sh.in
+cd ${INSTALL_WORK}/tclx8.3.5/tk/unix
+mv tkxConfig.sh.in tkxConfig.sh.in.orig
+sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tkxConfig.sh.in.orig > tkxConfig.sh.in
+
 cd ${INSTALL_WORK}/tclx8.3.5/unix
 #VRV - bug in a tclx configure 
 chmod +w ./configure
@@ -160,7 +173,7 @@ Configuring tclx...
 EOF
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
     ./configure --enable-gcc --enable-shared --enable-threads \
-    --prefix=${PRODUCT_DIR}
+    --prefix=${PRODUCT_DIR}  --with-tcl=${PRODUCT_DIR}/lib  --with-tk=${PRODUCT_DIR}/lib
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 -------------------
 Making tclx...
@@ -174,10 +187,10 @@ Installing tclx...
 EOF
 check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install-exec
 
-(cd ${PRODUCT_DIR}/lib; ln -s libtclx8.3.so libtclx.so)
-(cd ${PRODUCT_DIR}/lib; ln -s libtclx8.3.a  libtclx.a)
-(cd ${PRODUCT_DIR}/lib; ln -s libtkx8.3.so  libtkx.so)
-(cd ${PRODUCT_DIR}/lib; ln -s libtkx8.3.a   libtkx.a)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtclx8.3.so libtclx.so)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtclx8.3.a  libtclx.a)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.so  libtkx.so)
+(cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.a   libtkx.a)
 
 #du -sk ${INSTALL_WORK}/tcl8.4.5 > ${PRODUCT_DIR}/size.log
 #du -sk ${INSTALL_WORK}/tk8.4.5 >> ${PRODUCT_DIR}/size.log