summaryrefslogtreecommitdiffstats
path: root/ds9/macos/configure
diff options
context:
space:
mode:
Diffstat (limited to 'ds9/macos/configure')
-rwxr-xr-xds9/macos/configure1691
1 files changed, 375 insertions, 1316 deletions
diff --git a/ds9/macos/configure b/ds9/macos/configure
index 4f4bd03..56d1405 100755
--- a/ds9/macos/configure
+++ b/ds9/macos/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ds9 8.0.
+# Generated by GNU Autoconf 2.69 for ds9 8.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ds9'
PACKAGE_TARNAME='ds9'
-PACKAGE_VERSION='8.0'
-PACKAGE_STRING='ds9 8.0'
+PACKAGE_VERSION='8.1'
+PACKAGE_STRING='ds9 8.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -621,14 +621,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
TCLSH_PROG
-PRACTCL_NAME_LIBRARY
-PRACTCL_VC_MANIFEST_EMBED_EXE
-PRACTCL_VC_MANIFEST_EMBED_DLL
-PRACTCL_STUB_LIB
-PRACTCL_STATIC_LIB
-PRACTCL_SHARED_LIB
-PRACTCL_TOOLSET
-PRACTCL_CFLAGS
VC_MANIFEST_EMBED_EXE
VC_MANIFEST_EMBED_DLL
RANLIB_STUB
@@ -642,7 +634,6 @@ CFLAGS_DEFAULT
LD_LIBRARY_PATH_VAR
SHLIB_CFLAGS
SHLIB_LD_LIBS
-SHLIB_SUFFIX
SHLIB_LD
STLIB_LD
CFLAGS_WARNING
@@ -658,17 +649,10 @@ XMKMF
TK_INCLUDES
TCL_INCLUDES
SSLLIBS
-MATH_LIBS
EGREP
GREP
RANLIB
SET_MAKE
-INSTALL_LIBRARY
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-INSTALL_DATA
-INSTALL_DATA_DIR
-INSTALL
CPP
tktable_STUB_LIB_PATH
tktable_STUB_LIB_SPEC
@@ -830,7 +814,6 @@ tifftcl_LIB_FILE
tifftcl_SRC_DIR
tifftcl_BIN_DIR
tifftcl_VERSION
-PRACTCL_WINDOWINGSYSTEM
TK_XINCLUDES
TK_LIBS
TK_STUB_LIB_SPEC
@@ -864,6 +847,12 @@ TCL_SRC_DIR
TCL_BIN_DIR
TCL_PATCH_LEVEL
TCL_VERSION
+INSTALL_LIBRARY
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+INSTALL_DATA
+INSTALL_DATA_DIR
+INSTALL
PKG_CFLAGS
PKG_LIBS
PKG_INCLUDES
@@ -875,7 +864,6 @@ PKG_STUB_LIB_FILE
PKG_LIB_FILE
EXEEXT
CYGPATH
-TEA_TK_EXTENSION
target_alias
host_alias
build_alias
@@ -951,7 +939,6 @@ enable_rpath
enable_wince
with_celib
enable_symbols
-with_tclsh
'
ac_precious_vars='build_alias
host_alias
@@ -1503,7 +1490,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ds9 8.0 to adapt to many kinds of systems.
+\`configure' configures ds9 8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1568,7 +1555,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ds9 8.0:";;
+ short | recursive ) echo "Configuration of ds9 8.1:";;
esac
cat <<\_ACEOF
@@ -1576,7 +1563,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-threads build with threads
+ --enable-threads build with threads (default: on)
--enable-shared build and link with shared libraries (default: on)
--enable-stubs build and link with stub libraries. Always true for
shared builds (default: on)
@@ -1616,7 +1603,6 @@ Optional Packages:
--with-tkinclude directory containing the public Tk header files
--with-x use the X Window System
--with-celib=DIR use Windows/CE support library from DIR
- --with-tclsh Specify a local tcl shell to use for dynamic code
Some influential environment variables:
CC C compiler command
@@ -1695,7 +1681,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ds9 configure 8.0
+ds9 configure 8.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1969,98 +1955,11 @@ $as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ds9 $as_me 8.0, which was
+It was created by ds9 $as_me 8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2416,35 +2315,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
#--------------------------------------------------------------------
- # TEA extensions pass this us the version of TEA they think they
- # are compatible with.
- TEA_VERSION="3.10"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
-$as_echo_n "checking for correct TEA configuration... " >&6; }
+ TEA_VERSION="3.13"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
+$as_echo_n "checking TEA configuration... " >&6; }
if test x"${PACKAGE_NAME}" = x ; then
as_fn_error $? "
The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
fi
- if test x"3.10" = x ; then
- as_fn_error $? "
-TEA version not specified." "$LINENO" 5
- elif test "3.10" != "${TEA_VERSION}" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5
-$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
$as_echo "ok (TEA ${TEA_VERSION})" >&6; }
- fi
# If the user did not set CFLAGS, set it now to keep macros
# like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
if test "${CFLAGS+set}" != "set" ; then
CFLAGS=""
fi
- TEA_TK_EXTENSION=0
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*)
+ *win32*|*WIN32*|*MINGW32_*|*MINGW64_*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -2536,6 +2425,55 @@ $as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}
+ # Configure the installer.
+
+ INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
+ INSTALL_DATA_DIR='${INSTALL} -d -m 755'
+ INSTALL_DATA='${INSTALL} -m 644'
+ INSTALL_PROGRAM='${INSTALL} -m 755'
+ INSTALL_SCRIPT='${INSTALL} -m 755'
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
+$as_echo_n "checking system version... " >&6; }
+if ${tcl_cv_sys_version+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ # TEA specific:
+ if test "${TEA_PLATFORM}" = "windows" ; then
+ tcl_cv_sys_version=windows
+ else
+ tcl_cv_sys_version=`uname -s`-`uname -r`
+ if test "$?" -ne 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5
+$as_echo "$as_me: WARNING: can't find uname command" >&2;}
+ tcl_cv_sys_version=unknown
+ else
+ if test "`uname -s`" = "AIX" ; then
+ tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+ fi
+ fi
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5
+$as_echo "$tcl_cv_sys_version" >&6; }
+ system=$tcl_cv_sys_version
+
+ case $system in
+ HP-UX-*) INSTALL_LIBRARY='${INSTALL} -m 755' ;;
+ *) INSTALL_LIBRARY='${INSTALL} -m 644' ;;
+ esac
+
+
+
+
+
+
+
+
+
ac_aux_dir=
for ac_dir in ../tclconfig "$srcdir"/../tclconfig; do
@@ -2645,6 +2583,9 @@ $as_echo "$as_me: WARNING: --with-tcl argument should refer to directory contain
`ls -d /Library/Frameworks 2>/dev/null` \
`ls -d /Network/Library/Frameworks 2>/dev/null` \
`ls -d /System/Library/Frameworks 2>/dev/null` \
+ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Library/Frameworks/Tcl.framework 2>/dev/null` \
+ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Network/Library/Frameworks/Tcl.framework 2>/dev/null` \
+ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework 2>/dev/null` \
; do
if test -f "$i/Tcl.framework/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`"
@@ -2671,13 +2612,17 @@ $as_echo "$as_me: WARNING: --with-tcl argument should refer to directory contain
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
- `ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
+ `ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib/tcl8.6 2>/dev/null` \
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
+ `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
+ `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
+ `ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
+ `ls -d /usr/local/lib/tcl/tcl8.5 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i; pwd)`"
@@ -3685,7 +3630,6 @@ _ACEOF
if test x"${no_tk}" = x ; then
# we reset no_tk in case something fails here
no_tk=true
- TEA_TK_EXTENSION=0
# Check whether --with-tk was given.
if test "${with_tk+set}" = set; then :
@@ -3749,6 +3693,9 @@ $as_echo "$as_me: WARNING: --with-tk argument should refer to directory containi
`ls -d /Library/Frameworks 2>/dev/null` \
`ls -d /Network/Library/Frameworks 2>/dev/null` \
`ls -d /System/Library/Frameworks 2>/dev/null` \
+ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Library/Frameworks/Tcl.framework 2>/dev/null` \
+ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Network/Library/Frameworks/Tcl.framework 2>/dev/null` \
+ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework 2>/dev/null` \
; do
if test -f "$i/Tk.framework/tkConfig.sh" ; then
ac_cv_c_tkconfig="`(cd $i/Tk.framework; pwd)`"
@@ -3764,8 +3711,15 @@ $as_echo "$as_me: WARNING: --with-tk argument should refer to directory containi
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
+ `ls -d /usr/lib/tk8.6 2>/dev/null` \
+ `ls -d /usr/lib/tk8.5 2>/dev/null` \
+ `ls -d /usr/local/lib/tk8.6 2>/dev/null` \
+ `ls -d /usr/local/lib/tk8.5 2>/dev/null` \
+ `ls -d /usr/local/lib/tcl/tk8.6 2>/dev/null` \
+ `ls -d /usr/local/lib/tcl/tk8.5 2>/dev/null` \
; do
if test -f "$i/tkConfig.sh" ; then
ac_cv_c_tkconfig="`(cd $i; pwd)`"
@@ -3814,7 +3768,6 @@ fi
as_fn_error $? "Can't find Tk configuration definitions. Use --with-tk to specify a directory containing tkConfig.sh" "$LINENO" 5
else
no_tk=
- TEA_TK_EXTENSION=1
TK_BIN_DIR="${ac_cv_c_tkconfig}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TK_BIN_DIR}/tkConfig.sh" >&5
$as_echo "found ${TK_BIN_DIR}/tkConfig.sh" >&6; }
@@ -3878,44 +3831,20 @@ $as_echo "could not find ${TK_BIN_DIR}/tkConfig.sh" >&6; }
eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
# TEA specific: Ensure windowingsystem is defined
- case ${TK_DEFS} in
- *PLATFORM_SDL*)
- TEA_WINDOWINGSYSTEM="x11"
- PRACTCL_WINDOWINGSYSTEM="sdl"
- TEA_USE_SDL=yes
- ;;
- esac
- if test "${TEA_USE_SDL}" = "yes" ; then
- true
- elif test "${TEA_PLATFORM}" = "unix" ; then
+ if test "${TEA_PLATFORM}" = "unix" ; then
case ${TK_DEFS} in
*MAC_OSX_TK*)
$as_echo "#define MAC_OSX_TK 1" >>confdefs.h
TEA_WINDOWINGSYSTEM="aqua"
- PRACTCL_WINDOWINGSYSTEM="cocoa"
- TEA_USE_HITHEME=no;
- if test "${TK_VERSION}" = "8.5" ; then
- if test "${TK_PATCH_LEVEL}" > ".17" ; then
- TEA_USE_HITHEME=yes;
- fi
- elif test "${TK_VERSION}" = "8.6" ; then
- if test "${TK_PATCH_LEVEL}" > ".3" ; then
- TEA_USE_HITHEME=yes;
- fi
- elif test "${TK_VERSION}" > "8.6" ; then
- TEA_USE_HITHEME=yes;
- fi
;;
*)
TEA_WINDOWINGSYSTEM="x11"
- PRACTCL_WINDOWINGSYSTEM="x11"
;;
esac
elif test "${TEA_PLATFORM}" = "windows" ; then
TEA_WINDOWINGSYSTEM="win32"
- PRACTCL_WINDOWINGSYSTEM="windows"
fi
@@ -3933,8 +3862,6 @@ $as_echo "#define MAC_OSX_TK 1" >>confdefs.h
# TEA specific:
- # Practcl
-
#--------------------------------------------------------------------
@@ -4023,6 +3950,7 @@ $as_echo "$as_me: WARNING: --with-tifftcl argument should refer to directory con
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -4112,12 +4040,8 @@ $as_echo_n "checking For TIFFTCL_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TIFFTCL_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4130,12 +4054,8 @@ $as_echo "using TIFFTCL_STUB_LIB_PATH ${TIFFTCL_STUB_LIB_PATH}" >&6; }
vars="${TIFFTCL_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4163,12 +4083,8 @@ $as_echo_n "checking For tifftcl_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tifftcl_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4181,12 +4097,8 @@ $as_echo "using tifftcl_STUB_LIB_PATH ${tifftcl_STUB_LIB_PATH}" >&6; }
vars="${tifftcl_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4287,6 +4199,7 @@ $as_echo "$as_me: WARNING: --with-pngtcl argument should refer to directory cont
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -4376,12 +4289,8 @@ $as_echo_n "checking For PNGTCL_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${PNGTCL_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4394,12 +4303,8 @@ $as_echo "using PNGTCL_STUB_LIB_PATH ${PNGTCL_STUB_LIB_PATH}" >&6; }
vars="${PNGTCL_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4427,12 +4332,8 @@ $as_echo_n "checking For pngtcl_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${pngtcl_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4445,12 +4346,8 @@ $as_echo "using pngtcl_STUB_LIB_PATH ${pngtcl_STUB_LIB_PATH}" >&6; }
vars="${pngtcl_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4551,6 +4448,7 @@ $as_echo "$as_me: WARNING: --with-jpegtcl argument should refer to directory con
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -4640,12 +4538,8 @@ $as_echo_n "checking For JPEGTCL_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${JPEGTCL_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4658,12 +4552,8 @@ $as_echo "using JPEGTCL_STUB_LIB_PATH ${JPEGTCL_STUB_LIB_PATH}" >&6; }
vars="${JPEGTCL_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4691,12 +4581,8 @@ $as_echo_n "checking For jpegtcl_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${jpegtcl_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4709,12 +4595,8 @@ $as_echo "using jpegtcl_STUB_LIB_PATH ${jpegtcl_STUB_LIB_PATH}" >&6; }
vars="${jpegtcl_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4815,6 +4697,7 @@ $as_echo "$as_me: WARNING: --with-zlibtcl argument should refer to directory con
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -4904,12 +4787,8 @@ $as_echo_n "checking For ZLIBTCL_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${ZLIBTCL_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4922,12 +4801,8 @@ $as_echo "using ZLIBTCL_STUB_LIB_PATH ${ZLIBTCL_STUB_LIB_PATH}" >&6; }
vars="${ZLIBTCL_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4955,12 +4830,8 @@ $as_echo_n "checking For zlibtcl_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${zlibtcl_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -4973,12 +4844,8 @@ $as_echo "using zlibtcl_STUB_LIB_PATH ${zlibtcl_STUB_LIB_PATH}" >&6; }
vars="${zlibtcl_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5079,6 +4946,7 @@ $as_echo "$as_me: WARNING: --with-tcliis argument should refer to directory cont
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -5168,12 +5036,8 @@ $as_echo_n "checking For TCLIIS_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TCLIIS_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5186,12 +5050,8 @@ $as_echo "using TCLIIS_STUB_LIB_PATH ${TCLIIS_STUB_LIB_PATH}" >&6; }
vars="${TCLIIS_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5219,12 +5079,8 @@ $as_echo_n "checking For tcliis_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tcliis_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5237,12 +5093,8 @@ $as_echo "using tcliis_STUB_LIB_PATH ${tcliis_STUB_LIB_PATH}" >&6; }
vars="${tcliis_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5343,6 +5195,7 @@ $as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory c
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -5432,12 +5285,8 @@ $as_echo_n "checking For TCLSIGNAL_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TCLSIGNAL_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5450,12 +5299,8 @@ $as_echo "using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&6; }
vars="${TCLSIGNAL_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5483,12 +5328,8 @@ $as_echo_n "checking For tclsignal_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tclsignal_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5501,12 +5342,8 @@ $as_echo "using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&6; }
vars="${tclsignal_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5607,6 +5444,7 @@ $as_echo "$as_me: WARNING: --with-tclxml argument should refer to directory cont
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -5696,12 +5534,8 @@ $as_echo_n "checking For TCLXML_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TCLXML_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5714,12 +5548,8 @@ $as_echo "using TCLXML_STUB_LIB_PATH ${TCLXML_STUB_LIB_PATH}" >&6; }
vars="${TCLXML_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5747,12 +5577,8 @@ $as_echo_n "checking For tclxml_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tclxml_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5765,12 +5591,8 @@ $as_echo "using tclxml_STUB_LIB_PATH ${tclxml_STUB_LIB_PATH}" >&6; }
vars="${tclxml_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5871,6 +5693,7 @@ $as_echo "$as_me: WARNING: --with-tls argument should refer to directory contain
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -5960,12 +5783,8 @@ $as_echo_n "checking For TLS_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TLS_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -5978,12 +5797,8 @@ $as_echo "using TLS_STUB_LIB_PATH ${TLS_STUB_LIB_PATH}" >&6; }
vars="${TLS_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6011,12 +5826,8 @@ $as_echo_n "checking For tls_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tls_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6029,12 +5840,8 @@ $as_echo "using tls_STUB_LIB_PATH ${tls_STUB_LIB_PATH}" >&6; }
vars="${tls_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6135,6 +5942,7 @@ $as_echo "$as_me: WARNING: --with-tkblt argument should refer to directory conta
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -6224,12 +6032,8 @@ $as_echo_n "checking For TKBLT_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKBLT_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6242,12 +6046,8 @@ $as_echo "using TKBLT_STUB_LIB_PATH ${TKBLT_STUB_LIB_PATH}" >&6; }
vars="${TKBLT_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6275,12 +6075,8 @@ $as_echo_n "checking For tkblt_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkblt_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6293,12 +6089,8 @@ $as_echo "using tkblt_STUB_LIB_PATH ${tkblt_STUB_LIB_PATH}" >&6; }
vars="${tkblt_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6399,6 +6191,7 @@ $as_echo "$as_me: WARNING: --with-tkhtml1 argument should refer to directory con
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -6488,12 +6281,8 @@ $as_echo_n "checking For TKHTML1_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKHTML1_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6506,12 +6295,8 @@ $as_echo "using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&6; }
vars="${TKHTML1_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6539,12 +6324,8 @@ $as_echo_n "checking For tkhtml1_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkhtml1_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6557,12 +6338,8 @@ $as_echo "using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&6; }
vars="${tkhtml1_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6663,6 +6440,7 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -6752,12 +6530,8 @@ $as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6770,12 +6544,8 @@ $as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; }
vars="${TKIMG_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6803,12 +6573,8 @@ $as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6821,12 +6587,8 @@ $as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; }
vars="${tkimg_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -6927,6 +6689,7 @@ $as_echo "$as_me: WARNING: --with-tkimggif argument should refer to directory co
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -7016,12 +6779,8 @@ $as_echo_n "checking For TKIMGGIF_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKIMGGIF_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7034,12 +6793,8 @@ $as_echo "using TKIMGGIF_STUB_LIB_PATH ${TKIMGGIF_STUB_LIB_PATH}" >&6; }
vars="${TKIMGGIF_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7067,12 +6822,8 @@ $as_echo_n "checking For tkimggif_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkimggif_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7085,12 +6836,8 @@ $as_echo "using tkimggif_STUB_LIB_PATH ${tkimggif_STUB_LIB_PATH}" >&6; }
vars="${tkimggif_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7191,6 +6938,7 @@ $as_echo "$as_me: WARNING: --with-tkimgjpeg argument should refer to directory c
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -7280,12 +7028,8 @@ $as_echo_n "checking For TKIMGJPEG_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKIMGJPEG_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7298,12 +7042,8 @@ $as_echo "using TKIMGJPEG_STUB_LIB_PATH ${TKIMGJPEG_STUB_LIB_PATH}" >&6; }
vars="${TKIMGJPEG_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7331,12 +7071,8 @@ $as_echo_n "checking For tkimgjpeg_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkimgjpeg_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7349,12 +7085,8 @@ $as_echo "using tkimgjpeg_STUB_LIB_PATH ${tkimgjpeg_STUB_LIB_PATH}" >&6; }
vars="${tkimgjpeg_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7455,6 +7187,7 @@ $as_echo "$as_me: WARNING: --with-tkimgpng argument should refer to directory co
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -7544,12 +7277,8 @@ $as_echo_n "checking For TKIMGPNG_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKIMGPNG_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7562,12 +7291,8 @@ $as_echo "using TKIMGPNG_STUB_LIB_PATH ${TKIMGPNG_STUB_LIB_PATH}" >&6; }
vars="${TKIMGPNG_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7595,12 +7320,8 @@ $as_echo_n "checking For tkimgpng_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkimgpng_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7613,12 +7334,8 @@ $as_echo "using tkimgpng_STUB_LIB_PATH ${tkimgpng_STUB_LIB_PATH}" >&6; }
vars="${tkimgpng_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7719,6 +7436,7 @@ $as_echo "$as_me: WARNING: --with-tkimgtiff argument should refer to directory c
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -7808,12 +7526,8 @@ $as_echo_n "checking For TKIMGTIFF_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKIMGTIFF_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7826,12 +7540,8 @@ $as_echo "using TKIMGTIFF_STUB_LIB_PATH ${TKIMGTIFF_STUB_LIB_PATH}" >&6; }
vars="${TKIMGTIFF_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7859,12 +7569,8 @@ $as_echo_n "checking For tkimgtiff_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkimgtiff_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7877,12 +7583,8 @@ $as_echo "using tkimgtiff_STUB_LIB_PATH ${tkimgtiff_STUB_LIB_PATH}" >&6; }
vars="${tkimgtiff_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -7983,6 +7685,7 @@ $as_echo "$as_me: WARNING: --with-tkimgwindow argument should refer to directory
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -8072,12 +7775,8 @@ $as_echo_n "checking For TKIMGWINDOW_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKIMGWINDOW_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8090,12 +7789,8 @@ $as_echo "using TKIMGWINDOW_STUB_LIB_PATH ${TKIMGWINDOW_STUB_LIB_PATH}" >&6; }
vars="${TKIMGWINDOW_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8123,12 +7818,8 @@ $as_echo_n "checking For tkimgwindow_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkimgwindow_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8141,12 +7832,8 @@ $as_echo "using tkimgwindow_STUB_LIB_PATH ${tkimgwindow_STUB_LIB_PATH}" >&6; }
vars="${tkimgwindow_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8247,6 +7934,7 @@ $as_echo "$as_me: WARNING: --with-tkmacosx argument should refer to directory co
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -8336,12 +8024,8 @@ $as_echo_n "checking For TKMACOSX_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKMACOSX_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8354,12 +8038,8 @@ $as_echo "using TKMACOSX_STUB_LIB_PATH ${TKMACOSX_STUB_LIB_PATH}" >&6; }
vars="${TKMACOSX_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8387,12 +8067,8 @@ $as_echo_n "checking For tkmacosx_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkmacosx_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8405,12 +8081,8 @@ $as_echo "using tkmacosx_STUB_LIB_PATH ${tkmacosx_STUB_LIB_PATH}" >&6; }
vars="${tkmacosx_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8511,6 +8183,7 @@ $as_echo "$as_me: WARNING: --with-tkmpeg argument should refer to directory cont
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -8600,12 +8273,8 @@ $as_echo_n "checking For TKMPEG_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKMPEG_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8618,12 +8287,8 @@ $as_echo "using TKMPEG_STUB_LIB_PATH ${TKMPEG_STUB_LIB_PATH}" >&6; }
vars="${TKMPEG_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8651,12 +8316,8 @@ $as_echo_n "checking For tkmpeg_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tkmpeg_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8669,12 +8330,8 @@ $as_echo "using tkmpeg_STUB_LIB_PATH ${tkmpeg_STUB_LIB_PATH}" >&6; }
vars="${tkmpeg_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8775,6 +8432,7 @@ $as_echo "$as_me: WARNING: --with-tksao argument should refer to directory conta
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -8864,12 +8522,8 @@ $as_echo_n "checking For TKSAO_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKSAO_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8882,12 +8536,8 @@ $as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; }
vars="${TKSAO_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8915,12 +8565,8 @@ $as_echo_n "checking For tksao_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tksao_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -8933,12 +8579,8 @@ $as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; }
vars="${tksao_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -9039,6 +8681,7 @@ $as_echo "$as_me: WARNING: --with-tktable argument should refer to directory con
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -9128,12 +8771,8 @@ $as_echo_n "checking For TKTABLE_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${TKTABLE_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -9146,12 +8785,8 @@ $as_echo "using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&6; }
vars="${TKTABLE_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -9179,12 +8814,8 @@ $as_echo_n "checking For tktable_STUB library for LIBS... " >&6; }
vars="\"`${CYGPATH} ${tktable_STUB_LIB_PATH}`\""
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -9197,12 +8828,8 @@ $as_echo "using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&6; }
vars="${tktable_STUB_LIB_SPEC}"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -9941,20 +9568,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
- INSTALL_DATA_DIR='${INSTALL} -d -m 755'
- INSTALL_DATA='${INSTALL} -m 644'
- INSTALL_PROGRAM='${INSTALL}'
- INSTALL_SCRIPT='${INSTALL}'
- INSTALL_LIBRARY='${INSTALL_DATA}'
-
-
-
-
-
-
-
-
#--------------------------------------------------------------------
# Checks to see if the make program sets the $MAKE variable.
#--------------------------------------------------------------------
@@ -10626,480 +10239,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
- if test "${TEA_PLATFORM}" = "unix" ; then
-
- #--------------------------------------------------------------------
- # On a few very rare systems, all of the libm.a stuff is
- # already in libc.a. Set compiler flags accordingly.
- # Also, Linux requires the "ieee" library for math to work
- # right (and it must appear before "-lm").
- #--------------------------------------------------------------------
-
- ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
-if test "x$ac_cv_func_sin" = xyes; then :
- MATH_LIBS=""
-else
- MATH_LIBS="-lm"
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lieee" >&5
-$as_echo_n "checking for main in -lieee... " >&6; }
-if ${ac_cv_lib_ieee_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lieee $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ieee_main=yes
-else
- ac_cv_lib_ieee_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee_main" >&5
-$as_echo "$ac_cv_lib_ieee_main" >&6; }
-if test "x$ac_cv_lib_ieee_main" = xyes; then :
- MATH_LIBS="-lieee $MATH_LIBS"
-fi
-
-
- #--------------------------------------------------------------------
- # Interactive UNIX requires -linet instead of -lsocket, plus it
- # needs net/errno.h to define the socket-related error codes.
- #--------------------------------------------------------------------
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -linet" >&5
-$as_echo_n "checking for main in -linet... " >&6; }
-if ${ac_cv_lib_inet_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet_main=yes
-else
- ac_cv_lib_inet_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_main" >&5
-$as_echo "$ac_cv_lib_inet_main" >&6; }
-if test "x$ac_cv_lib_inet_main" = xyes; then :
- LIBS="$LIBS -linet"
-fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "net/errno.h" "ac_cv_header_net_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_net_errno_h" = xyes; then :
-
-
-$as_echo "#define HAVE_NET_ERRNO_H 1" >>confdefs.h
-
-fi
-
-
-
- #--------------------------------------------------------------------
- # Check for the existence of the -lsocket and -lnsl libraries.
- # The order here is important, so that they end up in the right
- # order in the command line generated by make. Here are some
- # special considerations:
- # 1. Use "connect" and "accept" to check for -lsocket, and
- # "gethostbyname" to check for -lnsl.
- # 2. Use each function name only once: can't redo a check because
- # autoconf caches the results of the last check and won't redo it.
- # 3. Use -lnsl and -lsocket only if they supply procedures that
- # aren't already present in the normal libraries. This is because
- # IRIX 5.2 has libraries, but they aren't needed and they're
- # bogus: they goof up name resolution if used.
- # 4. On some SVR4 systems, can't use -lsocket without -lnsl too.
- # To get around this problem, check for both libraries together
- # if -lsocket doesn't work by itself.
- #--------------------------------------------------------------------
-
- tcl_checkBoth=0
- ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
- tcl_checkSocket=0
-else
- tcl_checkSocket=1
-fi
-
- if test "$tcl_checkSocket" = 1; then
- ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt"
-if test "x$ac_cv_func_setsockopt" = xyes; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5
-$as_echo_n "checking for setsockopt in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_setsockopt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setsockopt ();
-int
-main ()
-{
-return setsockopt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_setsockopt=yes
-else
- ac_cv_lib_socket_setsockopt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5
-$as_echo "$ac_cv_lib_socket_setsockopt" >&6; }
-if test "x$ac_cv_lib_socket_setsockopt" = xyes; then :
- LIBS="$LIBS -lsocket"
-else
- tcl_checkBoth=1
-fi
-
-fi
-
- fi
- if test "$tcl_checkBoth" = 1; then
- tk_oldLibs=$LIBS
- LIBS="$LIBS -lsocket -lnsl"
- ac_fn_c_check_func "$LINENO" "accept" "ac_cv_func_accept"
-if test "x$ac_cv_func_accept" = xyes; then :
- tcl_checkNsl=0
-else
- LIBS=$tk_oldLibs
-fi
-
- fi
- ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
-else
- ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
- LIBS="$LIBS -lnsl"
-fi
-
-fi
-
-
- # TEA specific: Don't perform the eval of the libraries here because
- # DL_LIBS won't be set until we call TEA_CONFIG_CFLAGS
-
- TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}'
-
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dirent.h" >&5
-$as_echo_n "checking dirent.h... " >&6; }
-if ${tcl_cv_dirent_h+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <dirent.h>
-int
-main ()
-{
-
-#ifndef _POSIX_SOURCE
-# ifdef __Lynx__
- /*
- * Generate compilation error to make the test fail: Lynx headers
- * are only valid if really in the POSIX environment.
- */
-
- missing_procedure();
-# endif
-#endif
-DIR *d;
-struct dirent *entryPtr;
-char *p;
-d = opendir("foobar");
-entryPtr = readdir(d);
-p = entryPtr->d_name;
-closedir(d);
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- tcl_cv_dirent_h=yes
-else
- tcl_cv_dirent_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_dirent_h" >&5
-$as_echo "$tcl_cv_dirent_h" >&6; }
-
- if test $tcl_cv_dirent_h = no; then
-
-$as_echo "#define NO_DIRENT_H 1" >>confdefs.h
-
- fi
-
- # TEA specific:
- ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_errno_h" = xyes; then :
-
-else
-
-$as_echo "#define NO_ERRNO_H 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-if test "x$ac_cv_header_float_h" = xyes; then :
-
-else
-
-$as_echo "#define NO_FLOAT_H 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default"
-if test "x$ac_cv_header_values_h" = xyes; then :
-
-else
-
-$as_echo "#define NO_VALUES_H 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
-if test "x$ac_cv_header_limits_h" = xyes; then :
-
-$as_echo "#define HAVE_LIMITS_H 1" >>confdefs.h
-
-else
-
-$as_echo "#define NO_LIMITS_H 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
- tcl_ok=1
-else
- tcl_ok=0
-fi
-
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "strtol" >/dev/null 2>&1; then :
-
-else
- tcl_ok=0
-fi
-rm -f conftest*
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "strtoul" >/dev/null 2>&1; then :
-
-else
- tcl_ok=0
-fi
-rm -f conftest*
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "strtod" >/dev/null 2>&1; then :
-
-else
- tcl_ok=0
-fi
-rm -f conftest*
-
- if test $tcl_ok = 0; then
-
-$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
-
- fi
- ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = xyes; then :
- tcl_ok=1
-else
- tcl_ok=0
-fi
-
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "strstr" >/dev/null 2>&1; then :
-
-else
- tcl_ok=0
-fi
-rm -f conftest*
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "strerror" >/dev/null 2>&1; then :
-
-else
- tcl_ok=0
-fi
-rm -f conftest*
-
-
- # See also memmove check below for a place where NO_STRING_H can be
- # set and why.
-
- if test $tcl_ok = 0; then
-
-$as_echo "#define NO_STRING_H 1" >>confdefs.h
-
- fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_wait_h" = xyes; then :
-
-else
-
-$as_echo "#define NO_SYS_WAIT_H 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-
-else
-
-$as_echo "#define NO_DLFCN_H 1" >>confdefs.h
-
-fi
-
-
-
- # OS/390 lacks sys/param.h (and doesn't need it, by chance).
- for ac_header in sys/param.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_param_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PARAM_H 1
-_ACEOF
-
-fi
-
-done
-
-
- # Let the user call this, because if it triggers, they will
- # need a compat/strtod.c that is correct. Users can also
- # use Tcl_GetDouble(FromObj) instead.
- #TEA_BUGGY_STRTOD
- fi
#-----------------------------------------------------------------------
@@ -11119,12 +10258,8 @@ done
vars="-lstdc++"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -11389,7 +10524,7 @@ $as_echo "${ac_cv_c_tkh}" >&6; }
- if test "${PRACTCL_WINDOWINGSYSTEM}" != "x11"; then
+ if test "${TEA_WINDOWINGSYSTEM}" != "x11"; then
# On Windows and Aqua, we need the X compat headers
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 header files" >&5
$as_echo_n "checking for X11 header files... " >&6; }
@@ -11404,7 +10539,7 @@ $as_echo "${INCLUDE_DIR_NATIVE}" >&6; }
#TEA_PRIVATE_TK_HEADERS
- if test "${PRACTCL_WINDOWINGSYSTEM}" = "x11" ; then
+ if test "${TEA_WINDOWINGSYSTEM}" = "x11" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
$as_echo_n "checking for X... " >&6; }
@@ -12042,18 +11177,6 @@ $as_echo "$as_me: WARNING:
that IS thread-enabled. It is recommended to use --enable-threads." >&2;}
fi
;;
- *)
- if test "${TCL_THREADS}" = "1"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
- --enable-threads requested, but building against a Tcl that is NOT
- thread-enabled. This is an OK configuration that will also run in
- a thread-enabled core." >&5
-$as_echo "$as_me: WARNING:
- --enable-threads requested, but building against a Tcl that is NOT
- thread-enabled. This is an OK configuration that will also run in
- a thread-enabled core." >&2;}
- fi
- ;;
esac
@@ -12675,12 +11798,8 @@ $as_echo "found $CELIB_DIR" >&6; }
vars="ucrt.lib"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -12706,12 +11825,8 @@ $as_echo "found $CELIB_DIR" >&6; }
vars="bufferoverflowU.lib"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
- case $i in
- *.lib)
- # Convert foo.lib to -lfoo for GCC
- i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'`
- ;;
- esac
+ # Convert foo.lib to -lfoo for GCC. No-op if not *.lib
+ i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
fi
PKG_LIBS="$PKG_LIBS $i"
done
@@ -12862,8 +11977,6 @@ fi
CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
SHLIB_LD='${CC} -shared'
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- PRACTCL_UNSHARED_LIB_SUFFIX='.a'
-
LDFLAGS_CONSOLE="-wl,--subsystem,console ${lflags}"
LDFLAGS_WINDOW="-wl,--subsystem,windows ${lflags}"
@@ -13093,7 +12206,7 @@ fi
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnetwork" >&5
$as_echo_n "checking for inet_ntoa in -lnetwork... " >&6; }
if ${ac_cv_lib_network_inet_ntoa+:} false; then :
@@ -13320,7 +12433,7 @@ fi
CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS_DEFAULT} -shared'
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
if test $doRpath = yes; then :
@@ -13396,39 +12509,23 @@ fi
OpenBSD-*)
arch=`arch -s`
case "$arch" in
- vax)
- SHLIB_SUFFIX=""
- SHARED_LIB_SUFFIX=""
- LDFLAGS=""
+ alpha|sparc64)
+ SHLIB_CFLAGS="-fPIC"
;;
*)
- case "$arch" in
- alpha|sparc64)
- SHLIB_CFLAGS="-fPIC"
- ;;
- *)
- SHLIB_CFLAGS="-fpic"
- ;;
- esac
- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
- SHLIB_SUFFIX=".so"
- if test $doRpath = yes; then :
-
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-fi
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
- ;;
- esac
- case "$arch" in
- vax)
- CFLAGS_OPTIMIZE="-O1"
- ;;
- *)
- CFLAGS_OPTIMIZE="-O2"
+ SHLIB_CFLAGS="-fpic"
;;
esac
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_SUFFIX=".so"
+ if test $doRpath = yes; then :
+
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+ LDFLAGS="-Wl,-export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
# On OpenBSD: Compile with -pthread
@@ -13444,7 +12541,7 @@ fi
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -13461,7 +12558,7 @@ fi
fi
;;
- FreeBSD-*)
+ DragonFly-*|FreeBSD-*)
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
@@ -14095,9 +13192,9 @@ fi
case $system in
AIX-*) ;;
BSD/OS*) ;;
- CYGWIN_*|MINGW32_*) ;;
+ CYGWIN_*|MINGW32_*|MINGW64_*) ;;
IRIX*) ;;
- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+ NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
Darwin-*) ;;
SCO_SV-3.2*) ;;
windows) ;;
@@ -14117,13 +13214,11 @@ fi
# TEA specific: use PACKAGE_VERSION instead of VERSION
SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}'
-
fi
if test "$UNSHARED_LIB_SUFFIX" = ""; then :
# TEA specific: use PACKAGE_VERSION instead of VERSION
UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'
-
fi
if test "${GCC}" = "yes" -a ${SHLIB_SUFFIX} = ".dll"; then
@@ -14314,7 +13409,6 @@ $as_echo "#define HAVE_CAST_TO_UNION 1" >>confdefs.h
-
# These must be called after we do the basic CFLAGS checks and
# verify any possible 64-bit or similar switches are necessary
@@ -14721,16 +13815,10 @@ $as_echo "enabled $tcl_ok debugging" >&6; }
#--------------------------------------------------------------------
- PRACTCL_TOOLSET="gcc"
- PRACTCL_VC_MANIFEST_EMBED_DLL=:
- PRACTCL_VC_MANIFEST_EMBED_EXE=:
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
- PRACTCL_TOOLSET="msvc"
- PRACTCL_STATIC_LIB="%STLIB_LD% -out:%OUTFILE% %LIBRARY_OBJECTS%"
- PRACTCL_SHARED_LIB="%SHLIB_LD% %SHLIB_LD_LIBS% %LDFLAGS_DEFAULT% -out:%OUTFILE% %LIBRARY_OBJECTS%"
- MAKE_STATIC_LIB="\${STLIB_LD} -out:\$@ \$(PKG_OBJECTS)"
- MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\$@ \$(PKG_OBJECTS)"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
+ MAKE_STATIC_LIB="\${STLIB_LD} -out:\$@ \$(PKG_OBJECTS)"
+ MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\$@ \$(PKG_OBJECTS)"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined(_MSC_VER) && _MSC_VER >= 1400
@@ -14741,12 +13829,10 @@ _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "manifest needed" >/dev/null 2>&1; then :
- # Could do a CHECK_PROG for mt, but should always be with MSVC8+
- PRACTCL_VC_MANIFEST_EMBED_DLL="mt.exe -nologo -manifest %OUTFILE%.manifest -outputresource:%OUTFILE%\;2"
- PRACTCL_VC_MANIFEST_EMBED_EXE="mt.exe -nologo -manifest %OUTFILE%.manifest -outputresource:%OUTFILE%\;1"
- VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi"
- VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi"
- MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}"
+ # Could do a CHECK_PROG for mt, but should always be with MSVC8+
+ VC_MANIFEST_EMBED_DLL="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;2 ; fi"
+ VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi"
+ MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}"
CLEANFILES="$CLEANFILES *.manifest"
@@ -14754,89 +13840,73 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- PRACTCL_STUB_LIB="%STLIB_LD% -nodefaultlib -out:%OUTFILE% %LIBRARY_OBJECTS%"
- MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\$@ \$(PKG_STUB_OBJECTS)"
- else
- MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(PKG_OBJECTS)"
- MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
- MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)"
+ MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\$@ \$(PKG_STUB_OBJECTS)"
+ else
+ MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(PKG_OBJECTS)"
+ MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
+ MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)"
+ fi
- PRACTCL_STATIC_LIB="%STLIB_LD% %OUTFILE% %LIBRARY_OBJECTS%"
- PRACTCL_SHARED_LIB="%SHLIB_LD% -o %OUTFILE% %LIBRARY_OBJECTS% %SHLIB_LD_LIBS%"
- PRACTCL_STUB_LIB="%STLIB_LD% %OUTFILE% %LIBRARY_OBJECTS%"
- fi
+ if test "${SHARED_BUILD}" = "1" ; then
+ MAKE_LIB="${MAKE_SHARED_LIB} "
+ else
+ MAKE_LIB="${MAKE_STATIC_LIB} "
+ fi
- if test "${SHARED_BUILD}" = "1" ; then
- MAKE_LIB="${MAKE_SHARED_LIB} "
- else
- MAKE_LIB="${MAKE_STATIC_LIB} "
- fi
+ #--------------------------------------------------------------------
+ # Shared libraries and static libraries have different names.
+ # Use the double eval to make sure any variables in the suffix is
+ # substituted. (@@@ Might not be necessary anymore)
+ #--------------------------------------------------------------------
- #--------------------------------------------------------------------
- # Shared libraries and static libraries have different names.
- # Use the double eval to make sure any variables in the suffix is
- # substituted. (@@@ Might not be necessary anymore)
- #--------------------------------------------------------------------
- if test "${TEA_PLATFORM}" = "windows" ; then
- PRACTCL_NAME_LIBRARY="%LIBRARY_PREFIX%%LIBRARY_NAME%%LIBRARY_VERSION_NODOTS%"
- if test "${SHARED_BUILD}" = "1" ; then
+ if test "${TEA_PLATFORM}" = "windows" ; then
+ if test "${SHARED_BUILD}" = "1" ; then
# We force the unresolved linking of symbols that are really in
# the private libraries of Tcl and Tk.
if test x"${TK_BIN_DIR}" != x ; then
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
fi
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
if test "$GCC" = "yes"; then
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
fi
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
- else
+ else
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
if test "$GCC" = "yes"; then
- PKG_LIB_FILE=lib${PKG_LIB_FILE}
+ PKG_LIB_FILE=lib${PKG_LIB_FILE}
fi
- fi
- # Some packages build their own stubs libraries
- eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
- if test "$GCC" = "yes"; then
- PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE}
- fi
- # These aren't needed on Windows (either MSVC or gcc)
- RANLIB=:
- RANLIB_STUB=:
- else
- PRACTCL_NAME_LIBRARY="lib%LIBRARY_PREFIX%%LIBRARY_NAME%%LIBRARY_VERSION%"
- RANLIB_STUB="${RANLIB}"
- if test "${SHARED_BUILD}" = "1" ; then
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}"
- if test x"${TK_BIN_DIR}" != x ; then
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
- fi
- eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
- RANLIB=:
+ fi
+ # Some packages build their own stubs libraries
+ eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
+ if test "$GCC" = "yes"; then
+ PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE}
+ fi
+ # These aren't needed on Windows (either MSVC or gcc)
+ RANLIB=:
+ RANLIB_STUB=:
else
- eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+ RANLIB_STUB="${RANLIB}"
+ if test "${SHARED_BUILD}" = "1" ; then
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}"
+ if test x"${TK_BIN_DIR}" != x ; then
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
+ fi
+ eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ RANLIB=:
+ else
+ eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+ fi
+ # Some packages build their own stubs libraries
+ eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
fi
- # Some packages build their own stubs libraries
- eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
- fi
-
- # Store the raw CFLAGS before we add the trimmings
- PRACTCL_CFLAGS=${CFLAGS}
- # These are escaped so that only CFLAGS is picked up at configure time.
- # The other values will be substituted at make time.
- CFLAGS="${CFLAGS} \${CFLAGS_DEFAULT} \${CFLAGS_WARNING}"
- if test "${SHARED_BUILD}" = "1" ; then
- CFLAGS="${CFLAGS} \${SHLIB_CFLAGS}"
- fi
-
-
-
-
-
-
-
+ # These are escaped so that only CFLAGS is picked up at configure time.
+ # The other values will be substituted at make time.
+ CFLAGS="${CFLAGS} \${CFLAGS_DEFAULT} \${CFLAGS_WARNING}"
+ if test "${SHARED_BUILD}" = "1" ; then
+ CFLAGS="${CFLAGS} \${SHLIB_CFLAGS}"
+ fi
@@ -14858,31 +13928,7 @@ rm -f conftest*
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
$as_echo_n "checking for tclsh... " >&6; }
-
-
-# Check whether --with-tclsh was given.
-if test "${with_tclsh+set}" = set; then :
- withval=$with_tclsh; with_tclsh=${withval}
-fi
-
- # Use the value from --with-tclsh, if it was given
- TCLSH_PROG=0
- if test x"${with_tclsh}" != x ; then
- if test -f "${with_tclsh}" ; then
- TCLSH_PROG=${with_tclsh}
- else
- if test -f "${with_tclsh}/tcl8.6" ; then
- TCLSH_PROG="${with_tclsh}/tcl8.6"
- else
- if test -f "${with_tclsh}/tclsh86.exe" ; then
- TCLSH_PROG="${with_tclsh}/tclsh86.exe"
- else
- as_fn_error $? "${with_tclsh} does not point to a valid Tcl executable" "$LINENO" 5
- fi
- fi
- fi
- else
- if test -f "${TCL_BIN_DIR}/Makefile" ; then
+ if test -f "${TCL_BIN_DIR}/Makefile" ; then
# tclConfig.sh is in Tcl build directory
if test "${TEA_PLATFORM}" = "windows"; then
if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" ; then
@@ -14897,7 +13943,7 @@ fi
else
TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
fi
- else
+ else
# tclConfig.sh is in install location
if test "${TEA_PLATFORM}" = "windows"; then
TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}"
@@ -14914,8 +13960,7 @@ fi
fi
done
TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}"
- fi
- fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${TCLSH_PROG}" >&5
$as_echo "${TCLSH_PROG}" >&6; }
@@ -14923,13 +13968,27 @@ $as_echo "${TCLSH_PROG}" >&6; }
#TEA_PROG_WISH
#--------------------------------------------------------------------
-# Finally, substitute all of the various values into the Makefile.
-# You may alternatively have a special pkgIndex.tcl.in or other files
-# which require substituting th AC variables in. Include these here.
+# Setup a *Config.sh.in configuration file.
+#--------------------------------------------------------------------
+
+#TEA_EXPORT_CONFIG([sample])
+#AC_SUBST(SAMPLE_VAR)
+
+#--------------------------------------------------------------------
+# Specify files to substitute AC variables in. You may alternatively
+# have a special pkgIndex.tcl.in or other files which require
+# substituting the AC variables in. Include these here.
#--------------------------------------------------------------------
ac_config_files="$ac_config_files Makefile"
+#AC_CONFIG_FILES([sampleConfig.sh])
+
+#--------------------------------------------------------------------
+# Finally, substitute all of the various values into the files
+# specified with AC_CONFIG_FILES.
+#--------------------------------------------------------------------
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -15474,7 +14533,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ds9 $as_me 8.0, which was
+This file was extended by ds9 $as_me 8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15527,7 +14586,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ds9 config.status 8.0
+ds9 config.status 8.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
generated by cgit v0.12 at 2024-11-17 21:07:56 (GMT)