From: <ro...@us...> - 2003-10-31 17:39:11
|
Update of /cvsroot/nscldaq/clients In directory sc8-pr-cvs1:/tmp/cvs-serv27732 Modified Files: configure.in Log Message: - fix --with-tcl-header-dir so that it no longer adds an extraneous , to the end of the -I string. - Fix the TCL_LDFLAGS determination to properly generate the -llibtcl??? regardless of the actual library type (.s or .so). Index: configure.in =================================================================== RCS file: /cvsroot/nscldaq/clients/configure.in,v retrieving revision 3.6 retrieving revision 3.7 diff -C2 -d -r3.6 -r3.7 *** configure.in 16 Sep 2003 12:11:55 -0000 3.6 --- configure.in 31 Oct 2003 17:39:08 -0000 3.7 *************** *** 155,159 **** AC_ARG_WITH(tcl-header-dir, [ --with-tcl-header-dir=path Path to tcl headers], ! [tcl_header_dir=$withval, tcl_headers_found="yes"],[tcl_headers_found="no"]) --- 155,159 ---- AC_ARG_WITH(tcl-header-dir, [ --with-tcl-header-dir=path Path to tcl headers], ! [tcl_header_dir=$withval tcl_headers_found="yes"],[tcl_headers_found="no"]) *************** *** 254,258 **** tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib ! tcl_libname=$(echo $tcl_libname|cut -c -$(expr length $tcl_libname - 2)) tk_libname=tk$(echo $tcl_libname|cut -c 4-) # trim off tc...and use tk TCL_LDFLAGS="-L${tcl_libdir} -l${tk_libname} -l${tcl_libname}" --- 254,262 ---- tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib ! # ! # Use basename to trim of the .a or .so: ! # ! ! tcl_libname=$(basename $(basename $tcl_libname .a) .so) tk_libname=tk$(echo $tcl_libname|cut -c 4-) # trim off tc...and use tk TCL_LDFLAGS="-L${tcl_libdir} -l${tk_libname} -l${tcl_libname}" |