Update to tk 8.5.19
This commit is contained in:
Zachary Ware
132
unix/configure
vendored
Normal file → Executable file
132
unix/configure
vendored
Normal file → Executable file
@@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
TK_VERSION=8.5
|
||||
TK_MAJOR_VERSION=8
|
||||
TK_MINOR_VERSION=5
|
||||
TK_PATCH_LEVEL=".15"
|
||||
TK_PATCH_LEVEL=".19"
|
||||
VERSION=${TK_VERSION}
|
||||
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
|
||||
|
||||
@@ -5144,7 +5144,7 @@ fi
|
||||
LD_SEARCH_FLAGS=""
|
||||
TCL_NEEDS_EXP_FILE=1
|
||||
TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
|
||||
TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a'
|
||||
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
|
||||
echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5
|
||||
echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6
|
||||
if test "${ac_cv_cygwin+set}" = set; then
|
||||
@@ -5213,10 +5213,15 @@ echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
|
||||
echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.dll"; then
|
||||
{ { echo "$as_me:$LINENO: error: Please configure and make the ../win directory first." >&5
|
||||
echo "$as_me: error: Please configure and make the ../win directory first." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
do64bit_ok=yes
|
||||
if test "x${SHARED_BUILD}" = "x1"; then
|
||||
echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args"
|
||||
# The eval makes quoting arguments work.
|
||||
if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args; cd ../unix
|
||||
then :
|
||||
else
|
||||
{ echo "configure: error: configure failed for ../win" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
dgux*)
|
||||
@@ -5777,7 +5782,14 @@ fi
|
||||
LDFLAGS=""
|
||||
;;
|
||||
*)
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
case "$arch" in
|
||||
alpha|sparc|sparc64)
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
;;
|
||||
*)
|
||||
SHLIB_CFLAGS="-fpic"
|
||||
;;
|
||||
esac
|
||||
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
|
||||
SHLIB_SUFFIX=".so"
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
@@ -5839,20 +5851,12 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
case $system in
|
||||
FreeBSD-3.*)
|
||||
# FreeBSD-3 doesn't handle version numbers with dots.
|
||||
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
||||
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
FreeBSD-*)
|
||||
# This configuration from FreeBSD Ports.
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LD="${CC} -shared"
|
||||
TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
|
||||
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
|
||||
SHLIB_SUFFIX=".so"
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
DL_LIBS=""
|
||||
@@ -5871,11 +5875,15 @@ fi
|
||||
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
|
||||
fi
|
||||
|
||||
# Version numbers are dot-stripped by system policy.
|
||||
TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
|
||||
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
||||
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
case $system in
|
||||
FreeBSD-3.*)
|
||||
# Version numbers are dot-stripped by system policy.
|
||||
TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
|
||||
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
||||
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
|
||||
TCL_LIB_VERSIONS_OK=nodots
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
Darwin-*)
|
||||
CFLAGS_OPTIMIZE="-Os"
|
||||
@@ -7078,7 +7086,7 @@ fi
|
||||
MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
|
||||
if test "${SHLIB_SUFFIX}" = ".dll"; then
|
||||
|
||||
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
|
||||
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
|
||||
DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
|
||||
|
||||
else
|
||||
@@ -9885,7 +9893,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||
_ACEOF
|
||||
|
||||
LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
|
||||
EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
|
||||
EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
|
||||
TK_WINDOWINGSYSTEM=AQUA
|
||||
if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
|
||||
|
||||
@@ -10703,6 +10711,84 @@ else
|
||||
|
||||
found_xft=no
|
||||
|
||||
fi
|
||||
|
||||
CFLAGS=$tk_oldCFlags
|
||||
LIBS=$tk_oldLibs
|
||||
fi
|
||||
if test "$found_xft" = "yes" ; then
|
||||
tk_oldCFlags=$CFLAGS
|
||||
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
|
||||
tk_oldLibs=$LIBS
|
||||
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
|
||||
echo "$as_me:$LINENO: checking for FcFontSort in -lfontconfig" >&5
|
||||
echo $ECHO_N "checking for FcFontSort in -lfontconfig... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_fontconfig_FcFontSort+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lfontconfig $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char FcFontSort ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
FcFontSort ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (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); }; } &&
|
||||
{ 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
|
||||
ac_cv_lib_fontconfig_FcFontSort=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_fontconfig_FcFontSort=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6
|
||||
if test $ac_cv_lib_fontconfig_FcFontSort = yes; then
|
||||
|
||||
XFT_LIBS="$XFT_LIBS -lfontconfig"
|
||||
|
||||
fi
|
||||
|
||||
CFLAGS=$tk_oldCFlags
|
||||
|
||||
Reference in New Issue
Block a user