From: <ro...@us...> - 2012-12-26 20:42:43
|
Revision: 2055 http://sourceforge.net/p/nsclspectcl/code/2055 Author: ron-fox Date: 2012-12-26 20:42:38 +0000 (Wed, 26 Dec 2012) Log Message: ----------- Placeholder for autoconf Modified Paths: -------------- branches/SpecTcl-3.3-013/CHANGELOG branches/SpecTcl-3.3-013/configure.ac Added Paths: ----------- branches/SpecTcl-3.3-013/m4/ Modified: branches/SpecTcl-3.3-013/CHANGELOG =================================================================== --- branches/SpecTcl-3.3-013/CHANGELOG 2012-12-26 20:35:18 UTC (rev 2054) +++ branches/SpecTcl-3.3-013/CHANGELOG 2012-12-26 20:42:38 UTC (rev 2055) @@ -988,3 +988,4 @@ - July 24, 2012 - Use 64bit clean DataFormat.h (time_t -> uint32_t). 3.3-012 - Issue #1322 - Add product name to VERSION file e.g. SpecTcl- +3.3-013 Modified: branches/SpecTcl-3.3-013/configure.ac =================================================================== --- branches/SpecTcl-3.3-013/configure.ac 2012-12-26 20:35:18 UTC (rev 2054) +++ branches/SpecTcl-3.3-013/configure.ac 2012-12-26 20:42:38 UTC (rev 2055) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-012) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-013) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-12-27 13:04:48
|
Revision: 2057 http://sourceforge.net/p/nsclspectcl/code/2057 Author: ron-fox Date: 2012-12-27 13:04:43 +0000 (Thu, 27 Dec 2012) Log Message: ----------- Remove gri from SpecTcl build Modified Paths: -------------- branches/SpecTcl-3.3-013/configure.ac Removed Paths: ------------- branches/SpecTcl-3.3-013/gri-2.12.20/ Modified: branches/SpecTcl-3.3-013/configure.ac =================================================================== --- branches/SpecTcl-3.3-013/configure.ac 2012-12-26 21:05:30 UTC (rev 2056) +++ branches/SpecTcl-3.3-013/configure.ac 2012-12-27 13:04:43 UTC (rev 2057) @@ -17,10 +17,6 @@ SOVERSION="3:2" # -# This symbol describes where the bundled Gri graphics package lives. -# Gri is used to help Xamine do printing. -# -MYGRIDIR="gri-2.12.20" # Checks for programs. @@ -744,14 +740,7 @@ [gri_dir="/usr/local/bin"; gri_found="yes"]) fi - # Installed with SpecTcl: -if test $gri_found = "no" ; then - AC_CHECK_FILE([$prefix/share/gri], - [gri_dir=$prefix/bin; - gri_found="yes"]) -fi - # I give up at this point, if necessary the Gri packaged with SpecTcl is # configured here and built. if test $gri_found = "yes" ; then @@ -759,28 +748,8 @@ mygri="no" GRI="" else - # - # Configure GRI and build it into SpecTcl's directories: - AC_MSG_NOTICE([Cannot find GRI so I'll build my copy of it]) - # - - # this so CXX etc. propagates at the risk we wind up stranded - # in the Gri directory on failure or ^C - # - - (cd ${MYGRIDIR}; \ - rm -f Makefile; \ - ./configure --prefix=$prefix ; \ - make ;\ - make install ;\ - ) - AC_MSG_NOTICE([Now that GRI is build I know where I put stuff]) - - gri_dir=$prefix/bin - mygri="yes" - gri_found="yes" - GRI="" - + AC_MSG_WARNING([Can't find installed gri. If it's installed use --with-gri-dir to tell me where it is +Without gri, you will not be able to generate printed/postscript spectra]) fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-12-31 21:23:39
|
Revision: 2061 http://sourceforge.net/p/nsclspectcl/code/2061 Author: ron-fox Date: 2012-12-31 21:23:37 +0000 (Mon, 31 Dec 2012) Log Message: ----------- Final commit before merge with trunk Modified Paths: -------------- branches/SpecTcl-3.3-013/configure.ac branches/SpecTcl-3.3-013/treegui/treemenuWidget.tcl Modified: branches/SpecTcl-3.3-013/configure.ac =================================================================== --- branches/SpecTcl-3.3-013/configure.ac 2012-12-31 21:22:10 UTC (rev 2060) +++ branches/SpecTcl-3.3-013/configure.ac 2012-12-31 21:23:37 UTC (rev 2061) @@ -15,7 +15,7 @@ # define the version information in shared # images. -SOVERSION="3:2" +SOVERSION="3:3" # # Checks for programs. @@ -115,6 +115,8 @@ # Locate the X11 header files and the X11 library archive. Try the # ac_path_x macro first, but if it doesn't find the X stuff then check # a list of possible directories. +# Assume that if the stuff is in the 'normal places' it doesn't need any +# -rpath-ing. AC_PATH_X AC_PATH_XTRA @@ -169,7 +171,7 @@ # /sw/include (Darwin lesstif). # /usr/local/include (default lesstif installation). # - +# # If in /usr/include we don't need anything: @@ -214,12 +216,16 @@ # /usr/lib (e.g. OSF1). # /sw/lib (Darwin lesstif installation). # /usr/local/lesstif/lib (normal lesstif install wo links?). +# +# In this case assume we need an -rpath unless the extension is .dylib in which case +# it's OS-X which doesn't require that sort of frippery. # libexts=".so .dylib .a" # prefer shared libs to static. motiflibdirs="/usr/X11/lib /usr/X11R6/lib /sw/lib /usr/local/lesstif/lib /usr/lib" motif_libdir="" motif_lib_found="no" +Motif_Rpath="" AC_MSG_CHECKING([for libXm]) AC_ARG_WITH(motif-lib, @@ -230,35 +236,49 @@ # If necessary, try in $x_libraries: + for ext in $libexts do - if test $motif_lib_found = "no" - then - if "$x_libraries" != "" - then + if test "$x_libraries" != "" + then AC_CHECK_FILE([$x_libraries/libXm${ext}], -x [motif_lib_found="yes"]) + [motif_lib_found="yes"]) else AC_CHECK_FILE([/usr/lib/libXm${ext}], [motif_lib_found="yes"]) - fi + fi + + # If found break from the loop: + + if test $motif_lib_found = "yes" + then + break fi done # If necessary try in the list of good directories: +# Note that .so's require -rpath. +if test $motif_lib_found = "no" +then for lib in $motiflibdirs do for ext in $libexts do - if test $motif_lib_found = "no" - then AC_CHECK_FILE([$lib/libXm${ext}], [motif_lib_found="yes" motif_libdir="$lib"]) + if test $motif_lib_found = "yes" + then + if test $ext = ".so" + then + Motif_Rpath="-Wl,\"-rpath=$lib\"" + fi + break fi done done +fi # If found set MOTIF_LIBSW accordingly. Note this will be # empty if found in with the x libraries. @@ -271,7 +291,7 @@ AC_MSG_RESULT([Found libXm in $x_libraries]) else AC_MSG_RESULT([Found libXm in $motif_libdir]) - MOTIF_LIBSW="-L$motif_libdir" + MOTIF_LIBSW="-L$motif_libdir $Motif_Rpath" fi else AC_MSG_ERROR([Can't fine libXm give me a hand with --with-motif-lib]) @@ -564,6 +584,7 @@ # searched first. # ASSUMPTIONS: libtcl and libtk will have the same naming conventions. # +# If the extension ofthe library is .so, always put in an -rpath directive. tcl_libsearchpath="" tcl_libfound="no" @@ -590,22 +611,33 @@ for file in ${tcl_libfiles} do fname=$dir/$file - if test $tcl_libfound = "no" - then AC_CHECK_FILE($fname, [tcl_libdir=$dir tcl_libname=$file tcl_libfound="yes" ]) + if test $tcl_libfound = "yes" + then + break fi done done if test $tcl_libfound = "yes" ; then - # Find the lib basename: + # + # We need an -rpath if the library is a .so: - + base=$(basename "$tcl_libname") + ext="${base##*.}" + Tcl_Rpath="" + if test $ext = "so" + then + Tcl_Rpath="-Wl,\"-rpath=${tcl_libdir}\"" + fi + + # Find the lib basename + tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib # The suffix now is either .so, .dylib or .a; basename can get rid of that: @@ -616,7 +648,9 @@ # just replace the tcl with tk. 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}" + + + TCL_LDFLAGS="-L${tcl_libdir} -l${tk_libname} -l${tcl_libname} ${Tcl_Rpath}" AC_MSG_RESULT([Using directory $tcl_libdir]) else @@ -690,6 +724,13 @@ if test -e $gdlibdir/libgd.a then GDLDSW="-L$gdlibdir -lgd" + + # if there's an .so then we'll ned an -rpath: + + if test -e $gdlibdir/libgd.so + then + GDLDSW="${GDLDSW} -Wl,\"-rpath=${gdlibdir}\"" + fi else AC_MSG_ERROR([ User provided --with-gd-libdir=$gdlibdir does not contain libgd.a]) fi Modified: branches/SpecTcl-3.3-013/treegui/treemenuWidget.tcl =================================================================== --- branches/SpecTcl-3.3-013/treegui/treemenuWidget.tcl 2012-12-31 21:22:10 UTC (rev 2060) +++ branches/SpecTcl-3.3-013/treegui/treemenuWidget.tcl 2012-12-31 21:23:37 UTC (rev 2061) @@ -99,7 +99,7 @@ # this is handled correctly (by having a terminal and a cascade node with the same labels. # - # Step 1 - create an array whose indices are the set of meny items we must have at this + # Step 1 - create an array whose indices are the set of menu items we must have at this # level and whose elements are the entries at and below this node. # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |