Menu
▾
▴
[Nsclspectcl-cvscommits] SpecTcl Makefile.am,1.1.2.3,1.1.2.4 Makefile.in,1.1.2.3,1.1.2.4 config.h.in,1.1.2.1,1.1.2.2 configure,1.1.2.6,1.1.2.7 configure.in,1.1.2.4,1.1.2.5
Update of /cvsroot/nsclspectcl/SpecTcl
In directory sc8-pr-cvs1:/tmp/cvs-serv25929
Modified Files:
Tag: SpecTcl-2-0-001-fix
Makefile.am Makefile.in config.h.in configure configure.in
Log Message:
Added more functionality to the autotools stuff. This revision is known to compile and run on Linux, Tru64, and Cygwin.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Attic/Makefile.am,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Makefile.am 10 Apr 2003 15:17:49 -0000 1.1.2.3
--- Makefile.am 2 May 2003 19:42:49 -0000 1.1.2.4
***************
*** 10,14 ****
$(ac_aux_dir)/ylwrap
! EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl bootstrap
dist-hook:
--- 10,14 ----
$(ac_aux_dir)/ylwrap
! EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl bootstrap fix_libtool
dist-hook:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Attic/Makefile.in,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Makefile.in 26 Mar 2003 21:56:24 -0000 1.1.2.3
--- Makefile.in 2 May 2003 19:42:49 -0000 1.1.2.4
***************
*** 66,74 ****
--- 66,77 ----
CPP = @CPP@
CXX = @CXX@
+ CYG_LD_FLAGS = @CYG_LD_FLAGS@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
F77 = @F77@
+ FIX_LIBTOOL = @FIX_LIBTOOL@
LD_EXTRA_FLAGS = @LD_EXTRA_FLAGS@
+ LD_TESTFILES = @LD_TESTFILES@
LEX = @LEX@
LIBTOOL = @LIBTOOL@
***************
*** 86,89 ****
--- 89,93 ----
TCL_LDFLAGS = @TCL_LDFLAGS@
VERSION = @VERSION@
+ WARN_FLAGS = @WARN_FLAGS@
WCHAR_T_DEF = @WCHAR_T_DEF@
XINCLUDES = @XINCLUDES@
***************
*** 102,106 ****
! EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl bootstrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
--- 106,110 ----
! EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl bootstrap fix_libtool
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
Index: config.h.in
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Attic/config.h.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** config.h.in 20 Mar 2003 19:41:21 -0000 1.1.2.1
--- config.h.in 2 May 2003 19:42:49 -0000 1.1.2.2
***************
*** 253,256 ****
--- 253,259 ----
#undef DARWIN
+ /* Set to 1 if Solaris environment */
+ #undef SOLARIS
+
/* True if ImageMagick's convert is present */
#undef HAVE_CONVERT
Index: configure
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Attic/configure,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** configure 10 Apr 2003 15:17:48 -0000 1.1.2.6
--- configure 2 May 2003 19:42:49 -0000 1.1.2.7
***************
*** 1741,1747 ****
-
-
-
# Checks for programs.
# Fortran compiler only supported on Linux and Tru64
--- 1741,1744 ----
***************
*** 1840,1844 ****
# Provide some information about the compiler.
! echo "$as_me:1842:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
--- 1837,1841 ----
# Provide some information about the compiler.
! echo "$as_me:1839:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
***************
*** 2214,2218 ****
# Provide some information about the compiler.
! echo "$as_me:2216:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
--- 2211,2215 ----
# Provide some information about the compiler.
! echo "$as_me:2213:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
***************
*** 3964,4052 ****
fi
! case $host_os in
! *cygwin* )
! if test -n "$ac_tool_prefix"; then
! # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
! set dummy ${ac_tool_prefix}ranlib; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_prog_RANLIB+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! if test -n "$RANLIB"; then
! ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
! else
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
! IFS=$as_save_IFS
! test -z "$as_dir" && as_dir=.
! for ac_exec_ext in '' $ac_executable_extensions; do
! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
! ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
! break 2
! fi
! done
! done
!
! fi
! fi
! RANLIB=$ac_cv_prog_RANLIB
! if test -n "$RANLIB"; then
! echo "$as_me:$LINENO: result: $RANLIB" >&5
! echo "${ECHO_T}$RANLIB" >&6
! else
! echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
!
! fi
! if test -z "$ac_cv_prog_RANLIB"; then
! ac_ct_RANLIB=$RANLIB
! # Extract the first word of "ranlib", so it can be a program name with args.
! set dummy ranlib; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! if test -n "$ac_ct_RANLIB"; then
! ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
! else
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
! IFS=$as_save_IFS
! test -z "$as_dir" && as_dir=.
! for ac_exec_ext in '' $ac_executable_extensions; do
! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
! ac_cv_prog_ac_ct_RANLIB="ranlib"
! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
! break 2
! fi
! done
! done
!
! test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
! fi
! fi
! ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
! if test -n "$ac_ct_RANLIB"; then
! echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
! echo "${ECHO_T}$ac_ct_RANLIB" >&6
! else
! echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
!
! RANLIB=$ac_ct_RANLIB
! else
! RANLIB="$ac_cv_prog_RANLIB"
! fi
!
! ;;
! * )
! # Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
--- 3961,3965 ----
fi
! # Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
***************
*** 4457,4460 ****
--- 4370,4375 ----
+
+
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo "$as_me:$LINENO: checking command to parse $NM output" >&5
***************
*** 5282,5286 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5284 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
--- 5197,5201 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5199 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
***************
*** 5818,5822 ****
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
--- 5733,5737 ----
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
***************
*** 7616,7620 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7618 "configure"
#include "confdefs.h"
--- 7531,7535 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7533 "configure"
#include "confdefs.h"
***************
*** 7714,7718 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7716 "configure"
#include "confdefs.h"
--- 7629,7633 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7631 "configure"
#include "confdefs.h"
***************
*** 8438,8443 ****
- ;;
- esac
# Checks for header files.
--- 8353,8356 ----
***************
*** 10290,10294 ****
rm -f conftest.err conftest.$ac_ext
if test "$XINCLUDES" = nope ; then
! dirs="/usr/include /usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
for i in $dirs ; do
if test -r $i/X11/Intrinsic.h ; then
--- 10203,10207 ----
rm -f conftest.err conftest.$ac_ext
if test "$XINCLUDES" = nope ; then
! dirs="/usr/include /usr/X11R6/include /usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
for i in $dirs ; do
if test -r $i/X11/Intrinsic.h ; then
***************
*** 10341,10347 ****
echo $ECHO_N "checking for X11 libraries... $ECHO_C" >&6
XLIBSW=nope
! dirs="/usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl ; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
--- 10254,10260 ----
echo $ECHO_N "checking for X11 libraries... $ECHO_C" >&6
XLIBSW=nope
! dirs="/usr/lib /usr/X11R6/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
***************
*** 10436,10500 ****
fi
- # One more thing. On some versions of Ultrix, the "xauth" mechanism is not
- # supported, so send won't work. However, therre are usually copies of the
- # MIT X server availble as well, which do support xauth. Check for the
- # MIT stuff and use it if it's there.
- if test -d /usr/include/mit ; then
- echo "$as_me:$LINENO: checking MIT X libraries" >&5
- echo $ECHO_N "checking MIT X libraries... $ECHO_C" >&6
- tk_oldCFlags=$CFLAGS
- CFLAGS="$CFLAGS -I/usr/include/mit"
- tk_oldLibs=$LIBS
- LIBS="$LIBS -lX11-mit"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-
- #include <X11/Xlib.h>
-
- #ifdef F77_DUMMY_MAIN
- # ifdef __cplusplus
- extern "C"
- # endif
- int F77_DUMMY_MAIN() { return 1; }
- #endif
- int
- main ()
- {
-
- XOpenDisplay(0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- XLIBSW="-lX11-mit"
- XINCLUDES="-I/usr/include/mit"
-
- else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- CFLAGS=$tk_oldCFlags
- LIBS=$tk_oldLibs
- fi
#-------------------------- Begin Motif checks --------------------
--- 10349,10352 ----
***************
*** 10627,10635 ****
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXm.a -o -r $i/libXm.so -o -r $i/libXm.sl ; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
MOTIF_LIBSW="-L$i"
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl ; then
cv_xt_path=$i
fi
--- 10479,10487 ----
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXm.a -o -r $i/libXm.so -o -r $i/libXm.sl -o -r $i/libXm.dylib ; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
MOTIF_LIBSW="-L$i"
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl -o -r $i/libXt.dylib ; then
cv_xt_path=$i
fi
***************
*** 10667,10671 ****
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl ; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
--- 10519,10523 ----
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl -o -r $i/libXt.dylib ; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
***************
*** 11156,11159 ****
--- 11008,11012 ----
# and Ultrix specific calls.
+ WARN_FLAGS=""
LD_EXTRA_FLAGS=""
echo "$as_me:$LINENO: checking for supported OS" >&5
***************
*** 11166,11200 ****
_ACEOF
- echo "$as_me:$LINENO: result: Cygwin" >&5
- echo "${ECHO_T}Cygwin" >&6
! echo "$as_me:$LINENO: checking static libraries okay to build on Cygwin" >&5
! echo $ECHO_N "checking static libraries okay to build on Cygwin... $ECHO_C" >&6
! dirs=". Replace Scripts Utility Display Exception Xamine Tape EventSource TCL Events Gates Sorter SpectrumIO SpecTcl contrib doc"
! echo ""
for dir in $dirs ; do
echo -n " **Entering directory $dir..."
! sed 's/.lo/.o/g' < $dir/Makefile.in > $dir/Makefile2.in
! sed 's/_la_/_a_/g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/LTLIBRARIES/LIBRARIES/g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/.la/.a/g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/$(LIBTOOL) --mode=install //g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/$(LIBTOOL) --mode=uninstall //g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/$(LIBTOOL) --mode=compile //g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/$(LTCXXCOMPILE)/$(CXXCOMPILE)/g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/$(LTCOMPILE)/$(COMPILE)/g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/$(LIBTOOL) --mode=link //g' < $dir/Makefile2.in > $dir/Makefile3.in
! mv -f $dir/Makefile3.in $dir/Makefile.in
! rm -f $dir/Makefile2.in
- # If we don't do this, make will try to recreate the makefile
- touch $dir/Makefile
echo " done!"
done
- echo "$as_me:$LINENO: result: Done removing libtool-specific commands!" >&5
- echo "${ECHO_T}Done removing libtool-specific commands!" >&6
! # Windows doesn't allow undefined symbols at link time
! LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -no-undefined"
;;
*linux* )
--- 11019,11047 ----
_ACEOF
! echo "Fixing broken libtool script..."
! dirs=". Replace Scripts Utility Display Exception Xamine Tape EventSource TCL Events Gates Sorter SpectrumIO SpecTcl TestFiles contrib doc"
for dir in $dirs ; do
echo -n " **Entering directory $dir..."
! sed 's/-I/-idirafter /g' < $dir/Makefile.in > $dir/Makefile_temp.in
!
! mv -f $dir/Makefile_temp.in $dir/Makefile.in
! rm -f $dir/Makefile_temp.in
echo " done!"
done
! # We can only create static libraries since Windows won't allow
! # undefined symbols at link time
! LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -static"
! LD_TESTFILES=""
! CYG_LD_FLAGS="-lICE -lSM"
! WARN_FLAGS="-fpermissive -w"
! FIX_LIBTOOL="fix_libtool"
! OBJEXT=o
!
!
!
!
;;
*linux* )
***************
*** 11204,11209 ****
_ACEOF
! echo "$as_me:$LINENO: result: Linux" >&5
! echo "${ECHO_T}Linux" >&6
;;
*ultrix* )
--- 11051,11055 ----
_ACEOF
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
*ultrix* )
***************
*** 11213,11218 ****
_ACEOF
! echo "$as_me:$LINENO: result: Ultrix" >&5
! echo "${ECHO_T}Ultrix" >&6
;;
*osf* )
--- 11059,11063 ----
_ACEOF
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
*osf* )
***************
*** 11222,11227 ****
_ACEOF
- echo "$as_me:$LINENO: result: OSF1" >&5
- echo "${ECHO_T}OSF1" >&6
WCHAR_T_DEF=-D_WCHAR_T
OBJEXT=o
--- 11067,11070 ----
***************
*** 11232,11235 ****
--- 11075,11079 ----
# This does away with "weak symbol" warnings
LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -Wl,\"-S\""
+ LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
*darwin* )
***************
*** 11239,11250 ****
_ACEOF
! echo "$as_me:$LINENO: result: Darwin" >&5
! echo "${ECHO_T}Darwin" >&6
;;
* )
! echo "$as_me:$LINENO: result: ok" >&5
! echo "${ECHO_T}ok" >&6
;;
esac
# Locate Tcl/Tk and setup compile/link switches for them too:
--- 11083,11127 ----
_ACEOF
!
! echo "Fixing broken libtool script..."
! dirs=". Replace Scripts Utility Display Exception Xamine Tape EventSource TCL Events Gates Sorter SpectrumIO SpecTcl TestFiles contrib doc"
! for dir in $dirs ; do
! echo -n " **Entering directory $dir..."
! sed 's/-I/-idirafter /g' < $dir/Makefile.in > $dir/Makefile_temp.in
!
! mv -f $dir/Makefile_temp.in $dir/Makefile.in
! rm -f $dir/Makefile_temp.in
!
! echo " done!"
! done
!
! OBJEXT=o
!
! WARN_FLAGS="-fpermissive -w"
!
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
! ;;
! *solaris* )
!
! cat >>confdefs.h <<\_ACEOF
! #define SOLARIS 1
! _ACEOF
!
! OBJEXT=o
! WARN_FLAGS="-fpermissive -w"
!
!
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
! LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -L/opt/lib -lsocket"
;;
* )
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
esac
+ echo "$as_me:$LINENO: result: $host_os" >&5
+ echo "${ECHO_T}$host_os" >&6
+
+ # These additions to LDADD cause problems on Cygwin. Do not use them on cygwin
+
# Locate Tcl/Tk and setup compile/link switches for them too:
***************
*** 11278,11281 ****
--- 11155,11185 ----
+ # /usr/local/tcl/include
+
+ if test $tcl_headers_found = "no" ; then
+ echo "$as_me:$LINENO: checking for /usr/local/tcl/include/tcl.h" >&5
+ echo $ECHO_N "checking for /usr/local/tcl/include/tcl.h... $ECHO_C" >&6
+ if test "${ac_cv_file__usr_local_tcl_include_tcl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "/usr/local/tcl/include/tcl.h"; then
+ ac_cv_file__usr_local_tcl_include_tcl_h=yes
+ else
+ ac_cv_file__usr_local_tcl_include_tcl_h=no
+ fi
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_tcl_include_tcl_h" >&5
+ echo "${ECHO_T}$ac_cv_file__usr_local_tcl_include_tcl_h" >&6
+ if test $ac_cv_file__usr_local_tcl_include_tcl_h = yes; then
+ tcl_header_dir="/usr/local/tcl/include"
+ tcl_headers_found="yes"
+ fi
+
+ fi
+
# /usr/include/tcl
***************
*** 11392,11395 ****
--- 11296,11352 ----
fi
+ # /soft/sparc/tcl/include
+ if test $tcl_headers_found = "no"; then
+ echo "$as_me:$LINENO: checking for /soft/sparc/tcl/include/tcl.h" >&5
+ echo $ECHO_N "checking for /soft/sparc/tcl/include/tcl.h... $ECHO_C" >&6
+ if test "${ac_cv_file__soft_sparc_tcl_include_tcl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "/soft/sparc/tcl/include/tcl.h"; then
+ ac_cv_file__soft_sparc_tcl_include_tcl_h=yes
+ else
+ ac_cv_file__soft_sparc_tcl_include_tcl_h=no
+ fi
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_file__soft_sparc_tcl_include_tcl_h" >&5
+ echo "${ECHO_T}$ac_cv_file__soft_sparc_tcl_include_tcl_h" >&6
+ if test $ac_cv_file__soft_sparc_tcl_include_tcl_h = yes; then
+ tcl_header_dir="/soft/sparc/tcl/include"
+ tcl_headers_found="yes"
+ fi
+
+ fi
+
+ # /home/sparc/tcl/include
+
+ if test $tcl_headers_found = "no"; then
+ echo "$as_me:$LINENO: checking for /home/sparc/tcl/include/tcl.h" >&5
+ echo $ECHO_N "checking for /home/sparc/tcl/include/tcl.h... $ECHO_C" >&6
+ if test "${ac_cv_file__home_sparc_tcl_include_tcl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "/home/sparc/tcl/include/tcl.h"; then
+ ac_cv_file__home_sparc_tcl_include_tcl_h=yes
+ else
+ ac_cv_file__home_sparc_tcl_include_tcl_h=no
+ fi
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_file__home_sparc_tcl_include_tcl_h" >&5
+ echo "${ECHO_T}$ac_cv_file__home_sparc_tcl_include_tcl_h" >&6
+ if test $ac_cv_file__home_sparc_tcl_include_tcl_h = yes; then
+ tcl_header_dir="/home/sparc/tcl/include"
+ tcl_headers_found="yes"
+ fi
+
+ fi
+
if test $tcl_headers_found = "yes"; then
TCL_FLAGS=-I${tcl_header_dir}
***************
*** 11427,11438 ****
fi;
! tcl_libsearchpath="$tcl_libsearchpath /usr/lib /usr/local/lib"
!
! tcl_libfiles="libtcl.a libtcl.so"
! for v in ${tcl_versions}
! do
! tcl_libfiles="$tcl_libfiles libtcl${v}.a libtcl${v}.so"
! done
for dir in ${tcl_libsearchpath}
--- 11384,11406 ----
fi;
! tcl_libsearchpath="$tcl_libsearchpath /usr/local/tcl/lib /usr/lib /usr/local/lib /soft/sparc/tcl/lib /home/sparc/tcl/lib"
+ # Darwin has funky things called "dylibs"
+ case $host_os in
+ *darwin* )
+ tcl_libfiles="libtcl.dylib"
+ for v in ${tcl_versions}
+ do
+ tcl_libfiles="$tcl_libfiles libtcl${v}.dylib"
+ done
+ ;;
+ * )
+ tcl_libfiles="libtcl.a libtcl.so"
+ for v in ${tcl_versions}
+ do
+ tcl_libfiles="$tcl_libfiles libtcl${v}.a libtcl${v}.so"
+ done
+ ;;
+ esac
for dir in ${tcl_libsearchpath}
***************
*** 11473,11481 ****
if test $tcl_libfound = "yes" ; then
- # Find the lib basename:
tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib
- tcl_libname=$(echo $tcl_libname|cut -c -$(expr length $tcl_libname - 2))
- tcl_libname=$(echo $tcl_libname|tr "." " ") # trim off "." in .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}"
--- 11441,11458 ----
if test $tcl_libfound = "yes" ; then
+ # Find the lib basename: the bash shell syntax is
+ # different on Sun than on other Unices
+ case $host_os in
+ *solaris* )
+ tcl_libname=$(echo $tcl_libname|cut -c -$(expr $tcl_libname : '.*' - 2))
+ ;;
+ * )
+ tcl_libname=$(echo $tcl_libname|cut -c -$(expr length $tcl_libname - 2))
+ ;;
+ esac
+
+ tcl_libname=$(echo ${tcl_libname%.})
tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib
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}"
***************
*** 12418,12428 ****
s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
s,@YACC@,$YACC,;t t
s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
- s,@ECHO@,$ECHO,;t t
s,@STRIP@,$STRIP,;t t
s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@have_convert@,$have_convert,;t t
s,@TCL_FLAGS@,$TCL_FLAGS,;t t
--- 12395,12409 ----
s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
s,@YACC@,$YACC,;t t
+ s,@ECHO@,$ECHO,;t t
s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@STRIP@,$STRIP,;t t
s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@WARN_FLAGS@,$WARN_FLAGS,;t t
+ s,@FIX_LIBTOOL@,$FIX_LIBTOOL,;t t
+ s,@CYG_LD_FLAGS@,$CYG_LD_FLAGS,;t t
+ s,@LD_TESTFILES@,$LD_TESTFILES,;t t
s,@have_convert@,$have_convert,;t t
s,@TCL_FLAGS@,$TCL_FLAGS,;t t
Index: configure.in
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Attic/configure.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** configure.in 10 Apr 2003 15:17:49 -0000 1.1.2.4
--- configure.in 2 May 2003 19:42:49 -0000 1.1.2.5
***************
*** 6,12 ****
AM_INIT_AUTOMAKE(SpecTcl, 2.0-001)
- AC_EXEEXT
- AC_OBJEXT
-
# Checks for programs.
# Fortran compiler only supported on Linux and Tru64
--- 6,9 ----
***************
*** 30,41 ****
AC_PROG_YACC
AC_PROG_GCC_TRADITIONAL
! case $host_os in
! *cygwin* )
! AC_PROG_RANLIB
! ;;
! * )
! AC_PROG_LIBTOOL
! ;;
! esac
# Checks for header files.
--- 27,31 ----
AC_PROG_YACC
AC_PROG_GCC_TRADITIONAL
! AC_PROG_LIBTOOL
# Checks for header files.
***************
*** 89,93 ****
AC_TRY_CPP([#include <X11/Instrinsic.h>], , XINCLUDES="nope")
if test "$XINCLUDES" = nope ; then
! dirs="/usr/include /usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
for i in $dirs ; do
if test -r $i/X11/Intrinsic.h ; then
--- 79,83 ----
AC_TRY_CPP([#include <X11/Instrinsic.h>], , XINCLUDES="nope")
if test "$XINCLUDES" = nope ; then
! dirs="/usr/include /usr/X11R6/include /usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
for i in $dirs ; do
if test -r $i/X11/Intrinsic.h ; then
***************
*** 130,136 ****
AC_MSG_CHECKING(for X11 libraries)
XLIBSW=nope
! dirs="/usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
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"
--- 120,126 ----
AC_MSG_CHECKING(for X11 libraries)
XLIBSW=nope
! dirs="/usr/lib /usr/X11R6/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
AC_MSG_RESULT($i)
XLIBSW="-L$i"
***************
*** 162,187 ****
fi
- # One more thing. On some versions of Ultrix, the "xauth" mechanism is not
- # supported, so send won't work. However, therre are usually copies of the
- # MIT X server availble as well, which do support xauth. Check for the
- # MIT stuff and use it if it's there.
- if test -d /usr/include/mit ; then
- AC_MSG_CHECKING([MIT X libraries])
- tk_oldCFlags=$CFLAGS
- CFLAGS="$CFLAGS -I/usr/include/mit"
- tk_oldLibs=$LIBS
- LIBS="$LIBS -lX11-mit"
- AC_TRY_LINK([
- #include <X11/Xlib.h>
- ], [
- XOpenDisplay(0);
- ], [
- AC_MSG_RESULT(yes)
- XLIBSW="-lX11-mit"
- XINCLUDES="-I/usr/include/mit"
- ], AC_MSG_RESULT(no))
- CFLAGS=$tk_oldCFlags
- LIBS=$tk_oldLibs
- fi
#-------------------------- Begin Motif checks --------------------
--- 152,155 ----
***************
*** 245,252 ****
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXm.a -o -r $i/libXm.so -o -r $i/libXm.sl ; then
AC_MSG_RESULT($i)
MOTIF_LIBSW="-L$i"
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl ; then
cv_xt_path=$i
fi
--- 213,220 ----
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXm.a -o -r $i/libXm.so -o -r $i/libXm.sl -o -r $i/libXm.dylib ; then
AC_MSG_RESULT($i)
MOTIF_LIBSW="-L$i"
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl -o -r $i/libXt.dylib ; then
cv_xt_path=$i
fi
***************
*** 277,281 ****
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl ; then
AC_MSG_RESULT($i)
XTLIBSW="-L$i"
--- 245,249 ----
dirs="/usr/X11R6/lib /usr/lib /usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
! if test -r $i/libXt.a -o -r $i/libXt.so -o -r $i/libXt.sl -o -r $i/libXt.dylib ; then
AC_MSG_RESULT($i)
XTLIBSW="-L$i"
***************
*** 426,429 ****
--- 394,398 ----
# and Ultrix specific calls.
+ WARN_FLAGS=""
LD_EXTRA_FLAGS=""
AC_MSG_CHECKING([for supported OS])
***************
*** 431,474 ****
*cygwin* )
AC_DEFINE(CYGWIN, 1, [Set to 1 if Cygwin environment])
- AC_MSG_RESULT([Cygwin])
! AC_MSG_CHECKING(static libraries okay to build on Cygwin)
! dirs=". Replace Scripts Utility Display Exception Xamine Tape EventSource TCL Events Gates Sorter SpectrumIO SpecTcl contrib doc"
! echo ""
for dir in $dirs ; do
echo -n " **Entering directory $dir..."
! sed 's/.lo/.o/g' < $dir/Makefile.in > $dir/Makefile2.in
! sed 's/_la_/_a_/g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/LTLIBRARIES/LIBRARIES/g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/.la/.a/g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/$(LIBTOOL) --mode=install //g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/$(LIBTOOL) --mode=uninstall //g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/$(LIBTOOL) --mode=compile //g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/$(LTCXXCOMPILE)/$(CXXCOMPILE)/g' < $dir/Makefile2.in > $dir/Makefile3.in
! sed 's/$(LTCOMPILE)/$(COMPILE)/g' < $dir/Makefile3.in > $dir/Makefile2.in
! sed 's/$(LIBTOOL) --mode=link //g' < $dir/Makefile2.in > $dir/Makefile3.in
! mv -f $dir/Makefile3.in $dir/Makefile.in
! rm -f $dir/Makefile2.in
- # If we don't do this, make will try to recreate the makefile
- touch $dir/Makefile
echo " done!"
done
- AC_MSG_RESULT([Done removing libtool-specific commands!])
! # Windows doesn't allow undefined symbols at link time
! LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -no-undefined"
;;
*linux* )
AC_DEFINE(LINUX, 1, [Set to 1 if Linux environment])
! AC_MSG_RESULT([Linux])
;;
*ultrix* )
AC_DEFINE(ULTRIX, 1, [Set to 1 if Ultrix environment])
! AC_MSG_RESULT([Ultrix])
;;
*osf* )
AC_DEFINE(OSF, 1, [Set to 1 if OSF environment])
- AC_MSG_RESULT([OSF1])
WCHAR_T_DEF=-D_WCHAR_T
OBJEXT=o
--- 400,439 ----
*cygwin* )
AC_DEFINE(CYGWIN, 1, [Set to 1 if Cygwin environment])
! echo "Fixing broken libtool script..."
! dirs=". Replace Scripts Utility Display Exception Xamine Tape EventSource TCL Events Gates Sorter SpectrumIO SpecTcl TestFiles contrib doc"
for dir in $dirs ; do
echo -n " **Entering directory $dir..."
! sed 's/-I/-idirafter /g' < $dir/Makefile.in > $dir/Makefile_temp.in
!
! mv -f $dir/Makefile_temp.in $dir/Makefile.in
! rm -f $dir/Makefile_temp.in
echo " done!"
done
! # We can only create static libraries since Windows won't allow
! # undefined symbols at link time
! LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -static"
! LD_TESTFILES=""
! CYG_LD_FLAGS="-lICE -lSM"
! WARN_FLAGS="-fpermissive -w"
! FIX_LIBTOOL="fix_libtool"
! OBJEXT=o
! AC_SUBST(OBJEXT)
! AC_SUBST(WARN_FLAGS)
! AC_SUBST(FIX_LIBTOOL)
! AC_SUBST(CYG_LD_FLAGS)
;;
*linux* )
AC_DEFINE(LINUX, 1, [Set to 1 if Linux environment])
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
*ultrix* )
AC_DEFINE(ULTRIX, 1, [Set to 1 if Ultrix environment])
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
*osf* )
AC_DEFINE(OSF, 1, [Set to 1 if OSF environment])
WCHAR_T_DEF=-D_WCHAR_T
OBJEXT=o
***************
*** 479,491 ****
# This does away with "weak symbol" warnings
LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -Wl,\"-S\""
;;
*darwin* )
AC_DEFINE(DARWIN, 1, [Set to 1 if Darwin environment])
! AC_MSG_RESULT([Darwin])
;;
* )
! AC_MSG_RESULT([ok])
;;
esac
# Locate Tcl/Tk and setup compile/link switches for them too:
--- 444,487 ----
# This does away with "weak symbol" warnings
LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -Wl,\"-S\""
+ LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
*darwin* )
AC_DEFINE(DARWIN, 1, [Set to 1 if Darwin environment])
!
! echo "Fixing broken libtool script..."
! dirs=". Replace Scripts Utility Display Exception Xamine Tape EventSource TCL Events Gates Sorter SpectrumIO SpecTcl TestFiles contrib doc"
! for dir in $dirs ; do
! echo -n " **Entering directory $dir..."
! sed 's/-I/-idirafter /g' < $dir/Makefile.in > $dir/Makefile_temp.in
!
! mv -f $dir/Makefile_temp.in $dir/Makefile.in
! rm -f $dir/Makefile_temp.in
!
! echo " done!"
! done
!
! OBJEXT=o
! AC_SUBST(OBJEXT)
! WARN_FLAGS="-fpermissive -w"
! AC_SUBST(WARN_FLAGS)
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
! ;;
! *solaris* )
! AC_DEFINE(SOLARIS, 1, [Set to 1 if Solaris environment])
! OBJEXT=o
! WARN_FLAGS="-fpermissive -w"
! AC_SUBST(WARN_FLAGS)
! AC_SUBST(OBJEXT)
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
! LD_EXTRA_FLAGS="$LD_EXTRA_FLAGS -L/opt/lib -lsocket"
;;
* )
! LD_TESTFILES="../SpecTcl/MySpecTclApp.o -lTclGrammerCommands -lXamine -lGates -lSpecio -lreplace"
;;
esac
+ AC_MSG_RESULT([$host_os])
+
+ # These additions to LDADD cause problems on Cygwin. Do not use them on cygwin
+ AC_SUBST(LD_TESTFILES)
# Locate Tcl/Tk and setup compile/link switches for them too:
***************
*** 513,516 ****
--- 509,520 ----
+ # /usr/local/tcl/include
+
+ if test $tcl_headers_found = "no" ; then
+ AC_CHECK_FILE([/usr/local/tcl/include/tcl.h],
+ [tcl_header_dir="/usr/local/tcl/include"
+ tcl_headers_found="yes"])
+ fi
+
# /usr/include/tcl
***************
*** 550,553 ****
--- 554,572 ----
fi
+ # /soft/sparc/tcl/include
+ if test $tcl_headers_found = "no"; then
+ AC_CHECK_FILE([/soft/sparc/tcl/include/tcl.h],
+ [tcl_header_dir="/soft/sparc/tcl/include"
+ tcl_headers_found="yes"])
+ fi
+
+ # /home/sparc/tcl/include
+
+ if test $tcl_headers_found = "no"; then
+ AC_CHECK_FILE([/home/sparc/tcl/include/tcl.h],
+ [tcl_header_dir="/home/sparc/tcl/include"
+ tcl_headers_found="yes"])
+ fi
+
if test $tcl_headers_found = "yes"; then
TCL_FLAGS=-I${tcl_header_dir}
***************
*** 578,589 ****
[tcl_libsearchpath=$withval])
! tcl_libsearchpath="$tcl_libsearchpath /usr/lib /usr/local/lib"
!
! tcl_libfiles="libtcl.a libtcl.so"
! for v in ${tcl_versions}
! do
! tcl_libfiles="$tcl_libfiles libtcl${v}.a libtcl${v}.so"
! done
for dir in ${tcl_libsearchpath}
--- 597,619 ----
[tcl_libsearchpath=$withval])
! tcl_libsearchpath="$tcl_libsearchpath /usr/local/tcl/lib /usr/lib /usr/local/lib /soft/sparc/tcl/lib /home/sparc/tcl/lib"
+ # Darwin has funky things called "dylibs"
+ case $host_os in
+ *darwin* )
+ tcl_libfiles="libtcl.dylib"
+ for v in ${tcl_versions}
+ do
+ tcl_libfiles="$tcl_libfiles libtcl${v}.dylib"
+ done
+ ;;
+ * )
+ tcl_libfiles="libtcl.a libtcl.so"
+ for v in ${tcl_versions}
+ do
+ tcl_libfiles="$tcl_libfiles libtcl${v}.a libtcl${v}.so"
+ done
+ ;;
+ esac
for dir in ${tcl_libsearchpath}
***************
*** 604,612 ****
if test $tcl_libfound = "yes" ; then
! # Find the lib basename:
! tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib
! tcl_libname=$(echo $tcl_libname|cut -c -$(expr length $tcl_libname - 2))
! tcl_libname=$(echo $tcl_libname|tr "." " ") # trim off "." in .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}"
--- 634,651 ----
if test $tcl_libfound = "yes" ; then
!
! # Find the lib basename: the bash shell syntax is
! # different on Sun than on other Unices
! case $host_os in
! *solaris* )
! tcl_libname=$(echo $tcl_libname|cut -c -$(expr $tcl_libname : '.*' - 2))
! ;;
! * )
! tcl_libname=$(echo $tcl_libname|cut -c -$(expr length $tcl_libname - 2))
! ;;
! esac
! tcl_libname=$(echo ${tcl_libname%.})
! tcl_libname=$(echo $tcl_libname|cut -c 4- ) # trim off lib
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}"
|